feat(wms): 扩展库存出入库单据类型支持
- 在入库界面增加0013和0014单据类型的启用选项 - 在出库界面增加1013、1014和1015单据类型的启用选项 - 更新登录页面默认用户名为空字符串 - 修改出库服务实现中支持多种单据类型的包装关系更新逻辑 - 调整QST_IVT_INCHARGE查询文件支持多入库单据类型过滤 - 更新QST_IVT_RAWASSISTISTOR查询文件支持多出库单据类型过滤 - 扩展SAP集成服务支持ZLR1和ZLR2类型的处理逻辑
This commit is contained in:
@@ -417,7 +417,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
|
||||
jsonDtl.put("width", json.getString("HL02")); // 幅宽
|
||||
tableData.add(jsonDtl);
|
||||
}
|
||||
if (StrUtil.equals(lfart, "ZLR")) {
|
||||
if (StrUtil.equals(lfart, "ZLR") || StrUtil.equals(lfart, "ZLR1") || StrUtil.equals(lfart, "ZLR2")) {
|
||||
/*jsonMst.put("remark",json.getString("LGORT"));//库位*/
|
||||
HashMap map = new HashMap();
|
||||
//更新包装关系
|
||||
|
||||
@@ -211,7 +211,7 @@ public class OutChargeServiceImpl implements OutChargeService {
|
||||
//将包装关系中对应的记录状态改为包装
|
||||
HashMap<String, String> map = new HashMap<>();
|
||||
map.put("status", "1");
|
||||
if (StrUtil.equals(mst_jo.getString("bill_type"), "1001")) {
|
||||
if (StrUtil.equals(mst_jo.getString("bill_type"), "1001") || StrUtil.equals(mst_jo.getString("bill_type"), "1013") || StrUtil.equals(mst_jo.getString("bill_type"), "1014") || StrUtil.equals(mst_jo.getString("bill_type"), "1015")) {
|
||||
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "' AND status = '3'");
|
||||
} else {
|
||||
WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "'");
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
AND ios.io_type = '0'
|
||||
AND ios.bill_status = '99'
|
||||
AND ios.is_writeoff = '0'
|
||||
AND ios.bill_type = '0002'
|
||||
AND ios.bill_type in ('0002','0013','0014')
|
||||
and ios.stor_id in 输入.in_stor_id
|
||||
OPTION 输入.bill_code <> ""
|
||||
ios.bill_code like 输入.bill_code
|
||||
@@ -125,7 +125,7 @@
|
||||
AND ios.io_type = '0'
|
||||
AND ios.bill_status = '99'
|
||||
AND ios.is_writeoff = '0'
|
||||
AND ios.bill_type = '0002'
|
||||
AND ios.bill_type in ('0002','0013','0014')
|
||||
and ios.stor_id in 输入.in_stor_id
|
||||
OPTION 输入.bill_code <> ""
|
||||
ios.bill_code like 输入.bill_code
|
||||
|
||||
@@ -977,7 +977,7 @@
|
||||
AND
|
||||
ios.bill_status = '99'
|
||||
AND
|
||||
ios.bill_type in ('1001','1009')
|
||||
ios.bill_type in ('1001','1009','1013','1014','1015')
|
||||
AND
|
||||
ios.stor_id in 输入.in_stor_id
|
||||
OPTION 输入.bill_code <> ""
|
||||
|
||||
@@ -58,7 +58,7 @@ export default {
|
||||
codeUrl: '',
|
||||
cookiePass: '',
|
||||
loginForm: {
|
||||
username: 'admin',
|
||||
username: '',
|
||||
password: '',
|
||||
rememberMe: false,
|
||||
code: '',
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
<el-option
|
||||
v-for="item in dict.ST_INV_IN_TYPE"
|
||||
:key="item.value"
|
||||
:disabled="item.value !== '0002'"
|
||||
:disabled="item.value !== '0002' && item.value !== '0013' && item.value !== '0014'"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
|
||||
@@ -79,7 +79,11 @@
|
||||
<el-option
|
||||
v-for="item in dict.ST_INV_OUT_TYPE"
|
||||
:key="item.value"
|
||||
:disabled="item.value !== '1001' && item.value !== '1009'"
|
||||
:disabled="item.value !== '1001'
|
||||
&& item.value !== '1009'
|
||||
&& item.value !== '1013'
|
||||
&& item.value !== '1014'
|
||||
&& item.value !== '1015'"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user