From d80907cd2f96c99bb8875cba6b20f26306c88812 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 二月 2024 13:39:28 +0800
Subject: [PATCH] 前端筛选，发货界面的复选框显示修改
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 31a0efe..65fe248 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
@@ -76,7 +76,6 @@
String oddNumber= orderNumberSetting("鍏ュ簱");
//娣诲姞鍑哄叆搴撹褰�
finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber);
- System.out.println(flowCard.getOrder().getOrderId());
Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());
@@ -147,21 +146,30 @@
//娣诲姞鍑哄叆搴撹褰�
finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber);
Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());
- System.out.println("鏁版嵁3:"+finishedGoodsInventorycount);
+
Integer finishedGoodsInventorybycount=finishedGoodsInventoryMapper.finishedGoodsInventorybycount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getDeliveryDetail().getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getDeliveryDetail().getOrderId());
- System.out.println("璁㈠崟鎬绘暟:" + ordersum + "璁㈠崟鍓╀綑鏁伴噺锛�" + ordernumbersum + "鍑嗗鍑哄簱鏁伴噺" + orderDetail.getWarehouseNum()+ "搴撳瓨鏁伴噺" + finishedGoodsInventorybycount);
+ Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
+ Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
+ if(deliverydetailsum==null){
+ deliverydetailsum=0;
+ }
+
+ System.out.println("璁㈠崟鎬绘暟:" + ordersum + "璁㈠崟鍓╀綑鏁伴噺锛�" + ordernumbersum + "鍑嗗鍑哄簱鏁伴噺" +
+ orderDetail.getWarehouseNum()+ "鍙戣揣鏁伴噺" + orderDetail.getDeliveryNum()+ "鍙戣揣鎬绘暟" +
+ deliverysum+ "宸插彂鏁伴噺" + deliverydetailsum);
if (finishedGoodsInventorycount > 0) {
- if(Objects.equals(finishedGoodsInventorybycount, orderDetail.getWarehouseNum())){
- System.out.println(123);
+ if(orderDetail.getWarehouseNum()>=orderDetail.getDeliveryNum()){
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
//finishedGoodsInventoryMapper.updateInventoryquantityavailable(orderDetail);
//淇敼鍙戣揣鏄庣粏琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDetailState(orderDetail,0);
+ //淇敼鍙戣揣琛ㄧ姸鎬�
+ finishedGoodsInventoryMapper.updateDeliveryDeliveryState(orderDetail.getDeliveryDetail().getDeliveryId(),1);
//淇敼璁㈠崟鏄庣粏琛ㄥ彂璐ф暟閲�
- finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getWarehouseNum());
+ finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryNum());
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
@@ -169,6 +177,10 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
}
+ if (deliverysum==deliverydetailsum+orderDetail.getDeliveryNum()) {
+ //淇敼鍙戣揣琛ㄧ姸鎬�
+ finishedGoodsInventoryMapper.updateDeliveryDeliveryState(orderDetail.getDeliveryDetail().getDeliveryId(),2);
+ }
isinsert=true;
}
--
Gitblit v1.8.0