From 2868dfb34a9bf41cfacf1b9a0f74d7fc336dc5d9 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 10 Oct 2023 17:37:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E8=AE=A2=E5=8D=95v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/mes/ProRfidProcessDetailMapper.xml | 8 ++++---- .../main/java/com/op/plan/mapper/ProWhiteOrderMapper.java | 2 +- .../op/plan/service/impl/ProWhiteOrderServiceImpl.java | 2 +- .../main/resources/mapper/plan/ProWhiteOrderMapper.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml index 5ed1a4c7..1eb1d253 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml @@ -60,10 +60,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ppd.update_time as updateTime, ppd.work_batch_code as workBatchCode, ppd.bind_status as bindStatus, - pp.process_code as nowProcessCode, - pp.process_name as nowProcessName, - ppp.process_code as nextProcessCode, - ppp.process_name as nextProcessName, + pp.process_code as nextProcessCode, + pp.process_name as nextProcessName, + ppp.process_code as nowProcessCode, + ppp.process_name as nowProcessName, pow.order_code as orderCode from pro_rfid_process_detail ppd left join pro_process pp on pp.process_id = ppd.next_process_id diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java index fb6055a1..eeb0e2de 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java @@ -82,5 +82,5 @@ public interface ProWhiteOrderMapper { */ List selectProShift(); - Integer getTodayMaxNum(); + Integer getTodayMaxNum(ProOrder proOrder); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java index 2da0476b..d93ce2e3 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java @@ -98,7 +98,7 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService { proOrder.setQuantitySplit(0L); proOrder.setOrderType(proOrder.getProdType()); String bpDD = "DD" + DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); - int liushuiNum = proWhiteOrderMapper.getTodayMaxNum(); + int liushuiNum = proWhiteOrderMapper.getTodayMaxNum(proOrder); String liushuiStr = String.format("%04d", liushuiNum); proOrder.setOrderCode(bpDD+liushuiStr); proOrder.setCreateBy(SecurityContextHolder.getUserName()); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml index 10f0338d..9fe3c285 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml @@ -91,7 +91,7 @@ insert into pro_order