From fcc929fa2888c6b06a168f1ca84344e3bf9fdce5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 11:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index a128573..3074266 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -34,6 +34,7 @@
import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.*;
@Service
@@ -102,6 +103,11 @@
if (object.get("decValue") != null) {
decValue = Integer.parseInt(object.get("decValue").toString());
}
+ String createTime = null;
+ if(object.get("createTime")!=null){
+ createTime = object.get("createTime").toString();
+ }
+
Log log = new Log();
log.setOperator(userName);
log.setOperatorId(userId);
@@ -112,6 +118,8 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FlowCard> flowCardlist = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!flowCardlist.isEmpty()){
+ //鍒犻櫎涓�骞村墠涓斿彂璐х殑璁㈠崟搴撳瓨淇℃伅
+ finishedGoodsInventoryMapper.deleteFinishedGoodsInventoryDate();
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍏ュ簱");
for (FlowCard flowCards : flowCardlist) {
@@ -162,7 +170,7 @@
//娣诲姞鍑哄叆搴撹褰�
- finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
+ finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime,getComputeArea.doubleValue());
Integer finishedGoodsInventorycount = 0;
finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdContainercount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),container);
@@ -189,7 +197,7 @@
finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
}
} else {
- if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container)) {
+ if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container,getComputeArea.doubleValue())) {
//淇敼娴佺▼鍗¤〃鍏ュ簱鏁伴噺
finishedGoodsInventoryMapper.updateflowcard(flowCard);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
@@ -912,6 +920,8 @@
findOrderDetailNumberd(
orderDetail.getDeliveryDetail().getOrderId(),
orderDetail.getDeliveryDetail().getOrderNumber());
+
+
//娣诲姞鍑哄叆搴撹褰�
finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());
orderDetailMapper.update(null,
@@ -1134,11 +1144,13 @@
oldFinishedGoodsInventory.setInventory(oldFinishedGoodsInventory.getInventory()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setQuantityAvailable(oldFinishedGoodsInventory.getQuantityAvailable()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getActualSignalArea());
+ oldFinishedGoodsInventory.setComputeGrossArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getComputeArea());
//鏂板簱瀛樻暟鎹鍔�
finishedGoodsInventory.setId(null);
finishedGoodsInventory.setInventory(finishedGoodsInventory.getQuantityAvailable());
finishedGoodsInventory.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getActualSignalArea());
+ finishedGoodsInventory.setComputeGrossArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
finishedGoodsInventory.setEnterStorageTime(null);
finishedGoodsInventoryMapper.
update(oldFinishedGoodsInventory,
@@ -1150,6 +1162,8 @@
//寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
+ finishedOperateLog.setComputeArea(finishedGoodsInventory.getComputeArea());
finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+finishedGoodsInventory.getBoxNo());
finishedOperateLogMapper.insert(finishedOperateLog);
@@ -1170,10 +1184,12 @@
oldFinishedGoodsInventory.setInventory(oldFinishedGoodsInventory.getInventory()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setQuantityAvailable(oldFinishedGoodsInventory.getQuantityAvailable()-finishedGoodsInventory.getQuantityAvailable());
oldFinishedGoodsInventory.setArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getActualSignalArea());
+ oldFinishedGoodsInventory.setComputeGrossArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getComputeArea());
existFinishedGoodsInventory.setInventory(existFinishedGoodsInventory.getInventory()+finishedGoodsInventory.getQuantityAvailable());
existFinishedGoodsInventory.setQuantityAvailable(existFinishedGoodsInventory.getQuantityAvailable()+finishedGoodsInventory.getQuantityAvailable());
existFinishedGoodsInventory.setArea(existFinishedGoodsInventory.getInventory()*existFinishedGoodsInventory.getActualSignalArea());
+ existFinishedGoodsInventory.setComputeGrossArea(existFinishedGoodsInventory.getInventory()*existFinishedGoodsInventory.getComputeArea());
finishedGoodsInventoryMapper.
update(oldFinishedGoodsInventory,
@@ -1188,6 +1204,7 @@
//寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setComputeArea(existFinishedGoodsInventory.getComputeArea());
finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+existFinishedGoodsInventory.getBoxNo());
finishedOperateLogMapper.insert(finishedOperateLog);
--
Gitblit v1.8.0