From d5f3142c43c26e34cb182d8a93a16c2cf5a69215 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 24 Oct 2024 17:06:49 +0800
Subject: [PATCH] =?UTF-8?q?10/24=20bug=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/inout/IoCodeTempController.java   | 8 ++++++--
 .../com/glxp/api/controller/inout/IoOrderController.java  | 4 ++++
 .../com/glxp/api/res/purchase/PurOrderDetailResponse.java | 1 +
 .../glxp/api/service/collect/IoCollectOrderService.java   | 7 ++-----
 src/main/java/com/glxp/api/service/sync/HeartService.java | 1 -
 .../mybatis/mapper/purchase/PurApplyDetailDao.xml         | 3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index fd35781f4..f201eb940 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -2194,8 +2194,12 @@ public class IoCodeTempController extends BaseController {
             //扫码数量-1
             int orderCount = orderDetailCodeEntity.getCount();
             orderDetailCodeEntity.setCount(orderCount - count);
-
-            int reCount = count * udiCalCountUtil.getActCount(codeTempEntity.getNameCode());
+            int reCount;
+            if (bussinessTypeEntity.isUse()) {
+                reCount = count * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0));
+            } else {
+                reCount = count * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0));
+            }
             orderDetailCodeEntity.setReCount(IntUtil.value(orderDetailCodeEntity.getReCount()) - reCount);
             ioOrderDetailCodeService.update(orderDetailCodeEntity);
         }
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 11c8c3212..21f485371 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -432,6 +432,10 @@ public class IoOrderController extends BaseController {
                 if (fifoCodeEntity == null && StrUtil.isEmpty(fifoCodeEntity.getSerialNo())) {
                     return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() + "未上货!");
                 }
+                //校验工位库存
+                if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){
+                    return ResultVOUtils.error(500, "当前码:库存不足!");
+                }
             }
         }
 
diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
index 43cc77244..392e95e99 100644
--- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
+++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
@@ -70,4 +70,5 @@ public class PurOrderDetailResponse {
     private String packUnit;
     private String prepnSpec;
     private String prepnUnit;
+
 }
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 0608e6a7b..b2293d2f4 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -148,10 +148,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     SpGetHttpClient spGetHttpClient;
 
 
-
-
-
-
     public IoCollectOrder getByBillNo(String billNo) {
         return collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo).last("limit 1"));
     }
@@ -320,6 +316,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                     .splitStatus(0)
                     .tagStatus(1)
+                    .remark(ioOrderEntity.getRemark())
                     .build();
             if (collectOrder.getWorkPlaceCode() != null) {
                 collectOrder.setTagStatus(1);
@@ -801,7 +798,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
             //更新数据至第三方系统
             //单据更新
-            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(),authAdmin);
+            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin);
 //            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
         });
     }
diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java
index db9079072..bf57e1535 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -1517,7 +1517,6 @@ public class HeartService {
                                     orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
                                     orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
-                                    //todo 单据备注没有传过来需要自助那边改掉
                                     orderEntity.setId(null);
                                     orderService.insertOrder(orderEntity);
                                     insetOrderDb(syncDataResponse, orderEntity);
diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
index 70835c4e4..175522a06 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
@@ -25,6 +25,7 @@
                pur_apply_detail.*,
                basic_products.nameCode nameCode,
                basic_products.ggxh     spec,
+               basic_products.packUnit,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,
                basic_products.spmc,
@@ -204,6 +205,6 @@
             </if>
             and  (pur_apply.status = 3 or saf.status = 3)
         </where>
-        GROUP BY basic_products.uuid
+#         GROUP BY basic_products.uuid
     </select>
 </mapper>