From b804d88d626d1df675a3278c859b37758c55432b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 13:42:06 +0800
Subject: [PATCH] 1、增加流程卡进度查询，可根据工程号，流程卡号，玻璃id查看进度情况 2、钢化界面增加颜色对应注释，版图增加落架顺序 3、两个大理片界面笼子上色块显示修改为根据玻璃宽度显示 4、中空大理片右侧缺片情况显示优化 5、是否除膜从领取工程取消，在中空领取任务时选择除膜膜系（不除膜时不选择膜系），当配方中是需要除膜时并且选择的膜系与小片膜系一样时发送除膜信息 6、中空领取任务界面流程卡数量不等于已配对数量时高亮显示 7、磨边队列当后面玻璃磨边完成扫码但前面玻璃还未扫到码时高亮显示
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index 7fde5fe..ea1b390 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -5,11 +5,14 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.entity.dto.DamageDTO;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.damage.entity.vo.FlowCardDamageVO;
+import com.mes.damage.entity.vo.GlassDamageVO;
import com.mes.damage.service.DamageService;
-import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,6 +31,7 @@
@RestController
@RequestMapping("/damage")
@ResponseBody
+@Slf4j
public class DamageController {
@Autowired(required = true)
@@ -94,5 +98,44 @@
return Result.build(200, "鏌ヨ鎴愬姛", "");
}
+ @ApiOperation("鑷姩鎶ュ伐娴嬭瘯")
+ @PostMapping("/submitReport")
+ public Result submitReport() {
+// for (int i = 0; i < 50; i++) {
+ Damage damage = new Damage();
+ damage.setProcessId("NG25110702A004");
+ damage.setWorkingProcedure("纾ㄨ竟");
+ damage.setOrderNumber(2);
+ damage.setTechnologyNumber(2);
+ damageService.submitReport(damage);
+// log.info("褰撳墠寰幆娆℃暟{}", i);
+// try {
+// // 鏂瑰紡1锛氫娇鐢═hread.sleep锛堟帹鑽愶紝鐩磋锛�
+// Thread.sleep(5000); // 10000姣 = 10绉�
+// // 鏂瑰紡2锛氫娇鐢═imeUnit锛堣涔夋洿娓呮櫚锛屽彲閫夛級
+// // TimeUnit.SECONDS.sleep(10);
+// } catch (InterruptedException e) {
+// // 鎹曡幏涓柇寮傚父锛屾仮澶嶇嚎绋嬩腑鏂姸鎬侊紙閬垮厤鍚庣画閫昏緫寮傚父锛�
+// Thread.currentThread().interrupt();
+// // 鏃ュ織璁板綍涓柇淇℃伅
+// // 鍙�夛細涓柇鍚庢槸鍚﹂��鍑哄惊鐜紙鏍规嵁涓氬姟闇�姹傝皟鏁达級
+// // break; // 涓柇鍒欓��鍑哄惊鐜�
+// // continue; // 涓柇鍒欒烦杩囧綋鍓嶇瓑寰咃紝缁х画涓嬩竴娆″惊鐜�
+// }
+// }
+ return Result.build(200, "鏌ヨ鎴愬姛", "");
+ }
+
+ @ApiOperation("鐜荤拑杩涘害鏌ヨ")
+ @PostMapping("/queryProgress")
+ public Result<List<GlassDamageVO>> queryProgress(@RequestBody DamageRequest damageRequest) {
+ return Result.build(200, "鏌ヨ鎴愬姛", damageService.queryProgress(damageRequest));
+ }
+
+ @ApiOperation("娴佺▼鍗¤繘搴︽煡璇�")
+ @PostMapping("/queryFlowCardIdProgress")
+ public Result<List<FlowCardDamageVO>> queryFlowCardIdProgress(@RequestBody DamageRequest damageRequest) {
+ return Result.build(200, "鏌ヨ鎴愬姛", damageService.queryFlowCardIdProgress(damageRequest));
+ }
}
--
Gitblit v1.8.0