备注、定尺查询接口调整

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/entity/BilletHotsendChangeShift.java

@@ -182,4 +182,11 @@ public class BilletHotsendChangeShift implements Serializable {
 
     @ApiModelProperty(value = "班次吊运信息")
     private String liftingBillDetailsList;
+
+    // 班组定尺明细
+    @ApiModelProperty(value = "原始生产记录定尺信息")
+    private String sizeInfo;
+
+    @ApiModelProperty(value = "原始生产记录备注信息")
+    private String content;
 }

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

@@ -117,9 +117,24 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 	 */
 	@AutoLog(value = "钢坯生成原始记录-添加")
 	@ApiOperation(value="钢坯生成原始记录-添加", notes="钢坯生成原始记录-添加")
-	@RequiresPermissions("billetOriginalProductRecord:billet_original_product_record:add")
+//	@RequiresPermissions("billetOriginalProductRecord:billet_original_product_record:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BilletOriginalProductRecord billetOriginalProductRecord) {
+
+		if (billetOriginalProductRecord.getAmount() != null && billetOriginalProductRecord.getAmount() > 0){
+				Integer newTotal = billetOriginalProductRecord.getAmount();
+			// 执行随机分配
+			Map<String, Integer> strandAllocation = allocateRandomly(newTotal, 8);
+			// 将分配结果设置到对象中
+			billetOriginalProductRecord.setOneStrandSum(strandAllocation.get("oneStrandSum"));
+			billetOriginalProductRecord.setTwoStrandSum(strandAllocation.get("twoStrandSum"));
+			billetOriginalProductRecord.setThreeStrandSum(strandAllocation.get("threeStrandSum"));
+			billetOriginalProductRecord.setFourStrandSum(strandAllocation.get("fourStrandSum"));
+			billetOriginalProductRecord.setFiveStrandSum(strandAllocation.get("fiveStrandSum"));
+			billetOriginalProductRecord.setSixStrandSum(strandAllocation.get("sixStrandSum"));
+			billetOriginalProductRecord.setSevenStrandSum(strandAllocation.get("sevenStrandSum"));
+			billetOriginalProductRecord.setEightStrandSum(strandAllocation.get("eightStrandSum"));
+		}
 		billetOriginalProductRecordService.save(billetOriginalProductRecord);
 		return Result.OK("添加成功！");
 	}
@@ -182,10 +197,9 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			if (hotChargeLengthUpdated) {
 				bopr.setIsEditCharge("2");
 			}
-			bopr.setUpdateTime(new Date());
 			// 判断remark字段是否为NULL，不为空代表需要起垛
-			if (oConvertUtils.isNotEmpty(bopr.getRemark())){
-				String str = bopr.getRemark();
+			if (oConvertUtils.isNotEmpty(bopr.getStackInfo())){
+				String str = bopr.getStackInfo();
 				String[] parts = str.split("-");
 				// 起垛的数量
 				int stackingSum = Integer.parseInt(parts[0]);
@@ -193,9 +207,9 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				String size = parts[1];
 				String typeConfigId = parts[2];
 				handleAddStack(bopr.getCcmNo(), bopr.getHeatNo(), stackingSum, size, typeConfigId);
+				// 备注remark字段重置
+				bopr.setStackInfo("");
 			}
-			// 备注remark字段重置
-			bopr.setRemark("");
 			// 保存修改
 			billetOriginalProductRecordService.updateById(bopr);
 		}
@@ -422,7 +436,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 
 	 @ApiOperation(value="钢坯原始生产记录查询", notes="钢坯原始生产记录查询")
 	 @GetMapping(value = "/queryBilletRecordByCcmNo")
-	 public Result<List<BilletOriginalProductRecord>> queryHeatsActualsByCcmNo(@RequestParam(name="ccmNo", required = false) String ccmNo,
+	 public Result<BilletOriginalProductRecordDetail> queryHeatsActualsByCcmNo(@RequestParam(name="ccmNo", required = false) String ccmNo,
 																			   @RequestParam(name="changeShiftId", required = false) String changeShiftId,
 																			   @RequestParam(name="queryType") String queryType) {
 		 List<BilletOriginalProductRecord> billetOriginalProductRecords = new ArrayList<>();
@@ -508,7 +522,11 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 }
 		 // 通过铸机号、班组、班别、交班开始时间 查询钢坯生产原始记录
 		 List<BilletOriginalProductRecord> billetOriginalProductRecordList = billetOriginalProductRecordService.list(queryWrapper3);
-		 return Result.OK(billetOriginalProductRecordList);
+		 BilletOriginalProductRecordDetail billetOriginalProductRecordDetails = new BilletOriginalProductRecordDetail();
+		 billetOriginalProductRecordDetails.setBilletOriginalProductRecordList(billetOriginalProductRecordList);
+		 billetOriginalProductRecordDetails.setSizeInfo(billetHotsendChangeShift.getSizeInfo());
+		 billetOriginalProductRecordDetails.setContent(billetHotsendChangeShift.getContent());
+		 return Result.OK(billetOriginalProductRecordDetails);
 	 }
 
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/entity/BilletOriginalProductRecord.java

@@ -163,5 +163,8 @@ public class BilletOriginalProductRecord implements Serializable {
     @ApiModelProperty(value = "是否编辑过热装")
     private String isEditCharge;
 
+    @Excel(name = "起垛信息", width = 15)
+    @ApiModelProperty(value = "起垛信息")
+    private String stackInfo;
 
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/vo/BilletOriginalProductRecordDetail.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.billet.billetOriginalProductRecord.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.billet.billetOriginalProductRecord.entity.BilletOriginalProductRecord;
+
+import java.util.List;
+
+@Data
+public class BilletOriginalProductRecordDetail {
+
+    @ApiModelProperty(value = "原始生产记录信息")
+    private List<BilletOriginalProductRecord> billetOriginalProductRecordList;
+
+    @ApiModelProperty(value = "原始生产记录定尺信息")
+    private String sizeInfo;
+
+    @ApiModelProperty(value = "原始生产记录备注信息")
+    private String content;
+}