From 641c390cd0372c5960388751490709c118ee41b7 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sat, 10 Dec 2022 15:37:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/RawAssistIStorServiceImpl.java | 8 +
.../st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql | 31 ++-
.../service/impl/CheckOutBillServiceImpl.java | 2 +-
.../wms/pdm/order/slittingplan/index.vue | 204 ++++++++++--------
.../src/views/wms/pub/StructDialog.vue | 1 -
.../src/views/wms/sch/task/index.vue | 151 +++++++------
.../src/views/wms/st/inbill/AddDialog.vue | 5 +-
.../src/views/wms/st/inbill/AddDtl.vue | 14 +-
.../src/views/wms/st/inbill/DivDialog.vue | 2 +
.../src/views/wms/st/inbill/TaskDialog.vue | 26 +--
.../src/views/wms/st/inbill/index.vue | 18 ++
11 files changed, 272 insertions(+), 190 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index f65651984..cb9986bb9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -71,9 +71,17 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
map.put("create_mode", (String) whereJson.get("create_mode"));
map.put("bill_status", (String) whereJson.get("bill_status"));
String bill_code = MapUtil.getStr(whereJson, "bill_code");
+ String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
+ String pcsn = MapUtil.getStr(whereJson, "pcsn");
if (!ObjectUtil.isEmpty(bill_code)) {
map.put("bill_code", "%" + bill_code + "%");
}
+ if (!ObjectUtil.isEmpty(sap_pcsn)) {
+ map.put("sap_pcsn", "%" + sap_pcsn + "%");
+ }
+ if (!ObjectUtil.isEmpty(pcsn)) {
+ map.put("pcsn", "%" + pcsn + "%");
+ }
String begin_time = (String) whereJson.get("begin_time");
if (!StrUtil.isEmpty(begin_time)) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index 8365d9484..513aa4a79 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -20,6 +20,8 @@
输入.bill_code TYPEAS s_string
输入.create_mode TYPEAS s_string
输入.stor_id TYPEAS s_string
+ 输入.sap_pcsn TYPEAS s_string
+ 输入.pcsn TYPEAS s_string
输入.bill_status TYPEAS s_string
输入.bill_type TYPEAS s_string
输入.box_no TYPEAS s_string
@@ -58,10 +60,12 @@
IF 输入.flag = "1"
PAGEQUERY
- SELECT
+ SELECT DISTINCT
ios.*
FROM
ST_IVT_IOStorInv ios
+ LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
ios.is_delete = '0'
AND
@@ -71,6 +75,12 @@
OPTION 输入.bill_code <> ""
ios.bill_code like 输入.bill_code
ENDOPTION
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn like 输入.sap_pcsn
+ ENDOPTION
+ OPTION 输入.pcsn <> ""
+ dis.pcsn like 输入.pcsn
+ ENDOPTION
OPTION 输入.stor_id <> ""
ios.stor_id = 输入.stor_id
ENDOPTION
@@ -108,7 +118,8 @@
width,
thickness,
net_weight,
- net_weight AS plan_qty
+ net_weight AS plan_qty,
+ sap_pcsn
FROM
pdm_bi_subpackagerelation sub
WHERE
@@ -125,6 +136,9 @@
OPTION 输入.package_box_sn <> ""
sub.package_box_sn = 输入.package_box_sn
ENDOPTION
+ OPTION 输入.package_box_sn <> ""
+ sub.sap_pcsn = 输入.sap_pcsn
+ ENDOPTION
OPTION 输入.container_name <> ""
sub.container_name = 输入.container_name
ENDOPTION
@@ -151,7 +165,7 @@
st_ivt_iostorinvdtl dtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
- LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dtl.pcsn
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dtl.pcsn AND dtl.box_no = sub.package_box_sn
where
mst.bill_code = 输入.bill_code
OPTION 输入.open_flag = "1"
@@ -171,11 +185,13 @@
mb.material_code,
mb.material_name,
po.point_code,
- po.point_name
+ po.point_name,
+ sub.sap_pcsn
FROM
st_ivt_iostorinvdis dis
INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
LEFT JOIN SCH_BASE_POINT po ON po.point_id = dis.point_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
where
dis.box_no = 输入.package_box_sn
AND
@@ -204,12 +220,14 @@
po.point_name,
dis.iostorinvdis_id,
dis.task_id,
- dis.box_no
+ dis.box_no,
+ sub.sap_pcsn
FROM
st_ivt_iostorinvdis dis
INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
LEFT JOIN sch_base_point po ON po.point_id = dis.point_id
LEFT JOIN sch_base_task task ON task.task_id = dis.task_id AND task.is_delete = '0'
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
WHERE
dis.task_id <> ''
AND
@@ -622,7 +640,8 @@
width,
thickness,
net_weight,
- net_weight AS plan_qty
+ net_weight AS plan_qty,
+ sap_pcsn
FROM
pdm_bi_subpackagerelation sub
WHERE
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 0fc6ff80d..26a291aeb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2095,7 +2095,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
// 如果是拆分入库则将包装关系改为生成状态
- if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009") && StrUtil.isNotEmpty(dtl_jo.getString("source_bill_code")))){
+ if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009") && StrUtil.isEmpty(dtl_jo.getString("source_bill_code")))){
jsonSub.put("status", "0");
} else {
jsonSub.put("status", "3");
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index 50e47decf..8685aeb2d 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -11,99 +11,119 @@
label-width="11 0px"
label-suffix=":"
>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
index 2b2810b85..d31f11ccc 100644
--- a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
@@ -49,7 +49,6 @@
-
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 226b2c09c..a9665f423 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -10,75 +10,90 @@
label-width="80px"
label-suffix=":"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
index 98faa053b..dd2325634 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
@@ -130,12 +130,13 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
-
-
+
+
+
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
index ed0d0142a..a911a9dc7 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
@@ -44,6 +44,15 @@
clearable
size="mini"
placeholder="物料编码"
+ style="width: 230px;"
+ class="filter-item"
+ @keyup.enter.native="crud.toQuery"
+ />
+
-
+
+
-
+
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
index cb60e505a..182adf6f9 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
@@ -55,6 +55,7 @@
+