From d767b7119cfb7a943e757bcc3c9e496e7746e79b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 26 Dec 2024 15:10:48 +0800
Subject: [PATCH] md

---
 .../emis/service/impl/EmisSettleBillServiceImpl.java   |  3 +++
 .../service/impl/EmisWarehouseInBatchServiceImpl.java  | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
index 2a0de1a23..a4b3419ea 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
@@ -488,6 +488,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
             return 0;
         }
 
+        // 已开票金额
         BigDecimal totalMoney = BigDecimal.ZERO;
         // 所有开票金额 = 已开票金额+不开票金额
         BigDecimal totalAllMoney = BigDecimal.ZERO;
@@ -501,6 +502,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                 String billNo= MapUtils.getString(mapItem,"billNo",null);
                 BigDecimal sumMoney = BigDecimal.valueOf(Double.valueOf(mapItem.get("sumMoney").toString()));
                 hasOpenBillMap.put(billNo,sumMoney);
+
+                totalMoney=totalMoney.add(sumMoney);
             }
 
             // 获取账单运单列表,重新计算每一单的开票状态
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index 81216c2fd..6e43c942b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -95,20 +95,18 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
             throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空");
         }
 
-
-        // 进仓序列号
+        // 进仓序列号,插入进仓批次
         String serialNo= WaybillHelper.genWsInSerialNo();
-
         emisWarehouseInBatch.setSerialNo(serialNo);
         emisWarehouseInBatch.setEntryDate(new Date());
+        emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
 
+        // 插入进仓商品明细,关联商品序号
         for(EmisWarehouseInDtl item:cargoList){
-            item.setId(null);
+            item.setInSerialNo(serialNo);
             emisWarehouseInDtlMapper.insertEmisWarehouseInDtl(item);
         }
 
-        emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
-
         // 插入运单商品附件图片
         if(!StringUtils.isEmpty(emisWarehouseInBatch.getPicUrl()) ){