From cb921a68fe5f01012125fb522086acea2aa255ba Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 27 十二月 2024 14:43:40 +0800 Subject: [PATCH] 1、中空理片笼新增配方相关功能,用于用户自定义保存中空线相关参数,避免重复输入相同的参数 2、领取任务/强制出片改造:在流程卡、路线、数量基础上新增配方id,用于关联本地流程卡的中空的参数配方 3、增加限制:同一条线路的同个流程卡仅能存在一个未完成的任务 4、卧式理片笼新增日期格式 --- hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java | 42 +++--------------------------------------- 1 files changed, 3 insertions(+), 39 deletions(-) diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java index 8aea28c..9fdd7da 100644 --- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java +++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java @@ -17,46 +17,10 @@ private String flowCardId; @ApiModelProperty(value = "璺嚎锛�930锛堟潕璧涘厠锛岀晫闈㈤渶瑕佽緭鍏ョ浉鍏虫暟鎹級 931") private int cell; - @ApiModelProperty(value = "閰嶅鏁伴噺 930 931") + @ApiModelProperty(value = "閰嶅鏁伴噺") private int totalPairQuantity; - @ApiModelProperty(value = "闄よ啘鏂瑰紡 930 931") - private Integer filmRemove; - @ApiModelProperty(value = "涓婁晶闄よ啘閲� 930 931") - private Integer topRemove; - @ApiModelProperty(value = "涓嬩晶闄よ啘閲� 930 931") - private Integer bottomRemove; - @ApiModelProperty(value = "宸︿晶闄よ啘閲� 930 931") - private Integer leftRemove; - @ApiModelProperty(value = "鍙充晶闄よ啘閲� 930 931") - private Integer rightRemove; - - /** - * 鍒嗗壊绾� - */ - @ApiModelProperty(value = "闂撮殧鏉�1浠g爜 930涓撶敤") - private Integer frameOne; - @ApiModelProperty(value = "闂撮殧鏉�2浠g爜 930涓撶敤") - private Integer frameTwo; - @ApiModelProperty(value = "闂撮殧鏉�3浠g爜 930涓撶敤") - private Integer frameThree; - @ApiModelProperty(value = "闂撮殧鏉�4浠g爜 930涓撶敤") - private Integer frameFour; - @ApiModelProperty(value = "瀵嗗皝宓屽叆 930涓撶敤") - private Integer sealInsert; - @ApiModelProperty(value = "姘斾綋1(0鏃� 1鏈�) 930涓撶敤") - private Integer casOne; - @ApiModelProperty(value = "姘斾綋2(0鏃� 1鏈�) 930涓撶敤") - private Integer casTwo; - @ApiModelProperty(value = "姘斾綋3(0鏃� 1鏈�) 930涓撶敤") - private Integer casThree; - @ApiModelProperty(value = "姘斾綋4(0鏃� 1鏈�) 930涓撶敤") - private Integer casFour; - @ApiModelProperty(value = "闂撮殧妗嗙被鍨嬶紙tps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤") - private Integer intervalFrameType; - @ApiModelProperty(value = "闂撮殧妗嗗搴� 930涓撶敤") - private Integer intervalFrameWidth; - @ApiModelProperty(value = "闂撮殧妗嗛珮搴� 930涓撶敤") - private Integer intervalFrameHeight; + @ApiModelProperty(value = "閰嶆柟id") + private Long formulaId; } -- Gitblit v1.8.0