From e9049622e5c75b022adbfea5e0fe09790ca146d6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 18 九月 2024 15:27:05 +0800
Subject: [PATCH] 标签打印字体样式修改
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 79f2485..078e09b 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
@@ -545,6 +545,7 @@
if (!finishedOperateLogslist.isEmpty()){
for (FinishedOperateLog finishedOperateLog : finishedOperateLogslist) {
finishedGoodsInventoryMapper.updateInventoryquantityInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(), Math.toIntExact(finishedOperateLog.getQuantity()));
+ finishedGoodsInventoryMapper.updateIntOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(), Long.valueOf(finishedOperateLog.getQuantity()));
finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
}
@@ -624,6 +625,8 @@
for (FinishedOperateLog finishedOperateLog : finishedOperateLogslist) {
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(finishedOperateLog.getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(finishedOperateLog.getOrderId());
+ Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(finishedOperateLog.getOperationOrderNumber());
+ Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(finishedOperateLog.getOperationOrderNumber(),1);
if(Objects.equals(finishedOperateLog.getOperateType(), "鍏ュ簱")){
//淇敼璁板綍琛�
@@ -655,20 +658,20 @@
//淇敼鍙戣揣鏄庣粏琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDetailState(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getOperationOrderNumber(),1);
//淇敼鍙戣揣琛ㄧ姸鎬�
- finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),0);
+ finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),1);
//淇敼璁㈠崟鏄庣粏琛ㄥ簱鍐呮暟閲�
finishedGoodsInventoryMapper.updateIntOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(), Long.valueOf(finishedOperateLog.getQuantity()));
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
- finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOrderId(),1);
+ finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (ordernumbersum-finishedOperateLog.getQuantity()==0) {
- //淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
- finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);
-
- }
- if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum) {
+ if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);
+
+ }
+ if (deliverysum==finishedOperateLog.getQuantity()+deliverydetailsum) {
+ //淇敼鍙戣揣琛ㄧ姸鎬�
+ finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),0);
}
}
@@ -701,18 +704,19 @@
try {
String oddNumber= orderNumberSetting("鍏ュ簱");
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId));
- if(order.getWarehousing()==0){
+ if(order.getWarehousing()!=2){
List<OrderDetail> orderDetailList=finishedGoodsInventoryMapper.getSelectOrderDetail(orderId);
for (OrderDetail orderDetail:orderDetailList){
FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(),orderDetail.getOrderNumber());
if(finishedGoodsInventory!=null){
+ finishedOperateLogMapper.updateOrderFinishedOperateLog(orderDetail,userName,oddNumber);
//淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
}else{
finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
}
finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail,userName,oddNumber);
- finishedGoodsInventoryMapper.updateIntOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getQuantity());
+ finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getQuantity());
}
finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);
}
--
Gitblit v1.8.0