From d61ac67e37290019e5ead92f034cdfe1b5a433a9 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期三, 07 八月 2024 17:06:45 +0800
Subject: [PATCH] 小片页面添加弧长字段

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 34f7620..37e49bf 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -143,7 +143,7 @@
                                                 getMinIdByGroup(orderId,
                                                     String.valueOf(detail.get("order_number")),
                                                     String.valueOf(detail.get("group")));
-                    int listGlassId = Integer.parseInt(String.valueOf(detail.get("id")));
+                    int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
                     if(listGlassId  !=glassId){
                         detail.put("rowClass","latter");
                     }
@@ -449,7 +449,7 @@
             //淇敼鍖呰鏃朵慨鏀瑰簱瀛樻暟閲�
             if (reportingWork.getNextProcess()==null || reportingWork.getNextProcess().isEmpty()){
                 //鑾峰彇璇ユ姤宸ヤ慨鏀瑰悗鐨勫彲鍏ュ簱鏁伴噺
-                Integer  inventory = reportingWorkDetailMapper.selectInventory(reportingWork.getProcessId(),Integer.parseInt(reportingWorkDetail.getOrderNumber()),Integer.parseInt(reportingWorkDetail.getTechnologyNumber()));
+                Integer  inventory = reportingWorkDetailMapper.selectInventory(reportingWork.getProcessId(),Integer.parseInt(reportingWorkDetail.getOrderNumber()),Integer.parseInt(reportingWorkDetail.getTechnologyNumber()),reportingWork.getThisProcess());
                 //淇敼娴佺▼鍗¤〃搴撳瓨鏁伴噺
                 flowCardMapper.updateInventory(reportingWork.getProcessId(),reportingWorkDetail.getOrderNumber(),reportingWorkDetail.getTechnologyNumber(),inventory);
             }

--
Gitblit v1.8.0