From e208aa1ef8e861dba168e8d83ab3066fc9f1e02d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:30:45 +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 | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 1483cac..8788d0e 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
@@ -3,7 +3,7 @@
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
-import com.mes.uppattenusage.service.GlassInfoService;
+import com.mes.glassinfo.service.GlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -23,7 +23,7 @@
*/
@RestController
-@RequestMapping("/api/downWorkstation")
+@RequestMapping("/api/unLoadGlass")
public class DownWorkstationController {
@Autowired
@@ -34,7 +34,7 @@
@GetMapping("/getone")
public ResponseEntity<?> getOneDownWorkstations() {
try {
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations();
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5);
// 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
Map<String, Object> responseData = new HashMap<>();
responseData.put("code", 200);
@@ -54,13 +54,13 @@
@GetMapping("/gettwo")
public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationService.gettwoDownWorkstations();
+ return downWorkstationService.getoneDownWorkstations(6,10);
}
@GetMapping("/getflowCardId")
public ResponseEntity<Map<String, Object>> getflowCardId() {
Map<String, Object> responseData = new HashMap<>();
try {
- List<Map<String, Object>> data = downWorkstationService.getflowCardId();
+ List<Map<String, Object>> data = glassInfoService.getFlowCardId();
responseData.put("code", 200);
responseData.put("msg", "鎴愬姛");
responseData.put("data", data);
@@ -75,7 +75,7 @@
-
+//缁戝畾鏋跺瓙
@PostMapping("/updateFlowCardId")
public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
// 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
@@ -86,7 +86,7 @@
int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
// 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
- glassInfoService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
+ downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
// 鏋勫缓鍝嶅簲鏁版嵁
Map<String, Object> responseData = new HashMap<>();
--
Gitblit v1.8.0