From b99b4b3d1c3ce067175e088b682be740f5b4b6ed Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 18 八月 2025 11:19:04 +0800
Subject: [PATCH] 入库提示语言修改
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 44224e4..17f5bf5 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
@@ -118,6 +118,9 @@
Integer calculateType=flowCard.getOrder().getCalculateType();
double deliveryDetailMoney = 0.0;
double deliveryDetailArea = 0.0;
+ if(flowCards.getInventoryQuantity()<=flowCard.getInventoryQuantity()){
+ flowCard.setInventoryQuantity(flowCards.getInventoryQuantity());
+ }
BigDecimal getComputeArea= BigDecimal.valueOf(flowCard.getOrderDetail().getComputeArea());
BigDecimal getQuantity= BigDecimal.valueOf(flowCard.getInventoryQuantity());
BigDecimal getPrice= BigDecimal.valueOf(flowCard.getOrderDetail().getPrice());
@@ -854,7 +857,7 @@
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks()));
+ itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrder().getCustomerName(),finishedOperateLog.getOrder().getProject(),finishedOperateLog.getRemarks()));
List<Map<String, Object>> detailList = finishedOperateLogMapper.getDetailList2(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks());
@@ -863,13 +866,18 @@
for(Map<String, Object> details:detailList){
Map<String, Object> detailsmap = new HashMap<>();
detailsmap.put("product_name",details.get("product_name").toString());
- detailsmap.put("detailList",finishedOperateLogMapper
+ List<Map<String, Object>> orderDetailList = finishedOperateLogMapper
.getDetailLists(
finishedOperateLog.getOrderId(),
finishedOperateLog.getRemarks(),
Integer.valueOf(details.get("product_id").toString()),
details.get("thickness").toString()
- ));
+ );
+ /*for (Map<String, Object>orderDetail:orderDetailList){
+
+ }*/
+
+ detailsmap.put("detailList",orderDetailList);
detailsmaplist.add(detailsmap);
}
@@ -898,6 +906,7 @@
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getDeliveryDetail().getOrderId());
Integer orderNumberdsum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getDeliveryDetail().getOrderId());
+ Integer orderNumberdDeliverysum = finishedGoodsInventoryMapper.findOrderDeliveryQuantitySum(orderDetail.getDeliveryDetail().getOrderId());
Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
@@ -925,7 +934,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (Objects.equals(orderNumberdsum, orderDetail.getWarehouseNum())) {
+ if (orderNumberdsum==orderNumberdDeliverysum) {
//if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
--
Gitblit v1.8.0