From 2a3cc2f59a17628479f4b2059ceba7a4e32ea227 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 31 Mar 2025 21:26:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8D=95=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 25 ++++++++++--------- .../collect/IoCollectOrderCodeManService.java | 1 - .../api/service/inout/IoSplitCodeService.java | 18 +++++++++++++ src/main/resources/application-dev.yml | 4 +-- src/main/resources/schemas/schema_v2.4.sql | 8 ++++++ 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 5832d9dcd..d889bfced 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -36,6 +36,7 @@ import com.glxp.api.util.Excel.ExcelHandler; import com.glxp.api.util.Excel.Exception.RenException; import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -46,6 +47,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; +@Slf4j @RestController public class IoCollectOrderController extends BaseController { @@ -411,23 +413,22 @@ public class IoCollectOrderController extends BaseController { CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); List collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest); - boolean isAllTag = true; - String msg = ""; - if (CollUtil.isNotEmpty(collectOrderBizResponses)){ + StringBuilder msg = new StringBuilder(); + if (CollUtil.isNotEmpty(collectOrderBizResponses)) { for (int i = 0; i < collectOrderBizResponses.size(); i++) { CollectOrderBizResponse collectOrderBizResponse = collectOrderBizResponses.get(i); - if ( !(StrUtil.isNotEmpty(collectOrderBizResponse.getFinishUdiCode()) || collectOrderBizResponse.getAutoTagStatus() == 2) ) { - isAllTag = false; - String cpmctymc = collectOrderBizResponse.getCpmctymc(); - Integer count = collectOrderBizResponse.getCount(); - Integer autoResCount = IntUtil.value(collectOrderBizResponse.getAutoResCount()); - msg = msg +" "+ cpmctymc + ":未采集数量" + (count - autoResCount) + ";"; + if (!(StrUtil.isNotEmpty(collectOrderBizResponse.getFinishUdiCode()) || collectOrderBizResponse.getAutoTagStatus() == 2)) { + int count = IntUtil.value(collectOrderBizResponse.getShouldCount()) - IntUtil.value(collectOrderBizResponse.getScanCount()); + if (count > 0) { + String cpmctymc = collectOrderBizResponse.getCpmctymc(); + msg.append(" ").append(cpmctymc).append(":未采集数量").append(count).append(";"); + } } } } - - if (!isAllTag) { - return ResultVOUtils.error(502, "该业务单据未全部赋码【" + msg.replaceAll(";$", "") + "】,是否强制完成单据？"); + log.error("msg:{}", msg.toString()); + if (StrUtil.isNotEmpty(msg.toString())) { + return ResultVOUtils.error(502, "该业务单据未全部赋码【" + msg.toString().replaceAll(";$", "") + "】,是否强制完成单据？"); } } collectOrderService.finishOrder(collectOrderRequest, getUser(), false); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 360d1e664..226d04cb5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -131,7 +131,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl collectOrderCodeManList){ + for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeManList) { + // 1. 查找已完成成单据扫码是否已被分配 + + // 2. 查找已完成单据码是否已被上传 + + // 3. 查找已完成码，标记该码已被手动赋码 + + // 4. 查找码库未被使用的码，赋码至已完成的码 + + // 5. 查找 + + } + } + /** * 完成销售出库自动扣工位库存 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2954f83e4..1cbd17a16 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.206:3306/udiwms81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 20 diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index e352c49b9..0241249dc 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5498,6 +5498,14 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'reCount', 1); +CALL Pro_Temp_ColumnWork('io_collect_order_code_man', 'autoCode', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''自动赋码''', + 1); + + + + + CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'uploadYbTime', ' datetime DEFAULT NULL COMMENT ''医保上传时间''', 1);