|
|
@@ -4331,7 +4331,7 @@ class Whlabel extends Start_Controller
|
|
|
<td>增减备注</td>
|
|
|
<td>扣减方式：0减少库存1删除库存</td>
|
|
|
<td>增加类型(增加为必填，填数字)：1.采购入库2.盘盈调整3.其他调整入库4.退库入库5.退货可用入库6.形态转换入库</td>
|
|
|
- <td>扣减类型(扣减为必填，填数字)：1.销售出库2.销售美国出库3.盘亏调整4.其他调整出库5.形态转换出库</td>
|
|
|
+ <td>扣减类型(扣减为必填，填数字)：1.销售出库2.美国销售调货出库3.盘亏调整4.其他调整出库5.形态转换出库</td>
|
|
|
</tr>
|
|
|
</table>";
|
|
|
$filename = $title . ".xls";
|
|
|
@@ -7463,9 +7463,9 @@ 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['warehouse'] == 5)?'美国销售调货出库':'销售出库';
|
|
|
} else if ($value['cktype'] == 2) {
|
|
|
- $rows_c[$key]['cktype'] = '销售美国出库';
|
|
|
+ $rows_c[$key]['cktype'] = '美国销售调货出库';
|
|
|
} else if ($value['cktype'] == 3) {
|
|
|
$rows_c[$key]['cktype'] = '盘亏调整';
|
|
|
} else if ($value['cktype'] == 4) {
|
