update新增

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/controller/BilletBasicInfoController.java

@@ -51,8 +51,12 @@ public class BilletBasicInfoController extends JeecgController<BilletBasicInfo,
 	public Result<?> queryPageList(BilletBasicInfo billetBasicInfo,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="type", defaultValue="0") Integer type,
 								   HttpServletRequest req) {
 		QueryWrapper<BilletBasicInfo> queryWrapper = QueryGenerator.initQueryWrapper(billetBasicInfo, req.getParameterMap());
+		if (type == 1){
+			queryWrapper.isNull("belong_table");
+		}
 		Page<BilletBasicInfo> page = new Page<BilletBasicInfo>(pageNo, pageSize);
 		IPage<BilletBasicInfo> pageList = billetBasicInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -168,8 +172,8 @@ public class BilletBasicInfoController extends JeecgController<BilletBasicInfo,
 	@AutoLog(value = "钢坯类型名称信息-通过铸机号")
 	@ApiOperation(value="钢坯类型名称信息-通过铸机号", notes="钢坯类型名称信息-通过铸机号")
 	@GetMapping(value = "/queryBilletNameList")
-	public Result<?> queryBilletNameList(@RequestParam(name="castMachine") String castMachine) {
-		List<BilletHotsendTypeConfig> billetNameList = billetBasicInfoService.queryBilletNameList(castMachine);
+	public Result<?> queryBilletNameList(@RequestParam(name="ccmNo") String ccmNo) {
+		List<BilletHotsendTypeConfig> billetNameList = billetBasicInfoService.queryBilletNameList(ccmNo);
 		return Result.OK(billetNameList);
 	}
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/entity/BilletBasicInfo.java

@@ -135,6 +135,19 @@ public class BilletBasicInfo implements Serializable {
     @ApiModelProperty(value = "判级结果",required = true)
     private String ratingsResult;
 
+    /**所属表*/
+    @Excel(name = "所属表", width = 15)
+    @ApiModelProperty(value = "所属表",required = true)
+    private String belongTable;
+
+    public String getBelongTable() {
+        return belongTable;
+    }
+
+    public void setBelongTable(String belongTable) {
+        this.belongTable = belongTable;
+    }
+
     public BilletBasicInfo() {
     }
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/IBilletBasicInfoService.java

@@ -21,5 +21,5 @@ public interface IBilletBasicInfoService extends IService<BilletBasicInfo> {
 
     List<Integer> queryBilletLengthList(Integer ccmNo, String heatNo);
 
-    List<BilletHotsendTypeConfig> queryBilletNameList(String castMachine);
+    List<BilletHotsendTypeConfig> queryBilletNameList(String ccmNo);
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/impl/BilletBasicInfoServiceImpl.java

@@ -63,9 +63,9 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
     }
 
     @Override
-    public List<BilletHotsendTypeConfig> queryBilletNameList(String castMachine) {
+    public List<BilletHotsendTypeConfig> queryBilletNameList(String ccmNo) {
         LambdaQueryWrapper<BilletHotsendTypeConfig> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BilletHotsendTypeConfig::getCastMachine, castMachine);
+        queryWrapper.eq(BilletHotsendTypeConfig::getCastMachine, ccmNo);
         return billetHotsendTypeConfigService.list(queryWrapper);
     }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/controller/BilletHotsendBaseController.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.billet.billetHotsend.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -47,8 +49,6 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
    @Autowired
    private IStackingAndLoadingVehiclesService stackingAndLoadingVehiclesService;
 
-   private Integer furnace = 7000;
-
    /**
     * 分页列表查询
     *
@@ -98,9 +98,18 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
     @ApiOperation(value="钢坯热送基础信息-添加", notes="钢坯热送基础信息-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody BilletHotsendDetailsVo billetHotsendDetailsVo) {
+        BilletHotsend billetHotsend = billetHotsendDetailsVo.getBilletHotsend();
+        billetHotsend.setId(String.valueOf(IdWorker.getId()));
+        billetHotsendDetailsVo.setBilletHotsend(billetHotsend);
+        LambdaQueryWrapper<BilletHotsend> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo()).eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo());
+        BilletHotsend check = billetHotsendBaseService.getOne(queryWrapper);
+        if (oConvertUtils.isNotEmpty(check) && billetHotsend.getIsUpd() ){
+            return Result.error("该铸机和炉号信息已存在，添加失败!");
+        }
         billetHotsendBaseService.saveBilletHotsendDetails(billetHotsendDetailsVo);
-        operateLogService.add(billetHotsendDetailsVo.getBilletHotsend(),null,BilletHotsend.class);
-        return Result.OK(billetHotsendDetailsVo.getBilletHotsend());
+        operateLogService.add(billetHotsend,null,BilletHotsend.class);
+        return Result.OK("新增成功!");
     }
 
 
@@ -238,10 +247,10 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
      */
     @ApiOperation(value="钢坯热送单炉支数结束根数-通过铸机号和炉号查询", notes="钢坯热送单炉支数结束根数-通过铸机号和炉号查询")
     @GetMapping(value = "/queryEndNumByCcmNo")
-    public Result<Integer> queryEndNumById(@RequestParam(name="castMachine") String castMachine,
+    public Result<Integer> queryEndNumById(@RequestParam(name="ccmNo") String ccmNo,
                                                         @RequestParam(name="heatNo") String heatNo,
                                                         @RequestParam(name="belongTable") String belongTable) {
-        Integer endNumStack = billetHotsendBaseService.queryEndNumByCcmNo(castMachine, heatNo, belongTable);
+        Integer endNumStack = billetHotsendBaseService.queryEndNumByCcmNo(ccmNo, heatNo, belongTable);
         return Result.OK(endNumStack);
     }
 

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.billet.billetHotsend.entity;
 
 import lombok.Data;
+import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 
 import java.util.List;
 
@@ -12,5 +13,10 @@ public class BilletHotsendDetailsVo {
 
     private BilletHotsend billetHotsend;
 
+    private StorageBill storageBill;
+
     private List<RollClubCommon> rollClubCommonList;
+
+    private String belongTable;
+
 }

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

@@ -52,6 +52,10 @@ public class RollClubCommon {
     @Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号")
     private String billetNo;
+    /**流号*/
+    @Excel(name = "流号", width = 15)
+    @ApiModelProperty(value = "流号",required = true)
+    private Integer strandNo;
     /**班组*/
     @ApiModelProperty(value = "班组")
     @Dict(dicCode = "lg_bz")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/IBilletHotsendBaseService.java

@@ -24,5 +24,5 @@ public interface IBilletHotsendBaseService extends IService<BilletHotsend> {
 
     void saveBilletHotsendDetails(BilletHotsendDetailsVo billetHotsendDetailsVo);
 
-    Integer queryEndNumByCcmNo(String castMachine, String heatNo, String belongTable);
+    Integer queryEndNumByCcmNo(String ccmNo, String heatNo, String belongTable);
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -1,10 +1,14 @@
 package org.jeecg.modules.billet.billetHotsend.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
+import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
+import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
 import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.mapper.BilletHotsendBaseMapper;
 import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
@@ -13,15 +17,22 @@ import org.jeecg.modules.billet.rollClubOne.entity.RollClubOne;
 import org.jeecg.modules.billet.rollClubOne.entity.RollClubOneDetails;
 import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneDetailsService;
 import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneService;
+import org.jeecg.modules.billet.rollClubThree.entity.RollClubThree;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
+import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeService;
+import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwo;
 import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwoDetails;
 import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoDetailsService;
+import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoService;
 import org.jeecg.modules.billet.rollHeight.entity.RollHeight;
 import org.jeecg.modules.billet.rollHeight.entity.RollHeightDetails;
 import org.jeecg.modules.billet.rollHeight.service.IRollHeightDetailsService;
 import org.jeecg.modules.billet.rollHeight.service.IRollHeightService;
+import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShipp;
+import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
+import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippService;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.entity.StorageBillModel;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillModelService;
@@ -31,6 +42,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -57,17 +69,25 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	@Autowired
 	private IRollClubOneService rollClubOneService;
 	@Autowired
-	private IRollHeightService rollHeightService;
-	@Autowired
 	private IRollClubOneDetailsService rollClubOneDetailsService;
 	@Autowired
+	private IRollClubTwoService rollClubTwoService;
+	@Autowired
 	private IRollClubTwoDetailsService rollClubTwoDetailsService;
 	@Autowired
+	private IRollClubThreeService rollClubThreeService;
+	@Autowired
 	private IRollClubThreeDetailsService rollClubThreeDetailsService;
 	@Autowired
+	private IRollHeightService rollHeightService;
+	@Autowired
 	private IRollHeightDetailsService rollHeightDetailsService;
 	@Autowired
+	private IRollOutShippService rollOutShippService;
+	@Autowired
 	private IRollOutShippDetailsService rollOutShippDetailsService;
+	@Autowired
+	private IBilletBasicInfoService billetBasicInfoService;
 
 	@Override
 	public void updateDesc(BilletHotsend billetHotsend) {
@@ -278,22 +298,232 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	public void saveBilletHotsendDetails(BilletHotsendDetailsVo billetHotsendDetailsVo) {
 		BilletHotsend billetHotsend = new BilletHotsend();
 		// 新保存 钢坯热送基础信息
-        BeanUtils.copyProperties(billetHotsendDetailsVo.getBilletHotsend(), billetHotsend);
-        billetHotsend.setCreateDate(new Date());
-		baseMapper.insert(billetHotsend);
+		BeanUtils.copyProperties(billetHotsendDetailsVo.getBilletHotsend(), billetHotsend);
+		billetHotsend.setCreateDate(new Date());
+		List<RollClubCommon> rollClubCommonLists = billetHotsendDetailsVo.getRollClubCommonList();
+		if (oConvertUtils.isNotEmpty(rollClubCommonLists)){
+			billetHotsend.setAmountTotal(rollClubCommonLists.size());
+		}
+		if (billetHotsend.getIsUpd()){
+			baseMapper.insert(billetHotsend);
+		}else {
+			LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo()).eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo());
+			baseMapper.update(billetHotsend,  updateWrapper);
+		}
+		if (oConvertUtils.isEmpty(billetHotsendDetailsVo.getBelongTable())){
+			return;
+		}
+		List<String> billetNos = new ArrayList<>();
+		List<RollClubCommon> rollClubCommonList = billetHotsendDetailsVo.getRollClubCommonList();
 		// 保存 钢坯热送单炉支数传递单明细
-//		if (oConvertUtils.listIsNotEmpty(billetHotsendDetailsVo.getBilletHotsendDetailsList())){
-//			List<BilletHotsendDetails> billetHotsendDetailsList = billetHotsendDetailsVo.getBilletHotsendDetailsList();
-//			billetHotsendDetailsList.stream().peek(billetHotsendDetails -> billetHotsendDetails.setCreateTime(new Date())).count();
-//			billetHotsendDetailsService.saveBatch(billetHotsendDetailsList);
-//		}
+		if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
+			// 保存棒一信息
+			RollClubOne rollClubOne = new RollClubOne();
+			rollClubOne.setCcmNo(billetHotsend.getCcmNo());
+			rollClubOne.setHeatNo(billetHotsend.getHeatNo());
+			rollClubOne.setShiftGroup(billetHotsend.getShiftGroup());
+			rollClubOne.setShift(billetHotsend.getShift());
+			rollClubOne.setSteel(billetHotsend.getSteel());
+			rollClubOne.setAmountTotal(rollClubCommonList.size());// 总支数
+			rollClubOne.setSpec(billetHotsend.getSpec());
+			rollClubOne.setCreateTime(new Date());
+//			rollClubOne.setSize(); //定尺
+//			rollClubOne.setBlankOutput();// 出坯量
+//			rollClubOne.setDecideWeight();// 定重
+			rollClubOneService.save(rollClubOne);
+			// 保存棒二明细信息
+			List<RollClubOneDetails> rollClubOneDetailsList = new ArrayList<>();
+			rollClubCommonList.forEach(x ->{
+				RollClubOneDetails rollClubOneDetails = new RollClubOneDetails();
+				rollClubOneDetails.setCcmNo(x.getCcmNo());
+				rollClubOneDetails.setHeatNo(x.getHeatNo());
+				rollClubOneDetails.setBilletNo(x.getBilletNo());
+				rollClubOneDetails.setShift(x.getShift());
+				rollClubOneDetails.setShiftGroup(x.getShiftGroup());
+				rollClubOneDetails.setStartNum(x.getStartNum());
+				rollClubOneDetails.setEndNum(x.getEndNum());
+				rollClubOneDetails.setCreateTime(new Date());
+				rollClubOneDetailsList.add(rollClubOneDetails);
+			});
+			rollClubOneDetailsService.saveBatch(rollClubOneDetailsList);
+		}
+
+		if ("roll_club_two".equals(billetHotsendDetailsVo.getBelongTable())){
+			// 保存棒一信息
+			RollClubTwo rollClubTwo = new RollClubTwo();
+			rollClubTwo.setCcmNo(billetHotsend.getCcmNo());
+			rollClubTwo.setHeatNo(billetHotsend.getHeatNo());
+			rollClubTwo.setShiftGroup(billetHotsend.getShiftGroup());
+			rollClubTwo.setShift(billetHotsend.getShift());
+			rollClubTwo.setSteel(billetHotsend.getSteel());
+			rollClubTwo.setAmountTotal(rollClubCommonList.size());// 总支数
+			rollClubTwo.setSpec(billetHotsend.getSpec());
+			rollClubTwo.setCreateTime(new Date());
+//			rollClubTwo.setSize(); //定尺
+//			rollClubTwo.setBlankOutput();// 出坯量
+//			rollClubTwo.setDecideWeight();// 定重
+			rollClubTwoService.save(rollClubTwo);
+			// 保存棒二明细信息
+			List<RollClubTwoDetails> rollClubTwoDetailsList = new ArrayList<>();
+			rollClubCommonList.forEach(x ->{
+				RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
+				rollClubTwoDetails.setCcmNo(x.getCcmNo());
+				rollClubTwoDetails.setHeatNo(x.getHeatNo());
+				rollClubTwoDetails.setShift(x.getShift());
+				rollClubTwoDetails.setShiftGroup(x.getShiftGroup());
+				rollClubTwoDetails.setBilletNo(x.getBilletNo());
+				rollClubTwoDetails.setStartNum(x.getStartNum());
+				rollClubTwoDetails.setEndNum(x.getEndNum());
+				rollClubTwoDetails.setCreateTime(new Date());
+				billetNos.add(x.getBilletNo());
+				rollClubTwoDetailsList.add(rollClubTwoDetails);
+			});
+			rollClubTwoDetailsService.saveBatch(rollClubTwoDetailsList);
+		}
+
+		if ("roll_club_three".equals(billetHotsendDetailsVo.getBelongTable())){
+			// 保存棒三信息
+			RollClubThree rollClubThree = new RollClubThree();
+			rollClubThree.setCcmNo(billetHotsend.getCcmNo());
+			rollClubThree.setHeatNo(billetHotsend.getHeatNo());
+			rollClubThree.setShiftGroup(billetHotsend.getShiftGroup());
+			rollClubThree.setShift(billetHotsend.getShift());
+			rollClubThree.setSteel(billetHotsend.getSteel());
+			rollClubThree.setAmountTotal(rollClubCommonList.size());// 总支数
+			rollClubThree.setSpec(billetHotsend.getSpec());
+			rollClubThree.setCreateTime(new Date());
+//			rollClubThree.setSize(); //定尺
+//			rollClubThree.setBlankOutput();// 出坯量
+//			rollClubThree.setDecideWeight();// 定重
+			rollClubThreeService.save(rollClubThree);
+			// 保存棒三明细信息
+			List<RollClubThreeDetails> rollClubThreeDetailsList = new ArrayList<>();
+			rollClubCommonList.forEach(x ->{
+				RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
+				rollClubThreeDetails.setCcmNo(x.getCcmNo());
+				rollClubThreeDetails.setHeatNo(x.getHeatNo());
+				rollClubThreeDetails.setShift(x.getShift());
+				rollClubThreeDetails.setShiftGroup(x.getShiftGroup());
+				rollClubThreeDetails.setBilletNo(x.getBilletNo());
+				rollClubThreeDetails.setStartNum(x.getStartNum());
+				rollClubThreeDetails.setEndNum(x.getEndNum());
+				rollClubThreeDetails.setCreateTime(new Date());
+				billetNos.add(x.getBilletNo());
+				rollClubThreeDetailsList.add(rollClubThreeDetails);
+			});
+			rollClubThreeDetailsService.saveBatch(rollClubThreeDetailsList);
+		}
+
+		/**
+		 * 保存高线信息
+		 */
+		if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
+			RollHeight rollHeight = new RollHeight();
+			rollHeight.setCcmNo(billetHotsend.getCcmNo());
+			rollHeight.setHeatNo(billetHotsend.getHeatNo());
+			rollHeight.setShiftGroup(billetHotsend.getShiftGroup());
+			rollHeight.setShift(billetHotsend.getShift());
+			rollHeight.setSteel(billetHotsend.getSteel());
+			rollHeight.setAmountTotal(rollClubCommonList.size());// 总支数
+			rollHeight.setSpec(billetHotsend.getSpec());
+			rollHeight.setCreateTime(new Date());
+//			rollClubThree.setSize(); //定尺
+//			rollClubThree.setBlankOutput();// 出坯量
+//			rollClubThree.setDecideWeight();// 定重
+			rollHeightService.save(rollHeight);
+			// 保存高线明细信息
+			List<RollHeightDetails> rollHeightDetailsList = new ArrayList<>();
+
+			rollClubCommonList.forEach(x ->{
+				RollHeightDetails rollHeightDetails = new RollHeightDetails();
+				rollHeightDetails.setCcmNo(x.getCcmNo());
+				rollHeightDetails.setHeatNo(x.getHeatNo());
+				rollHeightDetails.setShift(x.getShift());
+				rollHeightDetails.setShiftGroup(x.getShiftGroup());
+				rollHeightDetails.setBilletNo(x.getBilletNo());
+				rollHeightDetails.setStartNum(x.getStartNum());
+				rollHeightDetails.setEndNum(x.getEndNum());
+				rollHeightDetails.setCreateTime(new Date());
+				billetNos.add(x.getBilletNo());
+				rollHeightDetailsList.add(rollHeightDetails);
+			});
+			rollHeightDetailsService.saveBatch(rollHeightDetailsList);
+		}
+
+		/**
+		 * 保存上若信息
+		 */
+		if ("roll_out_shipp".equals(billetHotsendDetailsVo.getBelongTable())){
+			RollOutShipp rollOutShipp = new RollOutShipp();
+			rollOutShipp.setCcmNo(billetHotsend.getCcmNo());
+			rollOutShipp.setHeatNo(billetHotsend.getHeatNo());
+			rollOutShipp.setShiftGroup(billetHotsend.getShiftGroup());
+			rollOutShipp.setShift(billetHotsend.getShift());
+			rollOutShipp.setSteel(billetHotsend.getSteel());
+			rollOutShipp.setAmountTotal(rollClubCommonList.size());// 总支数
+
+//			rollOutShipp.setSize(); //定尺
+//			rollOutShipp.setBlankOutput();// 出坯量
+//			rollOutShipp.setDecideWeight();// 定重
+
+			rollOutShipp.setSpec(billetHotsend.getSpec());
+			rollOutShipp.setCreateTime(new Date());
+			rollOutShippService.save(rollOutShipp);
+			// 保存高线明细信息
+			List<RollOutShippDetails> rollOutShippDetailsList = new ArrayList<>();
+			rollClubCommonList.forEach(x ->{
+				RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
+				rollOutShippDetails.setCcmNo(x.getCcmNo());
+				rollOutShippDetails.setHeatNo(x.getHeatNo());
+				rollOutShippDetails.setShift(x.getShift());
+				rollOutShippDetails.setShiftGroup(x.getShiftGroup());
+				rollOutShippDetails.setBilletNo(x.getBilletNo());
+				rollOutShippDetails.setStartNum(x.getStartNum());
+				rollOutShippDetails.setEndNum(x.getEndNum());
+				rollOutShippDetails.setCreateTime(new Date());
+				billetNos.add(x.getBilletNo());
+				rollOutShippDetailsList.add(rollOutShippDetails);
+			});
+			rollOutShippDetailsService.saveBatch(rollOutShippDetailsList);
+		}
+		//查询并批量更新钢坯基础信息 belongTable
+		LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<BilletBasicInfo>()
+				.eq(BilletBasicInfo::getCcmNo, Integer.valueOf(billetHotsend.getCcmNo()))
+				.eq(BilletBasicInfo::getHeatNo, billetHotsend.getHeatNo())
+				.in(BilletBasicInfo::getBilletNo, billetNos);
+		List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
+		billetBasicInfoList.forEach(x ->{
+			if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
+				x.setBelongTable("roll_club_one");
+			}else if ("roll_club_two".equals(billetHotsendDetailsVo.getBelongTable())){
+				x.setBelongTable("roll_club_two");
+			}else if ("roll_club_three".equals(billetHotsendDetailsVo.getBelongTable())){
+				x.setBelongTable("roll_club_three");
+			}else if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
+				x.setBelongTable("roll_height");
+			}else if ("roll_out_shipp".equals(billetHotsendDetailsVo.getBelongTable())){
+				x.setBelongTable("roll_out_shipp");
+			}
+			x.setUpdateTime(new Date());
+		});
+		billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
+		// 更新装运单 车次总序号、本车车次
+		if (billetHotsendDetailsVo.getStorageBill() != null){
+			StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
+			storageBill.setCarAllNum(oConvertUtils.isEmpty(storageBill.getCarAllNum()) ? "1" : String.valueOf(Integer.valueOf(storageBill.getCarAllNum())+1));// 车次总序号
+			storageBill.setCarNum(storageBill.getCarNum() + 1);// 本车车次
+			storageBill.setUpdateTime(new Date());
+			storageBillService.updateById(storageBill);
+		}
+
 	}
 
 	@Override
-	public Integer queryEndNumByCcmNo(String castMachine, String heatNo, String belongTable) {
+	public Integer queryEndNumByCcmNo(String ccmNo, String heatNo, String belongTable) {
 		if ("roll_club_one".equals(belongTable)){
 			LambdaQueryWrapper<RollClubOneDetails> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(RollClubOneDetails::getCcmNo, castMachine).eq(RollClubOneDetails::getHeatNo, heatNo);
+			queryWrapper.eq(RollClubOneDetails::getCcmNo, ccmNo).eq(RollClubOneDetails::getHeatNo, heatNo);
 			List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(queryWrapper);
 			if (oConvertUtils.listIsEmpty(rollClubOneDetailsList)){
 				return 0;
@@ -302,7 +532,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			return rollClubOneDetails.getEndNum();
 		}else if ("roll_club_two".equals(belongTable)){
 			LambdaQueryWrapper<RollClubTwoDetails> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(RollClubTwoDetails::getCcmNo, castMachine).eq(RollClubTwoDetails::getHeatNo, heatNo);
+			queryWrapper.eq(RollClubTwoDetails::getCcmNo, ccmNo).eq(RollClubTwoDetails::getHeatNo, heatNo);
 			List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper);
 			if (oConvertUtils.listIsEmpty(rollClubTwoDetailsList)){
 				return 0;
@@ -311,7 +541,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			return rollClubTwoDetails.getEndNum();
 		}else if ("roll_club_three".equals(belongTable)){
 			LambdaQueryWrapper<RollClubThreeDetails> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(RollClubThreeDetails::getCcmNo, castMachine).eq(RollClubThreeDetails::getHeatNo, heatNo);
+			queryWrapper.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getHeatNo, heatNo);
 			List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper);
 			if (oConvertUtils.listIsEmpty(rollClubThreeDetailsList)){
 				return 0;
@@ -320,7 +550,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			return rollClubThreeDetails.getEndNum();
 		}else if ("roll_height".equals(belongTable)){
 			LambdaQueryWrapper<RollHeightDetails> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(RollHeightDetails::getCcmNo, castMachine).eq(RollHeightDetails::getHeatNo, heatNo);
+			queryWrapper.eq(RollHeightDetails::getCcmNo, ccmNo).eq(RollHeightDetails::getHeatNo, heatNo);
 			List<RollHeightDetails> rollHeightDetailsList = rollHeightDetailsService.list(queryWrapper);
 			if (oConvertUtils.listIsEmpty(rollHeightDetailsList)){
 				return 0;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/controller/BilletHotsendChangeShiftController.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.billet.billetHotsendChangeShift.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,12 +17,14 @@ import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendCha
 import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
 import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -37,9 +41,12 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 	@Autowired
 	private IBilletHotsendChangeShiftService billetHotsendChangeShiftService;
 
-	 @Autowired
-	 private IOperateLogService operateLogService;
-	
+	@Autowired
+	private IOperateLogService operateLogService;
+
+	@Autowired
+	public RedisTemplate redisTemplate;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -61,7 +68,7 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 		IPage<BilletHotsendChangeShift> pageList = billetHotsendChangeShiftService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -73,18 +80,38 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 	@RequiresPermissions("billetHotsendChangeShift:billet_hotsend_change_shift:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BilletHotsendChangeShift billetHotsendChangeShiftVo) {
-		operateLogService.add(billetHotsendChangeShiftVo,null, BilletHotsendChangeShift.class);
-		QueryWrapper<BilletHotsendChangeShift> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("ccm_no", billetHotsendChangeShiftVo.getCcmNo())
-				.eq("heat_no", billetHotsendChangeShiftVo.getHeatNo())
-				.eq("shift_group", billetHotsendChangeShiftVo.getShiftGroup())
-				.eq("shift", billetHotsendChangeShiftVo.getShift());
-		BilletHotsendChangeShift billetHotsendChangeShift =  billetHotsendChangeShiftService.getOne(queryWrapper);
+
+		LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
+		// 获取当天开始时间 00:00:00
+		Calendar startCalendar = Calendar.getInstance();
+		startCalendar.setTime(new Date());
+		startCalendar.set(Calendar.HOUR_OF_DAY, 0);
+		startCalendar.set(Calendar.MINUTE, 0);
+		startCalendar.set(Calendar.SECOND, 0);
+		Date startOfDay = startCalendar.getTime();
+		// 获取当天结束时间 23:59:59
+		Calendar endCalendar = Calendar.getInstance();
+		endCalendar.setTime(new Date());
+		endCalendar.set(Calendar.HOUR_OF_DAY, 23);
+		endCalendar.set(Calendar.MINUTE, 59);
+		endCalendar.set(Calendar.SECOND, 59);
+		Date endOfDay = endCalendar.getTime();
+		queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, billetHotsendChangeShiftVo.getCcmNo())
+				.eq(BilletHotsendChangeShift::getShiftGroup, billetHotsendChangeShiftVo.getShiftGroup())
+				.eq(BilletHotsendChangeShift::getShift, billetHotsendChangeShiftVo.getShift())
+				.between(BilletHotsendChangeShift::getCreateTime, startOfDay, endOfDay);
+		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
 		if (billetHotsendChangeShift != null){
-			return Result.error("交班记录已存在，请检查班组或班别！");
+			return Result.OK("交班记录已存在，请检查班组或班别！");
 		}
 		billetHotsendChangeShiftVo.setCreateTime(new Date());
+		billetHotsendChangeShiftVo.setId(String.valueOf(IdWorker.getId()));
 		billetHotsendChangeShiftService.save(billetHotsendChangeShiftVo);
+		String keyShiftGroup = String.format("class:shift:group:%s", billetHotsendChangeShiftVo.getCcmNo());
+		String keyShift = String.format("class:shift:%s", billetHotsendChangeShiftVo.getCcmNo());
+		redisTemplate.opsForValue().set(keyShiftGroup, billetHotsendChangeShiftVo.getShiftGroup());
+		redisTemplate.opsForValue().set(keyShift, billetHotsendChangeShiftVo.getShift());
+		operateLogService.add(billetHotsendChangeShiftVo,null, BilletHotsendChangeShift.class);
 		return Result.OK("交班成功！");
 	}
 	
@@ -150,6 +177,23 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 		return Result.OK(billetHotsendChangeShift);
 	}
 
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯交班记录-通过铸机号查询")
+	@ApiOperation(value="钢坯交班记录-通过铸机号查询", notes="钢坯交班记录-通过铸机号查询")
+	@GetMapping(value = "/queryByCcmNo")
+	public Result<BilletHotsendChangeShift> queryByCcmNo(@RequestParam(name="ccmNo",required=true) String ccmNo) {
+		LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo).orderByDesc(BilletHotsendChangeShift::getCreateTime);
+		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.list(queryWrapper).stream().findFirst().orElse(null);
+		return Result.OK(billetHotsendChangeShift);
+	}
+
     /**
     * 导出excel
     *
@@ -175,4 +219,6 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
         return super.importExcel(request, response, BilletHotsendChangeShift.class);
     }
 
+
+
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/entity/RollClubOneDetails.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -60,6 +61,16 @@ public class RollClubOneDetails implements Serializable {
 	@Excel(name = "铸机号", width = 15)
     @ApiModelProperty(value = "铸机号")
     private String ccmNo;
+    /**班组*/
+    @Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    @Dict(dicCode = "lg_bz")
+    private String shiftGroup;
+    /**班别*/
+    @Excel(name = "班别", width = 15)
+    @Dict(dicCode = "lg_bb")
+    @ApiModelProperty(value = "班别")
+    private String shift;
 	/**坯号*/
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/entity/RollClubThreeDetails.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -60,6 +61,16 @@ public class RollClubThreeDetails implements Serializable {
 	@Excel(name = "铸机号", width = 15)
     @ApiModelProperty(value = "铸机号")
     private String ccmNo;
+    /**班组*/
+    @Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    @Dict(dicCode = "lg_bz")
+    private String shiftGroup;
+    /**班别*/
+    @Excel(name = "班别", width = 15)
+    @Dict(dicCode = "lg_bb")
+    @ApiModelProperty(value = "班别")
+    private String shift;
 	/**坯号*/
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/entity/RollClubTwoDetails.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -64,6 +65,16 @@ public class RollClubTwoDetails implements Serializable {
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号")
     private String billetNo;
+    /**班组*/
+    @Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    @Dict(dicCode = "lg_bz")
+    private String shiftGroup;
+    /**班别*/
+    @Excel(name = "班别", width = 15)
+    @Dict(dicCode = "lg_bb")
+    @ApiModelProperty(value = "班别")
+    private String shift;
 	/**装运单ID*/
 	@Excel(name = "装运单ID", width = 15)
     @ApiModelProperty(value = "装运单ID")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/entity/RollHeightDetails.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -64,6 +65,16 @@ public class RollHeightDetails implements Serializable {
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号")
     private String billetNo;
+    /**班组*/
+    @Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    @Dict(dicCode = "lg_bz")
+    private String shiftGroup;
+    /**班别*/
+    @Excel(name = "班别", width = 15)
+    @Dict(dicCode = "lg_bb")
+    @ApiModelProperty(value = "班别")
+    private String shift;
 	/**起始根数*/
 	@Excel(name = "起始根数", width = 15)
     @ApiModelProperty(value = "起始根数")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/entity/RollOutShippDetails.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -64,6 +65,16 @@ public class RollOutShippDetails implements Serializable {
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号")
     private String billetNo;
+    /**班组*/
+    @Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    @Dict(dicCode = "lg_bz")
+    private String shiftGroup;
+    /**班别*/
+    @Excel(name = "班别", width = 15)
+    @Dict(dicCode = "lg_bb")
+    @ApiModelProperty(value = "班别")
+    private String shift;
 	/**装运单ID*/
 	@Excel(name = "装运单ID", width = 15)
     @ApiModelProperty(value = "装运单ID")

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

@@ -221,9 +221,9 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 	  */
 	 @ApiOperation(value="查询未发车的车辆信息-通过铸机号查询", notes="查询未发车的车辆信息-通过铸机号查询")
 	 @GetMapping(value = "/queryNoDepartByCastMachine")
-	 public Result<List<StorageBill>> queryNoDepartByCastMachine(@RequestParam(name="castMachine") String castMachine) {
+	 public Result<List<StorageBill>> queryNoDepartByCastMachine(@RequestParam(name="ccmNo") String ccmNo) {
 		 LambdaQueryWrapper<StorageBill> queryWrapper = new LambdaQueryWrapper<>();
-		 queryWrapper.eq(StorageBill::getCcmNo, castMachine).isNotNull(StorageBill::getArrivalTime).isNull(StorageBill::getOutTime);
+		 queryWrapper.eq(StorageBill::getCcmNo, ccmNo).isNotNull(StorageBill::getArrivalTime).isNull(StorageBill::getOutTime);
 		 List<StorageBill> storageBillList = storageBillService.list(queryWrapper);
 		 if (oConvertUtils.listIsEmpty(storageBillList)) {
 			 return Result.error("未找到对应数据");