From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 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 ab2fa8d..058789a 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
@@ -799,6 +799,8 @@
alias="LC";
}else if(Objects.equals(type, "杩斿伐")){
alias="FG";
+ }else if(Objects.equals(type, "璋冩灦")){
+ alias="TJ";
}
//鏌ヨ褰撳ぉ鐨勬渶澶ф暟閲�
Integer maximum=finishedOperateLogMapper.getmaximum(type);
@@ -860,7 +862,10 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrder().getCustomerName(),finishedOperateLog.getOrder().getProject(),finishedOperateLog.getRemarks()));
+ itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(
+ finishedOperateLog.getOrder().getCustomerId(),
+ finishedOperateLog.getOrder().getProject(),
+ finishedOperateLog.getRemarks()));
List<Map<String, Object>> detailList = finishedOperateLogMapper.getDetailList2(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks());
@@ -985,7 +990,19 @@
if(Objects.equals(finishedOperateLog.getOperateType(), "鍏ュ簱")){
Delivery delivery = finishedGoodsInventoryMapper.findOrderDelivery(finishedOperateLog.getOrderId());
- if(delivery==null){
+ FinishedGoodsInventory existFinishedGoodsInventory = finishedGoodsInventoryMapper.
+ selectOne(new LambdaQueryWrapper<FinishedGoodsInventory>()
+ .eq(FinishedGoodsInventory::getOrderId, finishedOperateLog.getOrderId())
+ .eq(FinishedGoodsInventory::getOrderNumber, finishedOperateLog.getOperationNumber())
+ .eq(FinishedGoodsInventory::getBoxNo, finishedOperateLog.getRemarks())
+ );
+ if(delivery!=null){
+ return "false1";
+ }
+ if(existFinishedGoodsInventory.getQuantityAvailable()<finishedOperateLog.getQuantity()){
+ return "false2";
+ }
+
//淇敼璁板綍琛�
finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
//淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
@@ -1007,9 +1024,7 @@
finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
}
log.setFunction("cancelFinishedGoodsInventoryStorage鍏ュ簱");
- }else{
- return "false1";
- }
+
@@ -1054,7 +1069,7 @@
return "true";
}
- public Map<String,Object> changeRack(FinishedGoodsInventory finishedGoodsInventory) {
+ public Map<String,Object> changeRack(FinishedGoodsInventory finishedGoodsInventory, String user) {
Long id = finishedGoodsInventory.getId();
Map<String,Object> map = new HashMap<>();
FinishedGoodsInventory oldFinishedGoodsInventory = finishedGoodsInventoryMapper.selectById(finishedGoodsInventory.getId());
@@ -1067,6 +1082,14 @@
.eq(FinishedGoodsInventory::getBoxNo, finishedGoodsInventory.getBoxNo())
.last("limit 1")
);
+ String operationOrderNumber = orderNumberSetting("璋冩灦");
+ FinishedOperateLog finishedOperateLog = new FinishedOperateLog();
+ finishedOperateLog.setOperationOrderNumber(operationOrderNumber);
+ finishedOperateLog.setOrderId(oldFinishedGoodsInventory.getOrderId());
+ finishedOperateLog.setOperationNumber(oldFinishedGoodsInventory.getOrderNumber());
+ finishedOperateLog.setProcessId(oldFinishedGoodsInventory.getProcessId());
+ finishedOperateLog.setOperateType("璋冩灦");
+ finishedOperateLog.setOperator(user);
//褰撴垚鍝佺鍙蜂笉瀛樺湪锛屽垯鏂板
if(existFinishedGoodsInventory==null){
//褰撹浆绉绘暟閲忓ぇ浜庡疄闄呭簱瀛樼鍙锋椂锛屽垯涓嶈兘杞Щ
@@ -1090,6 +1113,13 @@
.eq(FinishedGoodsInventory::getId,id)
) ;
finishedGoodsInventoryMapper.insert(finishedGoodsInventory);
+
+
+ //寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
+ finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+finishedGoodsInventory.getBoxNo());
+ finishedOperateLogMapper.insert(finishedOperateLog);
+
map.put("code",1);
return map;//搴撳瓨杞Щ鎴愬姛锛屾柊澧炵鍙�
@@ -1123,6 +1153,11 @@
.eq(FinishedGoodsInventory::getId,existFinishedGoodsInventory.getId())
) ;
+ //寰�鎿嶄綔鏃ュ織琛ㄦ坊鍔犳暟鎹�
+ finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
+ finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+existFinishedGoodsInventory.getBoxNo());
+ finishedOperateLogMapper.insert(finishedOperateLog);
+
map.put("code",3);
List<String> list = new ArrayList<>();
list.add(oldFinishedGoodsInventory.getBoxNo());
@@ -1132,4 +1167,61 @@
}
}
}
+
+ public Map<String, Object> getInventoryPrints(List<FinishedGoodsInventory> finishedGoodsInventories) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ if (!finishedGoodsInventories.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>();
+ for (FinishedGoodsInventory finishedGoodsInventory : finishedGoodsInventories) {
+ String orderId = finishedGoodsInventory.getOrderId();
+ String boxNo = finishedGoodsInventory.getBoxNo();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� OrderId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(orderId) && processedProcessIds.contains(boxNo)) {
+ continue;
+ }
+
+ Map<String, Object> itemmap = new HashMap<>();
+ List<Map<String, String>> detail = finishedGoodsInventoryMapper.getPrintTitleByBox(
+ finishedGoodsInventory.getOrder().getCustomerId(),
+ finishedGoodsInventory.getOrder().getProject(),
+ boxNo,
+ orderId
+ );
+
+ itemmap.put("detail",detail);
+ //鑾峰彇搴撳瓨閲岄潰姝よ鍗曟绠卞彿鐨勬墍鏈変骇鍝佷俊鎭�
+ List<Map<String, Object>> detailList = finishedGoodsInventoryMapper
+ .getorderProductByBoxNo(orderId,boxNo);
+
+ List<Map<String, Object>> detailsmaplist = new ArrayList<Map<String, Object>>();
+
+ for(Map<String, Object> details:detailList){
+ Map<String, Object> detailsmap = new HashMap<>();
+ detailsmap.put("product_name",details.get("product_name").toString());
+ //鑾峰彇鏄庣粏鏁版嵁
+ List<Map<String, Object>> orderDetailList = finishedGoodsInventoryMapper
+ .getPrintDetail(
+ orderId,
+ boxNo,
+ Integer.valueOf(details.get("product_id").toString()),
+ details.get("thickness").toString()
+ );
+
+ detailsmap.put("detailList",orderDetailList);
+ detailsmaplist.add(detailsmap);
+
+ }
+ itemmap.put("detailList", detailsmaplist);
+ list.add(itemmap);
+
+
+ processedProcessIds.add(orderId);
+ processedProcessIds.add(boxNo);
+ }
+ }
+ map.put("data", list);
+ return map;
+ }
}
--
Gitblit v1.8.0