From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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/FinishedGlassShelfService.java | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java
index 491f6b6..4a278ba 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java
@@ -77,9 +77,7 @@
finishedGlassShelfMapper.updateFinishedGlassShelfInformation(finishedGlassShelfInformation,finishedGlassShelfInformation.getId());
log.setFunction("saveFinishedGlassShelf淇敼1");
}else{
- List<FinishedGlassShelfInformation> list=finishedGlassShelfMapper
- .getSelectFinishedGlassShelfInformationInventoryArea(inventoryArea);
- int index=list.size();
+ int index=finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationInventoryArea(inventoryArea);
for (int i=1;i<=quantity;i++){
index++;
finishedGlassShelfMapper.insetFinishedGlassShelfInformation(finishedGlassShelfInformation,inventoryArea+index);
@@ -167,6 +165,9 @@
List<Map<String, Object>> mapList=new ArrayList<>();
for(Map<String, Object> objectMap:object){
mapList.add(finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationInId(
+ objectMap.get("glassShelfName").toString(),
+ Double.parseDouble(objectMap.get("price").toString()),
+ objectMap.get("unit").toString(),
Double.parseDouble(objectMap.get("weight").toString()),
Double.parseDouble(objectMap.get("width").toString()),
Double.parseDouble(objectMap.get("height").toString())
@@ -221,9 +222,12 @@
finishedGlassShelfEmitDetails.getMaxWeight(),
finishedGlassShelfEmitDetails.getMaxWidth(),
finishedGlassShelfEmitDetails.getMaxHeight(),
- finishedGlassShelfEmitDetails.getQuantity());
+ finishedGlassShelfEmitDetails.getQuantity(),
+ finishedGlassShelfEmitDetails.getPrice(),
+ finishedGlassShelfEmitDetails.getUnit(),
+ finishedGlassShelfEmitDetails.getGlassShelfName());
finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
- finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(emitId);
+ finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
}
}
@@ -247,7 +251,10 @@
finishedGlassShelfEmitDetails.getMaxWeight(),
finishedGlassShelfEmitDetails.getMaxWidth(),
finishedGlassShelfEmitDetails.getMaxHeight(),
- finishedGlassShelfEmitDetails.getQuantity());
+ finishedGlassShelfEmitDetails.getQuantity(),
+ finishedGlassShelfEmitDetails.getPrice(),
+ finishedGlassShelfEmitDetails.getUnit(),
+ finishedGlassShelfEmitDetails.getGlassShelfName());
finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetails(oddNumber,index,finishedGlassShelfEmitDetails);
finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetailsLog(
oddNumber,
@@ -260,7 +267,9 @@
finishedGlassShelfEmitDetails.getRemarks(),
finishedGlassShelfEmitDetails.getMaxWeight(),
finishedGlassShelfEmitDetails.getMaxWidth(),
- finishedGlassShelfEmitDetails.getMaxHeight()
+ finishedGlassShelfEmitDetails.getMaxHeight(),
+ finishedGlassShelfEmitDetails.getGlassShelfName(),
+ object.get("userName").toString()
);
index++;
}
@@ -329,7 +338,10 @@
finishedGlassShelfEmitDetails.getMaxWeight(),
finishedGlassShelfEmitDetails.getMaxWidth(),
finishedGlassShelfEmitDetails.getMaxHeight(),
- finishedGlassShelfEmitDetails.getQuantity());
+ finishedGlassShelfEmitDetails.getQuantity(),
+ finishedGlassShelfEmitDetails.getPrice(),
+ finishedGlassShelfEmitDetails.getUnit(),
+ finishedGlassShelfEmitDetails.getGlassShelfName());
finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
}
finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
@@ -399,10 +411,13 @@
finishedGlassShelfWithdrawDetails.getMaxWeight(),
finishedGlassShelfWithdrawDetails.getMaxWidth(),
finishedGlassShelfWithdrawDetails.getMaxHeight(),
- finishedGlassShelfWithdrawDetails.getQuantity()
+ finishedGlassShelfWithdrawDetails.getQuantity(),
+ finishedGlassShelfWithdrawDetails.getPrice(),
+ finishedGlassShelfWithdrawDetails.getUnit(),
+ finishedGlassShelfWithdrawDetails.getGlassShelfName()
);
finishedGlassShelfMapper.deleteFinishedGlassShelfWithdrawDetails(withdrawId);
- finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(withdrawId);
+ finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
}
}
@@ -428,7 +443,10 @@
finishedGlassShelfWithdrawDetails.getMaxWeight(),
finishedGlassShelfWithdrawDetails.getMaxWidth(),
finishedGlassShelfWithdrawDetails.getMaxHeight(),
- finishedGlassShelfWithdrawDetails.getQuantity()
+ finishedGlassShelfWithdrawDetails.getQuantity(),
+ finishedGlassShelfWithdrawDetails.getPrice(),
+ finishedGlassShelfWithdrawDetails.getUnit(),
+ finishedGlassShelfWithdrawDetails.getGlassShelfName()
);
finishedGlassShelfMapper.insertFinishedGlassShelfWithdrawDetails(oddNumber,index,finishedGlassShelfWithdrawDetails);
finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetailsLog(
@@ -442,7 +460,9 @@
finishedGlassShelfWithdrawDetails.getRemarks(),
finishedGlassShelfWithdrawDetails.getMaxWeight(),
finishedGlassShelfWithdrawDetails.getMaxWidth(),
- finishedGlassShelfWithdrawDetails.getMaxHeight()
+ finishedGlassShelfWithdrawDetails.getMaxHeight(),
+ finishedGlassShelfWithdrawDetails.getGlassShelfName(),
+ object.get("userName").toString()
);
index++;
}
@@ -540,7 +560,10 @@
finishedGlassShelfWithdrawDetails.getMaxWeight(),
finishedGlassShelfWithdrawDetails.getMaxWidth(),
finishedGlassShelfWithdrawDetails.getMaxHeight(),
- finishedGlassShelfWithdrawDetails.getQuantity()
+ finishedGlassShelfWithdrawDetails.getQuantity(),
+ finishedGlassShelfWithdrawDetails.getPrice(),
+ finishedGlassShelfWithdrawDetails.getUnit(),
+ finishedGlassShelfWithdrawDetails.getGlassShelfName()
);
finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
}
--
Gitblit v1.8.0