|
|
@@ -7455,7 +7455,7 @@ class Whlabel extends Start_Controller
|
|
|
$rows_r[$key]['number'] = $this->whlabel->find_count($where . " and enter = '" . $value['enter'] . "' " . $sidwhere);
|
|
|
}
|
|
|
|
|
|
- $rows_c = $this->whlabel->find_all($where . " and outk > '$ktime' and outk < '$jtime' " . $sidwhere, 'warehouse,sku,title,zh,features,time,outk,cktype,number,textout');
|
|
|
+ $rows_c = $this->whlabel->find_all($where . " and outk > '$ktime' and outk < '$jtime' " . $sidwhere, 'warehouse,sku,title,zh,features,time,outk,cktype,number,textout,state');
|
|
|
foreach ($rows_c as $key => $value) {
|
|
|
$rows_c[$key]['warehouse'] = $wh[$value['warehouse']];
|
|
|
$pm = $classid;
|
|
|
@@ -7463,7 +7463,7 @@ class Whlabel extends Start_Controller
|
|
|
$rows_c[$key]['time'] = $value['outk'];
|
|
|
$rows_c[$key]['outk'] = '出库';
|
|
|
if ($value['cktype'] == 1) {
|
|
|
- $rows_c[$key]['cktype'] = '销售出库';
|
|
|
+ $rows_c[$key]['cktype'] = (($value['state']==10)&&($value['warehouse']== 5))?'美国销售调货出库': '销售出库';
|
|
|
} else if ($value['cktype'] == 2) {
|
|
|
$rows_c[$key]['cktype'] = '美国销售调货出库';
|
|
|
} else if ($value['cktype'] == 3) {
|
|
|
@@ -7475,6 +7475,7 @@ class Whlabel extends Start_Controller
|
|
|
} else {
|
|
|
$rows_c[$key]['cktype'] = '';
|
|
|
}
|
|
|
+ unset($rows_c[$key]['state']);
|
|
|
$features = explode('-', trim($value['features'], '-'));
|
|
|
foreach ($features as $v) {
|
|
|
if (isset($typeclass[$v])) {
|
