From 8ca99c1e0bef2bba55fc180518aaf1b0680e1307 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 25 Feb 2025 15:42:58 +0800 Subject: [PATCH] =?UTF-8?q?2/25=20=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/collect/IoCollectOrderController.java | 3 +++ .../com/glxp/api/req/collect/CollectOrderBizRequest.java | 5 +++++ .../java/com/glxp/api/req/collect/CollectOrderRequest.java | 4 ++++ .../glxp/api/res/collect/CollectOrderCodeManResponse.java | 1 + .../com/glxp/api/service/collect/IoCollectCodeService.java | 7 +++++-- .../glxp/api/service/collect/IoCollectOrderBizService.java | 6 ++++-- .../glxp/api/service/collect/IoCollectOrderService.java | 4 ++-- .../mapper/collect/IoCollectOrderCodeAutoMapper.xml | 1 + .../mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml | 1 + 9 files changed, 26 insertions(+), 6 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 b854176c9..7e93830e9 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -457,6 +457,9 @@ public class IoCollectOrderController extends BaseController { //1.校验是否全部自动赋码 CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); + if (collectOrderRequest.getIsCheckFinish() != null){ + collectOrderBizRequest.setIsOrderCheck(collectOrderRequest.getIsCheckFinish()); + } List collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest); boolean isAllTag = collectOrderBizResponses.stream() .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2); diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java index 61b6a9818..bd013e985 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java @@ -124,4 +124,9 @@ public class CollectOrderBizRequest extends ListPageRequest { private String checkCode; private String udiCode; + + /** + * 如果不为null 就是单据审核页面不需要槽位 + */ + private Integer isOrderCheck; } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 94559c22f..115a59d49 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -165,4 +165,8 @@ public class CollectOrderRequest extends ListPageRequest { private Boolean forceAllot; + private Integer isCheckFinish; + + + } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java index 8f27178fd..b0a6ebdd3 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java @@ -33,6 +33,7 @@ public class CollectOrderCodeManResponse { private Long updateUser; private String cpmctymc; + private String prepnSpec; private String ggxh; private String batchNo; private Integer scanCount; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java index 734047ba7..83b6d0dd1 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -64,12 +64,15 @@ public class IoCollectCodeService extends ServiceImpl list = collectOrderBizService.filterList(collectOrderBizRequest); List splitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 1); @@ -96,7 +99,7 @@ public class IoCollectCodeService extends ServiceImpl data = collectOrderBizMapper.filterList(collectOrderRequest); - for (CollectOrderBizResponse collectOrderBizResponse : data){ - collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse)); + if (collectOrderRequest.getIsOrderCheck() == null){ + for (CollectOrderBizResponse collectOrderBizResponse : data){ + collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse)); + } } return data; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 8cc94e17c..ef6902962 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -847,7 +847,7 @@ public class IoCollectOrderService extends ServiceImpl { //插入到码表 - collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo()); + collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(),null); //更新数据至第三方系统 //单据更新 ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin); diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml index 8a9b98cc5..56d924ca3 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml @@ -32,6 +32,7 @@ AND icoca.fifoSplit = #{fifoSplit} + group by icoca.udiCode