From f425a29a2273a81478f3533476e3c8bd7743a0e4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 27 十二月 2024 07:43:46 +0800
Subject: [PATCH] 用户列表界面添加用户工序设置
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 693b1c2..3f3b677 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
@@ -31,6 +31,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
+import java.util.stream.Collectors;
@Service
@DS("mm")
@@ -104,9 +105,9 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FlowCard> flowCardlist = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!flowCardlist.isEmpty()){
+ //鑾峰彇鍗曞彿
+ String oddNumber= orderNumberSetting("鍏ュ簱");
for (FlowCard flowCard : flowCardlist) {
- //鑾峰彇鍗曞彿
- String oddNumber= orderNumberSetting("鍏ュ簱");
//娣诲姞鍑哄叆搴撹褰�
finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container);
Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());
@@ -881,7 +882,16 @@
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<FinishedOperateLog> finishedOperateLogList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FinishedOperateLog.class);
if (!finishedOperateLogList.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>();
for (FinishedOperateLog finishedOperateLog : finishedOperateLogList) {
+ String OrderId = finishedOperateLog.getOrderId();
+ String Remarks = finishedOperateLog.getRemarks();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� OrderId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(OrderId) && processedProcessIds.contains(Remarks)) {
+ continue;
+ }
+
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimt(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks()));
@@ -889,6 +899,9 @@
itemmap.put("detailList", detailList);
list.add(itemmap);
+
+ processedProcessIds.add(OrderId);
+ processedProcessIds.add(Remarks);
}
}
map.put("data", list);
--
Gitblit v1.8.0