From 6965db086df978e46e0a1bd7227b981ad48a9b1c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 二月 2024 16:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 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 4055e7d..3a4c3ef 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
@@ -157,7 +157,7 @@
if(Objects.equals(finishedGoodsInventorybycount, orderDetail.getWarehouseNum())){
System.out.println(123);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
- finishedGoodsInventoryMapper.updateInventoryquantityavailable(orderDetail);
+ //finishedGoodsInventoryMapper.updateInventoryquantityavailable(orderDetail);
//淇敼鍙戣揣鏄庣粏琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDetailState(orderDetail,0);
//淇敼璁㈠崟鏄庣粏琛ㄥ彂璐ф暟閲�
@@ -191,6 +191,7 @@
map.put("data", finishedGoodsInventoryMapper.getSelectAllocate(offset, pageSize, orderDetail));
map.put("total", finishedGoodsInventoryMapper.getSelectAllocatePageTotal(offset, pageSize, orderDetail));
map.put("type", basicWarehouseTypeMapper.getBasicWarehouseTypeTakeOut());
+ map.put("types", basicWarehouseTypeMapper.getBasicWarehouseTypeRework());
return map;
}
@@ -259,7 +260,6 @@
String userId = "";
if (object.get("userName") != null) {
userName = object.get("userName").toString();
- System.out.println(12344);
}
if (object.get("userId") != null) {
userId = object.get("userId").toString();
@@ -285,7 +285,7 @@
//娣诲姞棰嗗嚭璁板綍
finishedOperateLogMapper.insertFinishedOperateLogTakeOut(orderDetail,userName,oddNumber,operateType,remarks);
//淇敼搴撳瓨鏁伴噺
- finishedGoodsInventoryMapper.updateInventoryquantityAllocateOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
//淇敼璁㈠崟鏄庣粏琛ㄦ暟閲�
finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
if (Objects.equals(oldordersum, oldordernumbersum)){
@@ -319,6 +319,93 @@
}
+ public Boolean updateFinishedGoodsInventoryRework(Map<String,Object> object) {
+ Boolean isinsert=false;
+ String userName = "";
+ String userId = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+
+ String operateType = "";
+ String remarks = "";
+ if (object.get("remarks") != null) {
+ remarks = object.get("remarks").toString();
+ }
+ if (object.get("operateType") != null) {
+ operateType = object.get("operateType").toString();
+ }
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class);
+ if (!orderDetaillist.isEmpty()){
+ for (OrderDetail orderDetail : orderDetaillist) {
+ Integer oldordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getFinishedGoodsInventory().getOrderId());
+ Integer oldordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getFinishedGoodsInventory().getOrderId());
+
+ //鑾峰彇鍗曞彿
+ String oddNumber= orderNumberSetting("杩斿伐");
+ //娣诲姞棰嗗嚭璁板綍
+ finishedOperateLogMapper.insertFinishedOperateLogRework(orderDetail,userName,oddNumber,operateType,remarks);
+ //淇敼搴撳瓨鏁伴噺
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
+ //淇敼璁㈠崟鏄庣粏琛ㄦ暟閲�
+ finishedGoodsInventoryMapper.updateOutOrderNumberConut(orderDetail.getFinishedGoodsInventory().getOrderId(),orderDetail.getFinishedGoodsInventory().getOrderNumber(), Math.toIntExact(orderDetail.getQuantity()));
+ if (Objects.equals(oldordersum, oldordernumbersum)){
+ //淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
+ finishedGoodsInventoryMapper.updateOrderWarehousingState(orderDetail.getFinishedGoodsInventory().getOrderId(),1);
+ }
+ isinsert=true;
+ }
+ return isinsert;
+ }else{
+ return false;
+ }
+
+
+ }
+
+
+ public Boolean updateFinishedGoodsInventoryToExamine(Map<String,Object> object,String type) {
+ Boolean isinsert=false;
+ String userName = "";
+ String userId = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ if (object.get("userId") != null) {
+ userId = object.get("userId").toString();
+ }
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ List<FinishedOperateLog> finishedOperateLogslist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), FinishedOperateLog.class);
+ if (!finishedOperateLogslist.isEmpty()){
+ for (FinishedOperateLog finishedOperateLog : finishedOperateLogslist) {
+ if(Objects.equals(type, "瀹℃牳")){
+ //瀹℃牳淇敼棰嗗嚭璁板綍
+ finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"宸插鏍�");
+ //瀹℃牳淇敼搴撳瓨鏁伴噺
+ finishedGoodsInventoryMapper.updateInventoryInventoryOut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
+ } else if (Objects.equals(type, "鍙嶅")) {
+ //瀹℃牳淇敼棰嗗嚭璁板綍
+ finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"鏈鏍�");
+ //瀹℃牳淇敼搴撳瓨鏁伴噺
+ finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
+ }
+
+
+ isinsert=true;
+ }
+ return isinsert;
+ }else{
+ return false;
+ }
+
+
+ }
+
+
--
Gitblit v1.8.0