From 152ed52be6432e0abc449f5349daf1ea8e41efe6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 29 七月 2024 15:01:26 +0800
Subject: [PATCH] 修改订单主页面的加工要求筛选
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 bf83d60..e214af4 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
@@ -106,7 +106,7 @@
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),1);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
- finishedGoodsInventoryMapper.updateIntOrderNumberConut(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),flowCard.getInventoryQuantity());
+ finishedGoodsInventoryMapper.updateIntOrderNumberConut(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(), Long.valueOf(flowCard.getInventoryQuantity()));
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍏ュ簱
if (ordersum == (ordernumbersum + flowCard.getInventoryQuantity())) {
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
@@ -117,7 +117,7 @@
//淇敼娴佺▼鍗¤〃鍏ュ簱鏁伴噺
finishedGoodsInventoryMapper.updateflowcard(flowCard);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
- finishedGoodsInventoryMapper.updateIntOrderNumberConut(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),flowCard.getInventoryQuantity());
+ finishedGoodsInventoryMapper.updateIntOrderNumberConut(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(), Long.valueOf(flowCard.getInventoryQuantity()));
if (ordersum == (ordernumbersum + flowCard.getInventoryQuantity())) {
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
@@ -139,7 +139,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("addSelectWarehousing");
sysErrorService.insert(sysError);
saveState = false;
@@ -219,6 +219,9 @@
}
}
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ saveState = false;
}
}
}
@@ -228,7 +231,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("addDeliveryDetail");
sysErrorService.insert(sysError);
saveState = false;
@@ -281,7 +284,7 @@
//淇敼鍘熻鍗曟槑缁嗚〃鍙戣揣鏁伴噺
finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
//淇敼璋冩嫧鏂拌鍗曟槑缁嗚〃鍙戣揣鏁伴噺
- finishedGoodsInventoryMapper.updateIntOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
+ finishedGoodsInventoryMapper.updateIntOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(), orderDetail.getQuantity());
if (newordersum==newordernumbersum+orderDetail.getQuantity()){
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
finishedGoodsInventoryMapper.updateOrderWarehousingState(orderDetail.getOrderId(),2);
@@ -298,7 +301,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("updateFinishedGoodsInventoryAllocate");
sysErrorService.insert(sysError);
saveState = false;
@@ -381,7 +384,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("updateFinishedGoodsInventoryTakeOut");
sysErrorService.insert(sysError);
saveState = false;
@@ -464,7 +467,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("updateFinishedGoodsInventoryRework");
sysErrorService.insert(sysError);
saveState = false;
@@ -511,7 +514,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("updateFinishedGoodsInventoryToExamine");
sysErrorService.insert(sysError);
saveState = false;
@@ -548,7 +551,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("cancelFinishedGoodsInventoryToExamine");
sysErrorService.insert(sysError);
saveState = false;
@@ -650,7 +653,7 @@
//淇敼鍙戣揣琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),0);
//淇敼璁㈠崟鏄庣粏琛ㄥ簱鍐呮暟閲�
- finishedGoodsInventoryMapper.updateIntOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
+ finishedGoodsInventoryMapper.updateIntOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(), Long.valueOf(finishedOperateLog.getQuantity()));
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
@@ -674,7 +677,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("cancelFinishedGoodsInventoryStorage");
sysErrorService.insert(sysError);
saveState = false;
@@ -705,7 +708,7 @@
finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
}
finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail,userName,oddNumber);
- finishedGoodsInventoryMapper.updateIntOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),Integer.parseInt(orderDetail.getQuantity().toString()));
+ finishedGoodsInventoryMapper.updateIntOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getQuantity());
}
finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);
}
@@ -716,7 +719,7 @@
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setFunc("oneClickStorage");
sysErrorService.insert(sysError);
saveState = false;
--
Gitblit v1.8.0