From 9eec77f03187db772ac109345d980f8319676047 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 15 十二月 2025 11:17:55 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
index 618b165..c5494a9 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
@@ -171,6 +171,8 @@
                 locDetl1.setAppeTime(now);
                 locDetl1.setModiUser(userId);
                 locDetl1.setModiTime(now);
+                locDetl1.setAreaId(locMast.getAreaId());
+                locDetl1.setAreaName(locMast.getAreaName());
                 locDetlService.insert(locDetl1);
             }else if (!Cools.isEmpty(checkOrderDetl.getId())){
                 checkOrderDetl.setDiffQty(checkOrderDetl.getWorkQty().subtract(checkOrderDetl.getAnfme()));
@@ -207,6 +209,9 @@
         }
         List<CheckOrderDetl> selectList = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
         for (CheckOrderDetl checkOrderDetl : selectList) {
+            if (checkOrderDetl.getDiffQty().compareTo(BigDecimal.ZERO) == 0){
+                continue;
+            }
 
             LocDetl locDetl = locDetlService.selectById(checkOrderDetl.getLocDetlId());
             if (Cools.isEmpty(locDetl)) {

--
Gitblit v1.9.1