From fe0c2392123c13a50a773e503cfce6528374271d Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期四, 20 十一月 2025 16:00:44 +0800
Subject: [PATCH] 入庫功能優化

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 6f31073..0454885 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -20,6 +20,7 @@
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.mapper.*;
 import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
 import com.vincent.rsf.server.system.constant.CodeRes;
 import com.vincent.rsf.server.system.constant.GlobalConfigCode;
 import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -127,6 +128,8 @@
     private CompanysService companysService;
     @Autowired
     private OutStockService outStockService;
+    @Autowired
+    private BasContainerService basContainerService;
 
     /**
      * @return
@@ -533,16 +536,34 @@
      * @time 2025/4/7 16:58
      */
     @Override
-    public R getDeltByCode(Map<String, Object> params) {
-        Object code = params.get("code");
-        Object matnrCode = params.get("matnrCode");
-        Object asnCode = params.get("asnCode");
-        Object crushNo = params.get("fieldsIndex");
-        Object batch = params.get("batch");
+    public R getDeltByCode(Map<String, String> params) {
+        String code = params.get("code");
+        String matnrCode = params.get("matnrCode");
+        String asnCode = params.get("asnCode");
+        String crushNo = params.get("fieldsIndex");
+        String batch = params.get("batch");
+//        String barcode = params.get("barcode");
+
+        if (Objects.isNull(crushNo)) {
+            throw new CoolException("绁ㄥ彿涓嶈兘涓虹┖锛侊紒");
+        }
+//        if (Objects.isNull(code)) {
+//            throw new CoolException("瀹瑰櫒鍙蜂笉鑳戒负绌猴紒锛�");
+//        }
+//        BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, barcode));
+//        if (Objects.isNull(container)) {
+//            throw new CoolException("瀹瑰櫒涓嶅瓨鍦紒锛�");
+//        }
+//        if (!Objects.isNull(params.get("isHalf")) && !params.get("isHalf").equals("0")) {
+//            container.setIsHalf(1);
+//            if (!basContainerService.updateById(container)) {
+//                throw new CoolException("瀹瑰櫒鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+//            }
+//        }
+
         String fieldIndex = null;
         if (!Objects.isNull(crushNo)) {
             FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, crushNo).last("Limit 1"));
-
             if (!Objects.isNull(fieldsItem)) {
                 fieldIndex = fieldsItem.getUuid();
             }
@@ -551,7 +572,7 @@
         LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
                 .or().eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
                 .or().eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
-                .or().eq(!Cools.isEmpty(fieldIndex), WarehouseAreasItem::getFieldsIndex, fieldIndex)
+                .or().eq(WarehouseAreasItem::getFieldsIndex, fieldIndex)
                 .or().eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
                 .or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
         List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);

--
Gitblit v1.9.1