From c25bdbd0999766405a09ee52f494df5edda9739d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 07:59:05 +0800
Subject: [PATCH] 添加忽略策略

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 227029c..923f464 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
@@ -43,6 +43,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -166,12 +167,15 @@
             throw new CoolException("搴撳尯鏍囪瘑涓嶈兘涓虹┖锛侊紒");
         }
 
-        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
+        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
+                .eq(WarehouseAreas::getId, params.getWhAreaId()));
         if (Objects.isNull(areasItem)) {
             throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶅簱鍖轰笉瀛樺湪锛侊紒");
         }
         //鑾峰彇宸插惎鐢ㄧ殑鍔ㄦ�佹墿灞曞瓧
-        List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
+        List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>()
+                .eq(Fields::getFlagEnable, 1)
+                .eq(Fields::getStatus, 1));
 
         List<ReceiptDetlsDto> receipts = params.getReceipts();
         List<WarehouseAreasItem> allOrders = new ArrayList<>();
@@ -180,7 +184,8 @@
 
         String asnCode = receipts.stream().findFirst().get().getAsnCode();
 
-        AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+        AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>()
+                .eq(AsnOrder::getCode, asnCode));
         if (Objects.isNull(asnOrder)) {
             throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
         }
@@ -208,16 +213,24 @@
             if (Objects.isNull(orderItem)) {
                 throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
             }
-            orderItem.setQty(dto.getReceiptQty());
+            orderItem.setQty(dto.getReceiptQty())
+                    .setProdTime(dto.getProdTime());
 
             if (asnOrderItemMapper.updateById(orderItem) < 1) {
                 throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
             }
 
             WarehouseAreasItem item = new WarehouseAreasItem();
+//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//            String format = null;
+//            if (Objects.isNull(dto.getProdTime())) {
+//                 format = dateFormat.format(dto.getProdTime());
+//            }
             item.setBarcode(dto.getBarcode())
                     .setAreaName(areasItem.getName())
                     .setAreaId(areasItem.getId())
+                    .setProdTime(dto.getProdTime())
+                    .setWeight(dto.getWeigth())
                     .setStockUnit(dto.getStockUnit())
                     .setBatch(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto))
                     .setAnfme(dto.getReceiptQty())

--
Gitblit v1.9.1