From c27bbcc497711df8b13d096f4917b5a8f16508c9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 10:28:59 +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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 b2c68b2..36896a9 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
@@ -30,8 +31,10 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.*;
@Service
@@ -100,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);
@@ -160,7 +168,7 @@
//娣诲姞鍑哄叆搴撹褰�
- finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
+ finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime);
Integer finishedGoodsInventorycount = 0;
finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdContainercount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),container);
@@ -906,10 +914,20 @@
for (OrderDetail orderDetail : list) {
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍑哄簱");
- OrderDetail orderDetailNew= finishedGoodsInventoryMapper.findOrderDetailNumberd(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());
+ OrderDetail orderDetailNew= finishedGoodsInventoryMapper.
+ findOrderDetailNumberd(
+ orderDetail.getDeliveryDetail().getOrderId(),
+ orderDetail.getDeliveryDetail().getOrderNumber());
+
+
//娣诲姞鍑哄叆搴撹褰�
finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());
-
+ orderDetailMapper.update(null,
+ new UpdateWrapper<OrderDetail>()
+ .setSql("out_stock_num = ifnull(out_stock_num,0)+"+orderDetail.getDeliveryDetail().getQuantity())
+ .eq("order_id",orderDetail.getDeliveryDetail().getOrderId())
+ .eq("order_number",orderDetail.getDeliveryDetail().getOrderNumber())
+ );
//鍒ゆ柇鍙戣揣鍗曠殑搴撳瓨鏄惁瀛樺湪
Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getBoxNo());
@@ -924,6 +942,14 @@
Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
//鑾峰彇宸茬粡鍑哄簱鐨勬暟閲�
Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
+ //鑾峰彇璁㈠崟宸茬粡鍑哄簱鐨勬暟閲�
+ OrderDetail orderDetail1 = orderDetailMapper.
+ selectOne(new QueryWrapper<OrderDetail>()
+ .select("ifnull(sum(out_stock_num),0) as out_stock_num")
+ .eq("order_id",orderDetail.getDeliveryDetail().getOrderId())
+ );
+
+
if(deliverydetailsum==null){
deliverydetailsum=0;
}
@@ -954,10 +980,11 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==orderNumberdDeliverysum) {
+ if (Objects.equals(ordersum, orderDetail1.getOutStockNum())) {
//if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
- finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
+ finishedGoodsInventoryMapper.
+ updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
}
if (deliverysum==deliverydetailsum+orderDetail.getDeliveryDetail().getQuantity()) {
//淇敼鍙戣揣琛ㄧ姸鎬�
@@ -1038,6 +1065,20 @@
finishedOperateLog.getQuantity(),
finishedOperateLog.getRemarks()
);
+ //淇敼璁㈠崟鏄庣粏 鍑哄簱鏁伴噺
+ orderDetailMapper.update(null,
+ new LambdaUpdateWrapper<OrderDetail>().
+ setSql("out_stock_num = ifnull(out_stock_num,0)-"+finishedOperateLog.getQuantity())
+ .eq(OrderDetail::getOrderId, finishedOperateLog.getOrderId())
+ .eq(OrderDetail::getOrderNumber, finishedOperateLog.getOperationNumber())
+ );
+
+ OrderDetail orderDetail1 = orderDetailMapper.
+ selectOne(new QueryWrapper<OrderDetail>()
+ .select("ifnull(sum(out_stock_num),0) as out_stock_num")
+ .eq("order_id",finishedOperateLog.getOrderId())
+ );
+
//淇敼鍙戣揣鏄庣粏琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDetailState(
finishedOperateLog.getOrderId(),
@@ -1052,7 +1093,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){
+ if (orderDetail1.getOutStockNum()==0){
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);
@@ -1106,7 +1147,7 @@
finishedGoodsInventory.setId(null);
finishedGoodsInventory.setInventory(finishedGoodsInventory.getQuantityAvailable());
finishedGoodsInventory.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getActualSignalArea());
-
+ finishedGoodsInventory.setEnterStorageTime(null);
finishedGoodsInventoryMapper.
update(oldFinishedGoodsInventory,
new LambdaUpdateWrapper<FinishedGoodsInventory>()
--
Gitblit v1.8.0