From b66107bed6f1651a56fb4bb9a8ae91a744e6fa84 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 15 Feb 2025 15:50:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?opt:=20=E4=BA=8C=E6=9C=9F=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IPdmBiSlittingproductionplanService.java | 7 +++++++ .../impl/PdmBiSlittingproductionplanServiceImpl.java | 7 +++++++ .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index 38c9950dd..31675575f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -129,4 +129,11 @@ public interface IPdmBiSlittingproductionplanService extends IService getByQzzNoByNoStatus(String qzzno); + + /** + * 根据子卷号获取一条记录 + * @param containerName + * @return + */ + PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index a2f1eff72..762b25f92 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -184,4 +184,11 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); + lam.eq(PdmBiSlittingproductionplan::getContainer_name, containerName); + return getOne(lam, false); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 30f7cf502..79baa0730 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -1946,7 +1946,7 @@ public class SlitterServiceImpl implements SlitterService { // 虚拟计划 for (int i = 0; i < 4; i++) { String containerName = area + "虚拟-" + deviceCode + "-" + i; - PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName); + PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerNameNotStatus(containerName); if (ObjectUtil.isEmpty(plan)) { plan = new PdmBiSlittingproductionplan(); plan.setWorkorder_id(IdUtil.getSnowflake(1,1).nextIdStr()); From 5f47a5298b3e62909f19e8bb4c792080915342e1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Sun, 16 Feb 2025 10:59:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CheckOutBillServiceImpl.java | 2 + .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 42 +++++-------------- 2 files changed, 12 insertions(+), 32 deletions(-) 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 e77b2e72f..5f32b6614 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 @@ -124,6 +124,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { map.put("box_no", "%" + map.get("box_no") + "%"); } + map.put("flag", "11"); } if (StrUtil.isNotEmpty(map.get("width"))) { @@ -146,6 +147,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } else { map.put("pcsn", "%" + map.get("pcsn") + "%"); } + map.put("flag", "11"); } // 空格查询 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 6ab99b36d..7dad8b34f 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 @@ -160,39 +160,17 @@ ) c ON ios.iostorinv_id = c.iostorinv_id LEFT JOIN ( SELECT - dis.iostorinv_id + SUM(a.plan_qty) AS plan_qty, + a.iostorinv_id FROM - st_ivt_iostorinvdis dis + st_ivt_iostorinvdis a + LEFT JOIN ST_IVT_IOStorInv b ON a.iostorinv_id = b.iostorinv_id WHERE - 1 = 1 - OPTION 输入.pcsn <> "" - dis.pcsn like 输入.pcsn - ENDOPTION - OPTION 输入.pcsn_in <> "" - dis.pcsn IN 输入.pcsn_in - ENDOPTION - OPTION 输入.box_no <> "" - dis.box_no like 输入.box_no - ENDOPTION - OPTION 输入.box_no_in <> "" - dis.box_no IN 输入.box_no_in - ENDOPTION - GROUP BY - dis.iostorinv_id - ) b ON b.iostorinv_id = ios.iostorinv_id - LEFT JOIN ( - SELECT - SUM(a.plan_qty) AS plan_qty, - a.iostorinv_id - FROM - st_ivt_iostorinvdis a - LEFT JOIN ST_IVT_IOStorInv b ON a.iostorinv_id = b.iostorinv_id - WHERE - b.io_type = '1' - and b.is_delete='0' - and b.is_overdue = '0' - GROUP BY a.iostorinv_id - ) a ON a.iostorinv_id = ios.iostorinv_id + b.io_type = '1' + and b.is_delete='0' + and b.is_overdue = '0' + GROUP BY a.iostorinv_id + ) a ON a.iostorinv_id = ios.iostorinv_id ENDSELECT ENDPAGEQUERY ENDIF @@ -268,7 +246,7 @@ dtl.iostorinv_id, dtl.vbeln ) c ON ios.iostorinv_id = c.iostorinv_id - LEFT JOIN ( + inner JOIN ( SELECT dis.iostorinv_id FROM