返回高线工作台03

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/service/impl/RollHeightServiceImpl.java

@@ -478,7 +478,7 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
 
             rollHeightHeatNo.setId(record.getId());
             rollHeightHeatNo.setConfirmTime(record.getColdConfirmTime());
-
+            rollHeightHeatNo.setHotOrColdStaus(1);
             // 判断原始记录stackLength字段是否为空，不为空则有步进冷床json数据,并且stackingBhtcId等于9时。需要做拆分成单独的一条 凉坯装运单 记录。
             // stackLength字段数据结构为：[{\"stackingCount\":24,\"stackingLength\":10680,\"stackingWeight\":58.056,\"stackingBhtcId\":\"9\"}],[{\"stackingCount\":24,\"stackingLength\":10680,\"stackingWeight\":58.056,\"stackingBhtcId\":\"9\"}]
             String stackLengthJson = record.getStackLength();
@@ -517,7 +517,6 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
                             sizeDetail.setSizeWeight(stackingWeight);
                             sizeDetail.setStartAmount(startAmount);
                             sizeDetail.setEndAmount(endAmount);
-                            sizeDetail.setHotOrColdStaus(1);
                             sizeDetailsList.add(sizeDetail);
 
                             // rollSendDetail
@@ -624,7 +623,7 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
 
             rollHeightHeatNo.setId(record.getId());
             rollHeightHeatNo.setConfirmTime(record.getConfirmTime());
-
+            rollHeightHeatNo.setHotOrColdStaus(0);
             String detailJson = record.getRollClubOneDetails();
 
             if (StringUtils.isNotBlank(detailJson)) {
@@ -689,7 +688,6 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
                         sizeDetail.setSizeWeight(totalWeight);
                         sizeDetail.setStartAmount(startAmount);
                         sizeDetail.setEndAmount(endAmount);
-                        sizeDetail.setHotOrColdStaus(0);
                         sizeDetailsList.add(sizeDetail);
 
                         // rollSendDetail

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/vo/RollHeightHeatVO.java

@@ -32,6 +32,8 @@ public class RollHeightHeatVO {
         @ApiModelProperty(value = "当前定尺总重量")
         private BigDecimal totalWeight;
 
+        @ApiModelProperty(value = "凉热单状态")
+        private Integer hotOrColdStaus;
 
         private List<SizeDetail> sizeDetails;
 
@@ -79,9 +81,5 @@ public class RollHeightHeatVO {
 
         @ApiModelProperty(value = "当前定尺结束根")
         private Integer endAmount;
-
-        @ApiModelProperty(value = "凉热单状态")
-        private Integer hotOrColdStaus;
-
     }
 }