完善轧钢棒一数据返回

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -163,15 +163,35 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 					"id", "oneStrandSum", "twoStrandSum", "threeStrandSum",
 					"fourStrandSum", "fiveStrandSum", "sixStrandSum",
 					"sevenStrandSum", "eightStrandSum", "amount");
-			applyConfirmInfo(bopr, sysUser);
 			// 保存修改
 			billetOriginalProductRecordService.updateById(bopr);
 		}else {
-			applyConfirmInfo(billetOriginalProductRecord, sysUser);
 			billetOriginalProductRecordService.updateById(billetOriginalProductRecord);
 		}
 		return Result.OK("编辑成功!");
 	}
+
+
+	 /**
+	  *  编辑
+	  *
+	  * @param billetOriginalProductRecord
+	  * @return
+	  */
+	 @AutoLog(value = "确认钢坯生成原始记录")
+	 @ApiOperation(value="确认钢坯生成原始记录", notes="确认钢坯生成原始记录")
+	 @RequestMapping(value = "/confirmRecord", method = {RequestMethod.PUT})
+	 public Result<String> confirmRecord(@RequestBody BilletOriginalProductRecord billetOriginalProductRecord) {
+		 BilletOriginalProductRecord bopr = billetOriginalProductRecordService.getById(billetOriginalProductRecord.getId());
+		 if(bopr == null) {
+			 return Result.error("未找到对应数据,编辑失败！");
+		 }
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 applyConfirmInfo(billetOriginalProductRecord, sysUser);
+		 billetOriginalProductRecordService.updateById(billetOriginalProductRecord);
+
+		 return Result.OK("确认成功!");
+	 }
 	
 	/**
 	 *   通过id删除

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -28,9 +28,6 @@ import org.jeecg.modules.billet.rollClubOne.vo.RollClubOneHeatVO;
 import org.jeecg.modules.billet.rollClubOne.vo.RollClubOneVO;
 import org.jeecg.modules.billet.rollHeight.entity.DestinationStatistics;
 import org.jeecg.modules.billet.rollHeight.entity.DestinationStatisticsDetails;
-import org.jeecg.modules.billet.storageBill.dto.StorageCenterQueryDTO;
-import org.jeecg.modules.billet.storageBill.vo.StorageCenterHeatNoInvoicingVO;
-import org.jeecg.modules.billet.storageBill.vo.StorageCenterInvoicingVO;
 import org.jeecg.modules.carUnit.service.ISysDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -422,6 +419,18 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
             RollClubOneHeatVO.RollOneHeatNo rollOneHeatNo = new RollClubOneHeatVO.RollOneHeatNo();
             List<RollClubOneHeatVO.SizeDetail> sizeDetailsList = new ArrayList<>();
             List<RollClubOneHeatVO.RollSendDetail> rollSendDetailList = new ArrayList<>();
+            String brandNum = "";
+
+            if (record.getGrade() != null) {
+                brandNum = Optional.ofNullable(record.getGrade())
+                        .map(bn -> sysDictService.queryDictTextByKey("billet_spec", bn))
+                        .orElseGet(() -> sysDictService.queryDictTextByKey("billet_spec", "5"));
+            }
+
+            rollOneHeatNo.setBrandNum(brandNum);
+
+            rollOneHeatNo.setId(record.getId());
+            rollOneHeatNo.setConfirmTime(record.getConfirmTime());
 
             String detailJson = record.getRollClubOneDetails();
 
@@ -450,9 +459,11 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                         BigDecimal unitWeight = BigDecimal.ZERO;
                         String spec = "";
 
+
                         if (lengthWeightCache.containsKey(length)) {
                             unitWeight = lengthWeightCache.get(length);
                             spec = lengthSpecCache.getOrDefault(length, "");
+
                         } else {
                             LambdaQueryWrapper<BilletRulerConfig> wrapper = new LambdaQueryWrapper<BilletRulerConfig>()
                                     .eq(BilletRulerConfig::getLength, length);
@@ -466,12 +477,13 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                                     spec = config.getSpec();
                                     lengthSpecCache.put(length, spec);
                                 }
+
                             }
                         }
 
                         BigDecimal totalWeight = unitWeight.multiply(BigDecimal.valueOf(count));
 
-                        // ⭐ 计算起始根数与终止根数
+                        // 计算起始根数与终止根数
                         int lastEndAmount = lengthCumulativeCountMap.getOrDefault(length, 0);
                         int startAmount = lastEndAmount + 1;
                         int endAmount = lastEndAmount + count;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/vo/RollClubOneHeatVO.java

@@ -17,6 +17,14 @@ public class RollClubOneHeatVO {
     @Data
     public static class RollOneHeatNo {
 
+        private String id;
+
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+        private Date confirmTime;
+
+        @ApiModelProperty(value = "牌号")
+        private String brandNum;
 
         @ApiModelProperty(value = "当前定尺总支数")
         private Integer totalAmount;
@@ -51,6 +59,7 @@ public class RollClubOneHeatVO {
         @ApiModelProperty(value = "创建日期")
         private Date createTime;
 
+
     }
 
     @Data

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/vo/RollClubOneVO.java

@@ -15,6 +15,7 @@ import java.util.List;
 public class RollClubOneVO {
 
 
+
     private List<RollClubOneVO.HeatNoDetail> heatNoDetails;
 
     private RollClubOneHeatVO storageCenterHeatNoInvoicing;