update

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/entity/RollClubCommon.java

@@ -159,4 +159,10 @@ public class RollClubCommon {
     @Excel(name = "定尺", width = 15)
     @ApiModelProperty(value = "定尺",required = true)
     private Integer length;
+    /**
+     * 组坯号
+     */
+    @Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号", required = true)
+    private String assemblyNumber;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -175,7 +175,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
-            billetHotsend.setStackNum(idExistBh.getStackNum() - groupRollClubCommonList.size());
+//            billetHotsend.setStackNum(idExistBh.getStackNum() - groupRollClubCommonList.size());
             // 钢坯热送基础信息存在，但是钢坯信息不存在 直接返回
             if ("roll_club_two".equals(loadingParams.getDestinationTable())){
                 billetHotsend.setRollclubtwoNum(oConvertUtils.isNotEmpty(idExistBh.getRollclubtwoNum()) ? idExistBh.getRollclubtwoNum() + groupRollClubCommonList.size() : groupRollClubCommonList.size());
@@ -559,7 +559,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
-            billetHotsend.setStackNum(idExistBh.getStackNum() - groupRollClubCommonList.size());
+//            billetHotsend.setStackNum(idExistBh.getStackNum() - groupRollClubCommonList.size());
             // 钢坯热送基础信息存在，但是钢坯信息不存在 直接返回
             if ("roll_club_two".equals(loadingParams.getDestinationTable())){
                 billetHotsend.setRollclubtwoNum(oConvertUtils.isNotEmpty(idExistBh.getRollclubtwoNum()) ? idExistBh.getRollclubtwoNum() + groupRollClubCommonList.size() : groupRollClubCommonList.size());
@@ -881,7 +881,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             if (oConvertUtils.isNotEmpty(idExistBh)){
                 log.info("{}{}", ">>>>>更新钢坯热送基础信息叛废支数:", JSON.toJSON(idExistBh));
                 idExistBh.setWasteNum(oConvertUtils.isEmpty(idExistBh.getWasteNum()) ? 4 : idExistBh.getWasteNum() + 4);
-                idExistBh.setStackNum(idExistBh.getStackNum() - 4);
+//                idExistBh.setStackNum(idExistBh.getStackNum() - 4);
                 idExistBh.setUpdateTime(new Date());
                 billetHotsendBaseService.updateById(idExistBh);
             }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -78,6 +78,20 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<StorageBill> queryWrapper = QueryGenerator.initQueryWrapper(storageBill, req.getParameterMap());
+		queryWrapper.notIn("license_plate", Arrays.asList("堆垛辊道","辊道"));
+		Page<StorageBill> page = new Page<StorageBill>(pageNo, pageSize);
+		IPage<StorageBill> pageList = storageBillService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	@ApiOperation(value="钢坯热送单-分页列表查询", notes="钢坯热送单-分页列表查询")
+	@GetMapping(value = "/listHotSend")
+	public Result<IPage<StorageBill>> queryHotSendPageList(StorageBill storageBill,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		QueryWrapper<StorageBill> queryWrapper = QueryGenerator.initQueryWrapper(storageBill, req.getParameterMap());
+		queryWrapper.in("license_plate", Arrays.asList("堆垛辊道","辊道"));
 		Page<StorageBill> page = new Page<StorageBill>(pageNo, pageSize);
 		IPage<StorageBill> pageList = storageBillService.page(page, queryWrapper);
 		return Result.OK(pageList);