From 296203344a6d3c0b7f9208960c89a6cb02d59ed9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 26 八月 2025 16:51:19 +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 | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 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 c54ea6c..a128573 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,6 +31,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -906,10 +908,18 @@
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,11 +934,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())
+ );
- Integer finishedOperateLogQuantitySum = finishedGoodsInventoryMapper.findFinishedOperateLogQuantity(orderDetail.getDeliveryDetail().getOrderId());
- if(finishedOperateLogQuantitySum==null){
- finishedOperateLogQuantitySum=0;
- }
+
if(deliverydetailsum==null){
deliverydetailsum=0;
}
@@ -959,10 +972,11 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==finishedOperateLogQuantitySum) {
+ 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()) {
//淇敼鍙戣揣琛ㄧ姸鎬�
@@ -1043,6 +1057,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(),
@@ -1057,7 +1085,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){
+ if (orderDetail1.getOutStockNum()==0){
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);
--
Gitblit v1.8.0