From 6c5b78f2cfe887b1d3a90e1c006670dc9d5f7da3 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 27 Oct 2022 10:33:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/logback-spring.xml | 96 ++++++++++++++-----
1 file changed, 72 insertions(+), 24 deletions(-)
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index be0616438..c4e5e9403 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -77,27 +77,44 @@ https://juejin.cn/post/6844903775631572999
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -105,35 +122,66 @@ https://juejin.cn/post/6844903775631572999
-
+
-
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
From d34d4d997cb23b08d7bcdd6568608b590b3410dc Mon Sep 17 00:00:00 2001
From: liuxy
Date: Thu, 27 Oct 2022 10:36:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/StorPublicServiceImpl.java | 8 ++++++--
.../service/impl/CheckOutBillServiceImpl.java | 2 --
.../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 4 ++--
.../src/views/wms/st/outbill/ViewDialog.vue | 20 +++++++++----------
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
index d15dc26ea..c4c1dc4e6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
@@ -484,10 +484,12 @@ public class StorPublicServiceImpl implements StorPublicService {
}
}
}
+ wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
+ wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
}else{//锁定
map.put("lock_type",lock_type);
- map.put("taskdtl_type",from.getString("taskdtl_type"));
- map.put("taskdtl_id",from.getString("taskdtl_id"));
+ map.put("taskdtl_type",from.getString("task_type"));
+ map.put("taskdtl_id",from.getString("task_id"));
map.put("task_code",from.getString("task_code"));
map.put("inv_type",from.getString("inv_type"));
map.put("inv_id",from.getString("inv_id"));
@@ -505,6 +507,8 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("point_status","01");
}
}
+ wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
+ wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
}
}
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 05e1b1fec..3a11739a4 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
@@ -362,8 +362,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
.addParam("material_id", dtl.getString("material_id"))
.addParam("quality_scode", dtl.getString("quality_scode"))
.addParam("pcsn", dtl.getString("pcsn"))
- .addParam("ivt_level", dtl.getString("ivt_level"))
- .addParam("is_active", dtl.getString("is_active"))
.addParam("iostorinv_id", whereJson.getString("iostorinv_id"))
.addParam("stor_id", whereJson.getString("stor_id"))
.addParam("sect_id", whereJson.getString("sect_id"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index d86d83c24..30d908b92 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -527,8 +527,7 @@
dis.*,
mater.material_code,
mater.material_name,
- task.point_code1 AS start_point_code,
- task.point_code2 AS next_point_code,
+ point.point_code AS next_point_code,
task.task_id,
task.task_code,
task.task_type,
@@ -536,6 +535,7 @@
FROM
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
+ LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
WHERE
1=1
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index 555f89694..171394d5f 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -8,7 +8,7 @@
@close="close"
@open="open"
>
-
+
@@ -105,9 +105,9 @@
@current-change="handleDtlCurrentChange"
>
-
+
-
+
@@ -135,12 +135,12 @@
>
-
+
-
-
-
+
+
+
@@ -152,8 +152,8 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
-import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
-import crudRawAssist from "@/views/wms/st/inbill/rawassist";
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'ViewDialog',
@@ -178,7 +178,7 @@ export default {
storlist: [],
currentdtl: null,
currentDis: {},
- form:{}
+ form: {}
}
},
watch: {