From 8cc26dd54779273f895a3cbc3f84c8933a02a0dc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 10 七月 2024 14:44:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index d6f8f74..cccffe2 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -82,12 +82,13 @@
// 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
String flowCardId = (String) requestData.get("flowCardId");
int workstationId = (int) requestData.get("workstationId");
+ int layer = (int) requestData.get("layer");
// 鏌ヨ瀵瑰簲 flowCardId 鐨勭幓鐠冧俊鎭�绘暟閲�
- int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
-
- // 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
- downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
+ int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer);
+ int artificialnumber=0;
+ // 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
+ downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId,artificialnumber);
// 鏋勫缓鍝嶅簲鏁版嵁
Map<String, Object> responseData = new HashMap<>();
@@ -149,7 +150,7 @@
}
}
- @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�1")
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�2")
@GetMapping("/getwo2")
public ResponseEntity<Map<String, Object>> getw2o() {
Map<String, Object> responseData = new HashMap<>();
--
Gitblit v1.8.0