qiangxuan 3 dagar sedan
förälder
incheckning
11b3afd18c

+ 2 - 2
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/entity/BilletHotsend.java

@@ -172,8 +172,8 @@ public class BilletHotsend implements Serializable {
     @Excel(name = "牌号", width = 15)
     @ApiModelProperty(value = "牌号")
     private String brandNum;
-    @Excel(name = "跨总支数", width = 15)
-    @ApiModelProperty(value = "'跨总支数'")
+    @Excel(name = "跨总支数", width = 15)
+    @ApiModelProperty(value = "'跨总支数'")
     private Integer rollDeputyCrossNum;
 
 }

+ 2 - 2
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -1043,7 +1043,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		}
 
 		/**
-		 * 保存跨信息
+		 * 保存跨信息
 		 */
 		if ("roll_deputy_cross".equals(billetHotsendDetailsVo.getBelongTable())){
 			billetHotsend.setShift(storageBill.getShift());
@@ -1073,7 +1073,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollDeputyCross1.setUpdateTime(new Date());
 				rollDeputyCrossService.updateById(rollDeputyCross1);
 			}
-			// 保存跨明细信息
+			// 保存跨明细信息
 			List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = new ArrayList<>();
 			rollClubCommonList.forEach(x ->{
 				RollDeputyCrossDetails rollDeputyCrossDetails = new RollDeputyCrossDetails();

+ 2 - 2
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/entity/RollDeputyCross.java

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 轧钢
+ * @Description: 轧钢
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0
@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("roll_deputy_cross")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="roll_deputy_cross对象", description="轧钢跨")
+@ApiModel(value="roll_deputy_cross对象", description="轧钢跨")
 public class RollDeputyCross implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/entity/RollDeputyCrossDetails.java

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 跨明细
+ * @Description: 跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0
@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("roll_deputy_cross_details")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="roll_deputy_cross_details对象", description="跨明细")
+@ApiModel(value="roll_deputy_cross_details对象", description="跨明细")
 public class RollDeputyCrossDetails implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/mapper/RollDeputyCrossDetailsMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.rollDeputyCross.entity.RollDeputyCrossDetails;
 
 /**
- * @Description: 跨明细
+ * @Description: 跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

+ 1 - 1
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/mapper/RollDeputyCrossMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.rollDeputyCross.entity.RollDeputyCross;
 
 /**
- * @Description: 轧钢
+ * @Description: 轧钢
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

+ 1 - 1
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/service/IRollDeputyCrossDetailsService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.rollDeputyCross.entity.RollDeputyCrossDetails;
 
 /**
- * @Description: 跨明细
+ * @Description: 跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

+ 1 - 1
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/service/IRollDeputyCrossService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.rollDeputyCross.entity.RollDeputyCross;
 
 /**
- * @Description: 轧钢
+ * @Description: 轧钢
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

+ 1 - 1
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/service/impl/RollDeputyCrossDetailsServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 跨明细
+ * @Description: 跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

+ 1 - 1
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/rollDeputyCross/service/impl/RollDeputyCrossServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 轧钢
+ * @Description: 轧钢
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

+ 2 - 2
zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -935,7 +935,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                     RollDeputyCross rollDeputyCross1 = rollDeputyCrossService.getOne(queryWrapper1);
                     if (oConvertUtils.isEmpty(rollDeputyCross1)) {
                         RollDeputyCross rollDeputyCross = new RollDeputyCross();
-                        // 堆垛保存发车时 目的地为为副跨 保存副跨信息
+                        // 堆垛保存发车时 目的地为为付跨 保存付跨信息
                         rollDeputyCross.setId(String.valueOf(IdWorker.getId()));
                         rollDeputyCross.setCcmNo(y.getCcmNo().toString());
                         rollDeputyCross.setHeatNo(y.getHeatNo());
@@ -951,7 +951,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         rollDeputyCross.setCreateTime(new Date());
                         rollDeputyCrossService.save(rollDeputyCross);
                     } else {
-                        // 堆垛保存发车时 目的地为为副跨 更新副跨信息
+                        // 堆垛保存发车时 目的地为为付跨 更新付跨信息
                         rollDeputyCross1.setAmountTotal(rollDeputyCross1.getAmountTotal() + 1);// 总支数
                         rollDeputyCross1.setBlankOutput(rollDeputyCross1.getBlankOutput() + y.getBilletWeight());
                         rollDeputyCross1.setUpdateTime(new Date());