From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
index 46d723c..2291580 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
@@ -51,12 +51,30 @@
private String casThree;
@ApiModelProperty(value = "姘斾綋4(0鏃� 1鏈�) 930涓撶敤")
private String casFour;
- @ApiModelProperty(value = "闂撮殧妗嗙被鍨嬶紙tps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
- private String intervalFrameType;
- @ApiModelProperty(value = "闂撮殧妗嗗搴� 930涓撶敤")
- private String intervalFrameWidth;
- @ApiModelProperty(value = "闂撮殧妗嗛珮搴� 930涓撶敤")
- private String intervalFrameHeight;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�1锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeOne;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�1 930涓撶敤")
+ private String intervalFrameWidthOne;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�1 930涓撶敤")
+ private String intervalFrameHeightOne;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�2锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeTwo;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�2 930涓撶敤")
+ private String intervalFrameWidthTwo;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�2 930涓撶敤")
+ private String intervalFrameHeightTwo;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�3锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeThree;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�3 930涓撶敤")
+ private String intervalFrameWidthThree;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�3 930涓撶敤")
+ private String intervalFrameHeightThree;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�4锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeFour;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�4 930涓撶敤")
+ private String intervalFrameWidthFour;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�4 930涓撶敤")
+ private String intervalFrameHeightFour;
/**
* 鍒涘缓鏃堕棿
*/
--
Gitblit v1.8.0