diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index 1260f083c..afe413a9a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -80,7 +80,7 @@ public class StructattrServiceImpl implements StructattrService { map.put("layer_num", (String) whereJson.get("layer_num")); map.put("is_used", (String) whereJson.get("is_used")); map.put("is_have", (String) whereJson.get("is_have")); - + map.put("storagevehicle_code",(String) whereJson.get("storagevehicleCode")); /* // 如果是二期仓库则将层数删除 if (ObjectUtil.isNotEmpty(whereJson.get("stor_id"))) { if ( whereJson.get("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql index ea74922b3..2c56affcc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql @@ -78,6 +78,9 @@ OPTION 输入.layer_num <> "" struct.layer_num = 输入.layer_num ENDOPTION + OPTION 输入.storagevehicle_code <> "" + struct.storagevehicle_code = 输入.storagevehicle_code + ENDOPTION OPTION 输入.is_used <> "" struct.is_used = 输入.is_used ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index abacbe151..951d754c4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -1014,7 +1014,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { throw new BadRequestException("MES提示错误：" + e.getMessage()); } // 记录成功日志 - OutboundApiLogger.logSuccess("mes", "/CamstarApi/momGetPackingInfo", "根据木想号母卷获取包装信息", + OutboundApiLogger.logSuccess("mes", "/CamstarApi/momGetPackingInfo", "根据木箱号母卷获取包装信息", url, "POST", JSONUtil.toJsonStr(param), result.toString(), 200, System.currentTimeMillis() - startTime); return result; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 23651f558..2cbdcce94 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -729,6 +729,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { result.put("RTMSG", "操作失败!" + e.getMessage()); result.put("RTOAL", 0); result.put("RTDAT", null); + return result; } result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 69a26452b..20f75c3c9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -444,6 +444,8 @@ public class InBillQueryServiceImpl implements InBillQueryService { for (int i = 0; i < resultJSONArray.size(); i++) { JSONObject json = resultJSONArray.getJSONObject(i); Map mp = new LinkedHashMap<>(); + mp.put("仓库", json.getString("stor_name")); + mp.put("库区", json.getString("sect_name")); mp.put("日期", (json.getString("confirm_time_class").substring(0, 10)).replace("-", "/")); mp.put("班次", json.getString("classes")); if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { @@ -522,6 +524,8 @@ public class InBillQueryServiceImpl implements InBillQueryService { for (int i = 0; i < resultJSONArray.size(); i++) { JSONObject json = resultJSONArray.getJSONObject(i); Map mp = new LinkedHashMap<>(); + mp.put("仓库", json.getString("stor_name")); + mp.put("库区", json.getString("sect_name")); mp.put("序号", String.valueOf(i + 1)); mp.put("日期", (json.getString("confirm_time_class").substring(0, 10)).replace("-", "/")); mp.put("班次", json.getString("classes")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 8089a0dc1..f2a9e8200 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -359,13 +359,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { .orElse(null); mp.put("仓库", json.getString("stor_name")); - if (ObjectUtil.isNotEmpty(bill_type) && "1004".equals(bill_type)) { - mp.put("移入仓库", json.getString("in_stor_name")); - } mp.put("库区", json.getString("sect_name")); - mp.put("生产区域", json.getString("pcsn").substring(0, 2)); String bill_type1 = json.getString("bill_type"); - + if(ObjectUtil.isNotEmpty(bill_type1) && "1004".equalsIgnoreCase(bill_type1)){ + mp.put("收货地址（目的仓库）", json.getString("in_stor_name")); + }else{ + mp.put("收货地址（目的仓库）", json.getString("receiptaddress")); + } String bill_name = ""; switch (bill_type1) { case "1001" : diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql index bf51b638c..8f09fe3a7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql @@ -286,7 +286,8 @@ case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type, case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code, case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name, - stor.stor_name AS in_stor_name + stor.stor_name AS in_stor_name, + mst.receiptaddress FROM ( SELECT @@ -413,7 +414,8 @@ case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type, case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code, case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name, - stor.stor_name AS in_stor_name + stor.stor_name AS in_stor_name, + mst.receiptaddress FROM ( SELECT diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue index 9f723be5b..e607f7b5a 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue @@ -69,7 +69,14 @@ /> - + + + { - debugger this.openParam = res this.storId = this.currentRow.stor_id this.divShow = true diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue index 1173745e4..294c6c538 100644 --- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue +++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue @@ -111,8 +111,12 @@ style="width: 100%;" > - + + +