钢坯明细和判废生成代码

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

@@ -73,24 +73,19 @@ public class BilletHotsend implements Serializable {
     @Dict(dicCode = "lg_bb")
     @ApiModelProperty(value = "班别")
     private String shift;
-    /**定尺*/
-    @Excel(name = "定尺", width = 15)
-    @ApiModelProperty(value = "定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String size;
     /**钢种*/
     @Excel(name = "钢种", width = 15)
     @ApiModelProperty(value = "钢种")
     private String steel;
-    /**规格*/
-    @Excel(name = "规格", width = 15)
-    @ApiModelProperty(value = "规格")
-    @Dict(dicCode = "billet_spec")
-    private String spec;
+
     /**定重*/
     @Excel(name = "定重", width = 15)
     @ApiModelProperty(value = "定重")
     private Double decideWeight;
+    /**铸机*/
+    @Excel(name = "铸机", width = 15)
+    @ApiModelProperty(value = "castMachine")
+    private String castMachine;
     /**总支数*/
     @Excel(name = "总支数", width = 15)
     @ApiModelProperty(value = "总支数")
@@ -99,6 +94,10 @@ public class BilletHotsend implements Serializable {
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
     private Double blankOutput;
+    /**出车次数*/
+    @Excel(name = "出车次数", width = 15)
+    @ApiModelProperty(value = "出车次数")
+    private Integer outCarNum;
     /**C*/
     @Excel(name = "C", width = 15)
     @ApiModelProperty(value = "C")
@@ -131,192 +130,194 @@ public class BilletHotsend implements Serializable {
     @Excel(name = "是否已编辑", width = 15)
     @ApiModelProperty(value = "是否已编辑")
     private Boolean isUpd;
-    /**castMachine*/
-    @Excel(name = "铸机", width = 15)
-    @ApiModelProperty(value = "castMachine")
-    private String castMachine;
-    /**棒一支数*/
-    @Excel(name = "棒一支数", width = 15)
-    @ApiModelProperty(value = "棒一支数")
-    private String amountOne;
-    /**棒一定尺*/
-    @Excel(name = "棒一定尺", width = 15)
-    @ApiModelProperty(value = "棒一定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeOne;
-    /**棒一起始根*/
-    @Excel(name = "棒一起始根", width = 15)
-    @ApiModelProperty(value = "棒一起始根")
-    private String startNumOne;
-    /**棒一终止根*/
-    @Excel(name = "棒一终止根", width = 15)
-    @ApiModelProperty(value = "棒一终止根")
-    private String endNumOne;
-    /**棒一车号*/
-    @Excel(name = "棒一车号", width = 15)
-    @ApiModelProperty(value = "棒一车号")
-    private String carNumOne;
-    /**棒一垛位*/
-    @Excel(name = "棒一垛位", width = 15)
-    @ApiModelProperty(value = "棒一垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddrOne;
-    /**棒二支数*/
-    @Excel(name = "棒二支数", width = 15)
-    @ApiModelProperty(value = "棒二支数")
-    private String amountTwo;
-    /**棒二定尺*/
-    @Excel(name = "棒二定尺", width = 15)
-    @ApiModelProperty(value = "棒二定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeTwo;
-    /**棒二起始根*/
-    @Excel(name = "棒二起始根", width = 15)
-    @ApiModelProperty(value = "棒二起始根")
-    private String startNumTwo;
-    /**棒二终止根*/
-    @Excel(name = "棒二终止根", width = 15)
-    @ApiModelProperty(value = "棒二终止根")
-    private String endNumTwo;
-    /**棒二车号*/
-    @Excel(name = "棒二车号", width = 15)
-    @ApiModelProperty(value = "棒二车号")
-    private String carNumTwo;
-    /**棒二垛位*/
-    @Excel(name = "棒二垛位", width = 15)
-    @ApiModelProperty(value = "棒二垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddrTwo;
-    /**棒三支数*/
-    @Excel(name = "棒三支数", width = 15)
-    @ApiModelProperty(value = "棒三支数")
-    private String amountThree;
-    /**棒三定尺*/
-    @Excel(name = "棒三定尺", width = 15)
-    @ApiModelProperty(value = "棒三定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeThree;
-    /**棒三起始根*/
-    @Excel(name = "棒三起始根", width = 15)
-    @ApiModelProperty(value = "棒三起始根")
-    private String startNumThree;
-    /**棒三终止根*/
-    @Excel(name = "棒三终止根", width = 15)
-    @ApiModelProperty(value = "棒三终止根")
-    private String endNumThree;
-    /**棒三车号*/
-    @Excel(name = "棒三车号", width = 15)
-    @ApiModelProperty(value = "棒三车号")
-    private String carNumThree;
-    /**棒三垛位*/
-    @Excel(name = "棒三垛位", width = 15)
-    @ApiModelProperty(value = "棒三垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddrThree;
-    /**堆垛支数*/
-    @Excel(name = "堆垛支数", width = 15)
-    @ApiModelProperty(value = "堆垛支数")
-    private String amountStack;
-    /**棒三定尺*/
-    @Excel(name = "堆垛定尺", width = 15)
-    @ApiModelProperty(value = "堆垛定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeStack;
-    /**堆垛起始根*/
-    @Excel(name = "堆垛起始根", width = 15)
-    @ApiModelProperty(value = "堆垛起始根")
-    private String startNumStack;
-    /**堆垛终止根*/
-    @Excel(name = "堆垛终止根", width = 15)
-    @ApiModelProperty(value = "堆垛终止根")
-    private String endNumStack;
-    /**堆垛车号*/
-    @Excel(name = "堆垛车号", width = 15)
-    @ApiModelProperty(value = "堆垛车号")
-    private String carNumStack;
-    /**垛位*/
-    @Excel(name = "堆垛垛位", width = 15)
-    @ApiModelProperty(value = "堆垛垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddr;
-    /**判废支数*/
-    @Excel(name = "判废支数", width = 15)
-    @ApiModelProperty(value = "判废支数")
-    private String amountWaste;
-    @Excel(name = "判废定尺", width = 15)
-    @ApiModelProperty(value = "判废定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeWaste;
-    /**判废起始根*/
-    @Excel(name = "判废起始根", width = 15)
-    @ApiModelProperty(value = "判废起始根")
-    private String startNumWaste;
-    /**判废终止根*/
-    @Excel(name = "判废终止根", width = 15)
-    @ApiModelProperty(value = "判废终止根")
-    private String endNumWaste;
-    /**判废车号*/
-    @Excel(name = "判废车号", width = 15)
-    @ApiModelProperty(value = "判废车号")
-    private String carNumWaste;
-    /**判废垛位*/
-    @Excel(name = "判废垛位", width = 15)
-    @ApiModelProperty(value = "判废垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddrWaste;
-    /**高线支数*/
-    @Excel(name = "高线支数", width = 15)
-    @ApiModelProperty(value = "高线支数")
-    private String amountHeight;
-    @Excel(name = "高线定尺", width = 15)
-    @ApiModelProperty(value = "高线定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeHeight;
-    /**高线起始根*/
-    @Excel(name = "高线起始根", width = 15)
-    @ApiModelProperty(value = "高线起始根")
-    private String startNumHeight;
-    /**高线终止根*/
-    @Excel(name = "高线终止根", width = 15)
-    @ApiModelProperty(value = "高线终止根")
-    private String endNumHeight;
-    /**高线车号*/
-    @Excel(name = "高线车号", width = 15)
-    @ApiModelProperty(value = "高线车号")
-    private String carNumHeight;
-    /**高线垛位*/
-    @Excel(name = "高线垛位", width = 15)
-    @ApiModelProperty(value = "高线垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddrHeight;
-    @Excel(name = "外运支数", width = 15)
-    @ApiModelProperty(value = "外运支数")
-    private String amountOut;
-    @Excel(name = "外运定尺", width = 15)
-    @ApiModelProperty(value = "外运定尺")
-    @Dict(dicCode = "lg_dcgg")
-    private String sizeOut;
-    /**高线起始根*/
-    @Excel(name = "外运起始根", width = 15)
-    @ApiModelProperty(value = "外运起始根")
-    private String startNumOut;
-    /**高线终止根*/
-    @Excel(name = "外运终止根", width = 15)
-    @ApiModelProperty(value = "高线终止根")
-    private String endNumOut;
-    /**高线车号*/
-    @Excel(name = "外运车号", width = 15)
-    @ApiModelProperty(value = "外运车号")
-    private String carNumOut;
-    /**高线垛位*/
-    @Excel(name = "外运垛位", width = 15)
-    @ApiModelProperty(value = "外运垛位")
-    @Dict(dicCode = "stack_code")
-    private String stackAddrOut;
-    /**高线车号*/
-    @Excel(name = "步骤", width = 15)
-    @ApiModelProperty(value = "步骤")
-    @Dict(dicCode = "lg_cybz")
-    private String bz;
+
+//    /**棒一支数*/
+//    @Excel(name = "棒一支数", width = 15)
+//    @ApiModelProperty(value = "棒一支数")
+//    private String amountOne;
+//    /**棒一定尺*/
+//    @Excel(name = "棒一定尺", width = 15)
+//    @ApiModelProperty(value = "棒一定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeOne;
+//    /**棒一起始根*/
+//    @Excel(name = "棒一起始根", width = 15)
+//    @ApiModelProperty(value = "棒一起始根")
+//    private String startNumOne;
+//    /**棒一终止根*/
+//    @Excel(name = "棒一终止根", width = 15)
+//    @ApiModelProperty(value = "棒一终止根")
+//    private String endNumOne;
+//    /**棒一车号*/
+//    @Excel(name = "棒一车号", width = 15)
+//    @ApiModelProperty(value = "棒一车号")
+//    private String carNumOne;
+//    /**棒一垛位*/
+//    @Excel(name = "棒一垛位", width = 15)
+//    @ApiModelProperty(value = "棒一垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddrOne;
+//    /**棒二支数*/
+//    @Excel(name = "棒二支数", width = 15)
+//    @ApiModelProperty(value = "棒二支数")
+//    private String amountTwo;
+//    /**棒二定尺*/
+//    @Excel(name = "棒二定尺", width = 15)
+//    @ApiModelProperty(value = "棒二定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeTwo;
+//    /**棒二起始根*/
+//    @Excel(name = "棒二起始根", width = 15)
+//    @ApiModelProperty(value = "棒二起始根")
+//    private String startNumTwo;
+//    /**棒二终止根*/
+//    @Excel(name = "棒二终止根", width = 15)
+//    @ApiModelProperty(value = "棒二终止根")
+//    private String endNumTwo;
+//    /**棒二车号*/
+//    @Excel(name = "棒二车号", width = 15)
+//    @ApiModelProperty(value = "棒二车号")
+//    private String carNumTwo;
+//    /**棒二垛位*/
+//    @Excel(name = "棒二垛位", width = 15)
+//    @ApiModelProperty(value = "棒二垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddrTwo;
+//    /**棒三支数*/
+//    @Excel(name = "棒三支数", width = 15)
+//    @ApiModelProperty(value = "棒三支数")
+//    private String amountThree;
+//    /**棒三定尺*/
+//    @Excel(name = "棒三定尺", width = 15)
+//    @ApiModelProperty(value = "棒三定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeThree;
+//    /**棒三起始根*/
+//    @Excel(name = "棒三起始根", width = 15)
+//    @ApiModelProperty(value = "棒三起始根")
+//    private String startNumThree;
+//    /**棒三终止根*/
+//    @Excel(name = "棒三终止根", width = 15)
+//    @ApiModelProperty(value = "棒三终止根")
+//    private String endNumThree;
+//    /**棒三车号*/
+//    @Excel(name = "棒三车号", width = 15)
+//    @ApiModelProperty(value = "棒三车号")
+//    private String carNumThree;
+//    /**棒三垛位*/
+//    @Excel(name = "棒三垛位", width = 15)
+//    @ApiModelProperty(value = "棒三垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddrThree;
+//    /**堆垛支数*/
+//    @Excel(name = "堆垛支数", width = 15)
+//    @ApiModelProperty(value = "堆垛支数")
+//    private String amountStack;
+//    /**棒三定尺*/
+//    @Excel(name = "堆垛定尺", width = 15)
+//    @ApiModelProperty(value = "堆垛定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeStack;
+//    /**堆垛起始根*/
+//    @Excel(name = "堆垛起始根", width = 15)
+//    @ApiModelProperty(value = "堆垛起始根")
+//    private String startNumStack;
+//    /**堆垛终止根*/
+//    @Excel(name = "堆垛终止根", width = 15)
+//    @ApiModelProperty(value = "堆垛终止根")
+//    private String endNumStack;
+//    /**堆垛车号*/
+//    @Excel(name = "堆垛车号", width = 15)
+//    @ApiModelProperty(value = "堆垛车号")
+//    private String carNumStack;
+//    /**垛位*/
+//    @Excel(name = "堆垛垛位", width = 15)
+//    @ApiModelProperty(value = "堆垛垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddr;
+//    /**判废支数*/
+//    @Excel(name = "判废支数", width = 15)
+//    @ApiModelProperty(value = "判废支数")
+//    private String amountWaste;
+//    @Excel(name = "判废定尺", width = 15)
+//    @ApiModelProperty(value = "判废定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeWaste;
+//    /**判废起始根*/
+//    @Excel(name = "判废起始根", width = 15)
+//    @ApiModelProperty(value = "判废起始根")
+//    private String startNumWaste;
+//    /**判废终止根*/
+//    @Excel(name = "判废终止根", width = 15)
+//    @ApiModelProperty(value = "判废终止根")
+//    private String endNumWaste;
+//    /**判废车号*/
+//    @Excel(name = "判废车号", width = 15)
+//    @ApiModelProperty(value = "判废车号")
+//    private String carNumWaste;
+//    /**判废垛位*/
+//    @Excel(name = "判废垛位", width = 15)
+//    @ApiModelProperty(value = "判废垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddrWaste;
+//    /**高线支数*/
+//    @Excel(name = "高线支数", width = 15)
+//    @ApiModelProperty(value = "高线支数")
+//    private String amountHeight;
+//    @Excel(name = "高线定尺", width = 15)
+//    @ApiModelProperty(value = "高线定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeHeight;
+//    /**高线起始根*/
+//    @Excel(name = "高线起始根", width = 15)
+//    @ApiModelProperty(value = "高线起始根")
+//    private String startNumHeight;
+//    /**高线终止根*/
+//    @Excel(name = "高线终止根", width = 15)
+//    @ApiModelProperty(value = "高线终止根")
+//    private String endNumHeight;
+//    /**高线车号*/
+//    @Excel(name = "高线车号", width = 15)
+//    @ApiModelProperty(value = "高线车号")
+//    private String carNumHeight;
+//    /**高线垛位*/
+//    @Excel(name = "高线垛位", width = 15)
+//    @ApiModelProperty(value = "高线垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddrHeight;
+//    @Excel(name = "外运支数", width = 15)
+//    @ApiModelProperty(value = "外运支数")
+//    private String amountOut;
+//    @Excel(name = "外运定尺", width = 15)
+//    @ApiModelProperty(value = "外运定尺")
+//    @Dict(dicCode = "lg_dcgg")
+//    private String sizeOut;
+//    /**高线起始根*/
+//    @Excel(name = "外运起始根", width = 15)
+//    @ApiModelProperty(value = "外运起始根")
+//    private String startNumOut;
+//    /**高线终止根*/
+//    @Excel(name = "外运终止根", width = 15)
+//    @ApiModelProperty(value = "高线终止根")
+//    private String endNumOut;
+//    /**高线车号*/
+//    @Excel(name = "外运车号", width = 15)
+//    @ApiModelProperty(value = "外运车号")
+//    private String carNumOut;
+//    /**高线垛位*/
+//    @Excel(name = "外运垛位", width = 15)
+//    @ApiModelProperty(value = "外运垛位")
+//    @Dict(dicCode = "stack_code")
+//    private String stackAddrOut;
+//    /**高线车号*/
+//    @Excel(name = "步骤", width = 15)
+//    @ApiModelProperty(value = "步骤")
+//    @Dict(dicCode = "lg_cybz")
+//    private String bz;
+//    /**规格*/
+//    @Excel(name = "规格", width = 15)
+//    @ApiModelProperty(value = "规格")
+//    @Dict(dicCode = "billet_spec")
+//    private String spec;
 }
 

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

@@ -2,7 +2,6 @@ package org.jeecg.modules.billet.billetHotsend.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.netty.util.internal.StringUtil;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
 import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.mapper.BilletHotsendBaseMapper;
@@ -16,7 +15,6 @@ import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.entity.StorageBillModel;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillModelService;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
-import org.jeecg.modules.billet.storageCarLog.entity.StorageCarLog;
 import org.jeecg.modules.billet.storageCarLog.service.IStorageCarLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,117 +53,119 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		if(billetHotsend.getAmountTotal()==null||billetHotsend.getAmountTotal()==0){
 			isFirst = true;
 		}
-		billetHotsend.setAmountTotal(
-				(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())?0:Integer.valueOf(billetHotsend.getAmountOne()))
-						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountTwo())?0:Integer.valueOf(billetHotsend.getAmountTwo()))
-						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountThree())?0:Integer.valueOf(billetHotsend.getAmountThree()))
-						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountOut())?0:Integer.valueOf(billetHotsend.getAmountOut()))
-						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())?0:Integer.valueOf(billetHotsend.getAmountHeight()))
-						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountWaste())?0:Integer.valueOf(billetHotsend.getAmountWaste()))
-						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountStack())?0:Integer.valueOf(billetHotsend.getAmountStack()))
-		);
+//		billetHotsend.setAmountTotal(
+//				(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())?0:Integer.valueOf(billetHotsend.getAmountOne()))
+//						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountTwo())?0:Integer.valueOf(billetHotsend.getAmountTwo()))
+//						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountThree())?0:Integer.valueOf(billetHotsend.getAmountThree()))
+//						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountOut())?0:Integer.valueOf(billetHotsend.getAmountOut()))
+//						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())?0:Integer.valueOf(billetHotsend.getAmountHeight()))
+//						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountWaste())?0:Integer.valueOf(billetHotsend.getAmountWaste()))
+//						+(StringUtil.isNullOrEmpty(billetHotsend.getAmountStack())?0:Integer.valueOf(billetHotsend.getAmountStack()))
+//		);
+		billetHotsend.setAmountTotal(6666);// 总支数
 		billetHotsendBaseMapper.updateById(billetHotsend);
 		if(isFirst)last.setShiftProduct(last.getShiftProduct()+billetHotsend.getAmountTotal());
 		rulerDefaultConfigService.updateById(last);
-		if (billetHotsend.getIsUpd()!=null&&billetHotsend.getIsUpd()==true){
-			for (int i = 0; i <= 6; i++) {
-				StorageCarLog storageCarLog = new StorageCarLog();
-				storageCarLog.setCastas(billetHotsend.getCastMachine());
-				storageCarLog.setDataTime(new Date());
-				storageCarLog.setFurnceNum(billetHotsend.getFurnaceNum());
-				storageCarLog.setShift(billetHotsend.getShift());
-				storageCarLog.setShiftGroup(billetHotsend.getShiftGroup());
-				storageCarLog.setSpec(billetHotsend.getSpec());
-				storageCarLog.setSteel(billetHotsend.getSteel());
-				switch (i){
-					case 0:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumOne())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeOne()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountOne());
-						storageCarLog.setCarNm(billetHotsend.getCarNumOne());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeOne());
-						Long count = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumOne()))+1;
-						storageCarLog.setOutCarNum(count.toString());
-						break;
-					case 1:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountTwo())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumTwo())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeTwo()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountTwo());
-						storageCarLog.setCarNm(billetHotsend.getCarNumTwo());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeTwo());
-						Long count1 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumTwo()))+1;
-						storageCarLog.setOutCarNum(count1.toString());
-						break;
-					case 2:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountThree())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumThree())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeThree()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountThree());
-						storageCarLog.setCarNm(billetHotsend.getCarNumThree());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeThree());
-						Long count2 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumThree()))+1;
-						storageCarLog.setOutCarNum(count2.toString());
-						break;
-					case 3:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumHeight())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeHeight()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountHeight());
-						storageCarLog.setCarNm(billetHotsend.getCarNumHeight());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeHeight());
-						Long count3 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumHeight()))+1;
-						storageCarLog.setOutCarNum(count3.toString());
-						break;
-					case 4:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountOut())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumOut())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeOut()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountOut());
-						storageCarLog.setCarNm(billetHotsend.getCarNumOut());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeOut());
-						Long count4 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumOut()))+1;
-						storageCarLog.setOutCarNum(count4.toString());
-						break;
-					case 5:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountWaste())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumWaste())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeWaste()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountWaste());
-						storageCarLog.setCarNm(billetHotsend.getCarNumWaste());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeWaste());
-						Long count5 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumWaste()))+1;
-						storageCarLog.setOutCarNum(count5.toString());
-						break;
-					case 6:
-						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountStack())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumStack())
-								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeStack()))break;
-						storageCarLog.setAmount(billetHotsend.getAmountStack());
-						storageCarLog.setCarNm(billetHotsend.getCarNumStack());
-						storageCarLog.setDestination(i+"");
-						storageCarLog.setSize(billetHotsend.getSizeStack());
-						Long count6 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumStack()))+1;
-						storageCarLog.setOutCarNum(count6.toString());
-						break;
-				}
-				storageCarLogService.save(storageCarLog);
-			}
-		}
+//		if (billetHotsend.getIsUpd()!=null&&billetHotsend.getIsUpd()==true){
+//			for (int i = 0; i <= 6; i++) {
+//				StorageCarLog storageCarLog = new StorageCarLog();
+//				storageCarLog.setCastas(billetHotsend.getCastMachine());
+//				storageCarLog.setDataTime(new Date());
+//				storageCarLog.setFurnceNum(billetHotsend.getFurnaceNum());
+//				storageCarLog.setShift(billetHotsend.getShift());
+//				storageCarLog.setShiftGroup(billetHotsend.getShiftGroup());
+//				storageCarLog.setSpec(billetHotsend.getSpec());
+//				storageCarLog.setSteel(billetHotsend.getSteel());
+//				switch (i){
+//					case 0:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumOne())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeOne()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountOne());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumOne());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeOne());
+//						Long count = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumOne()))+1;
+//						storageCarLog.setOutCarNum(count.toString());
+//						break;
+//					case 1:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountTwo())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumTwo())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeTwo()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountTwo());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumTwo());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeTwo());
+//						Long count1 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumTwo()))+1;
+//						storageCarLog.setOutCarNum(count1.toString());
+//						break;
+//					case 2:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountThree())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumThree())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeThree()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountThree());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumThree());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeThree());
+//						Long count2 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumThree()))+1;
+//						storageCarLog.setOutCarNum(count2.toString());
+//						break;
+//					case 3:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumHeight())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeHeight()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountHeight());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumHeight());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeHeight());
+//						Long count3 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumHeight()))+1;
+//						storageCarLog.setOutCarNum(count3.toString());
+//						break;
+//					case 4:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountOut())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumOut())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeOut()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountOut());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumOut());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeOut());
+//						Long count4 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumOut()))+1;
+//						storageCarLog.setOutCarNum(count4.toString());
+//						break;
+//					case 5:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountWaste())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumWaste())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeWaste()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountWaste());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumWaste());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeWaste());
+//						Long count5 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumWaste()))+1;
+//						storageCarLog.setOutCarNum(count5.toString());
+//						break;
+//					case 6:
+//						if(StringUtil.isNullOrEmpty(billetHotsend.getAmountStack())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getCarNumStack())
+//								&&StringUtil.isNullOrEmpty(billetHotsend.getSizeStack()))break;
+//						storageCarLog.setAmount(billetHotsend.getAmountStack());
+//						storageCarLog.setCarNm(billetHotsend.getCarNumStack());
+//						storageCarLog.setDestination(i+"");
+//						storageCarLog.setSize(billetHotsend.getSizeStack());
+//						Long count6 = storageCarLogService.count(new LambdaQueryWrapper<StorageCarLog>().eq(StorageCarLog::getCarNm, billetHotsend.getCarNumStack()))+1;
+//						storageCarLog.setOutCarNum(count6.toString());
+//						break;
+//				}
+//				storageCarLogService.save(storageCarLog);
+//			}
+//		}
 	}
 
 	@Override
 	public void addOne(BilletHotsend billetHotsend) {
 		RulerDefaultConfig last = rulerDefaultConfigService.getLast(billetHotsend.getCastMachine());
 		StorageBillModel storageBillModel = storageBillModelService.getOne(new LambdaQueryWrapper<StorageBillModel>().eq(StorageBillModel::getCastMachine,billetHotsend.getCastMachine()));
-		billetHotsend.setAmountTotal(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())?(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())?0:Integer.valueOf(billetHotsend.getAmountHeight())):Integer.valueOf(billetHotsend.getAmountOne()));
+//		billetHotsend.setAmountTotal(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())?(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())?0:Integer.valueOf(billetHotsend.getAmountHeight())):Integer.valueOf(billetHotsend.getAmountOne()));
+		billetHotsend.setAmountTotal(111); // 总支数
 		StorageBill storageBill = new StorageBill();
 		storageBill.setAmountTotal(billetHotsend.getAmountTotal());
 		storageBill.setCastMachine(billetHotsend.getCastMachine());
@@ -173,11 +173,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		storageBill.setCarNum("辊道");
 		storageBill.setLibrary("4");
 		storageBill.setBtype("0");
-		storageBill.setSize(billetHotsend.getSizeOne());
-		storageBill.setSpec(billetHotsend.getSpec());
+//		storageBill.setSize(billetHotsend.getSizeOne());// 定尺
+//		storageBill.setSpec(billetHotsend.getSpec());
 		if(last!=null){
 			billetHotsend.setFurnaceNum(last.getPourHeats());
-			billetHotsend.setBz("4");
+//			billetHotsend.setBz("4");
 			billetHotsend.setShift(last.getShift());
 			billetHotsend.setShiftGroup(last.getShiftGroup());
 			storageBill.setShift(last.getShift());
@@ -194,9 +194,9 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		rollClubOne.setCastMachine(billetHotsend.getCastMachine());
 		rollClubOne.setShift(last.getShift());
 		rollClubOne.setShiftGroup(last.getShiftGroup());
-		rollClubOne.setSize(billetHotsend.getSizeOne());
+//		rollClubOne.setSize(billetHotsend.getSizeOne());
 		rollClubOne.setSteel(billetHotsend.getSteel());
-		rollClubOne.setSpec(billetHotsend.getSpec());
+//		rollClubOne.setSpec(billetHotsend.getSpec());
 		rollClubOne.setAmountTotal(billetHotsend.getAmountTotal());
 		rollClubOne.setCreateDate(new Date());
 		rollClubOneService.save(rollClubOne);
@@ -206,7 +206,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	public void addHeight(BilletHotsend billetHotsend) {
 		RulerDefaultConfig last = rulerDefaultConfigService.getLast(billetHotsend.getCastMachine());
 		StorageBillModel storageBillModel = storageBillModelService.getOne(new LambdaQueryWrapper<StorageBillModel>().eq(StorageBillModel::getCastMachine,billetHotsend.getCastMachine()));
-		billetHotsend.setAmountTotal(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())?(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())?0:Integer.valueOf(billetHotsend.getAmountHeight())):Integer.valueOf(billetHotsend.getAmountOne()));
+//		billetHotsend.setAmountTotal(StringUtil.isNullOrEmpty(billetHotsend.getAmountOne())?(StringUtil.isNullOrEmpty(billetHotsend.getAmountHeight())?0:Integer.valueOf(billetHotsend.getAmountHeight())):Integer.valueOf(billetHotsend.getAmountOne()));
+		billetHotsend.setAmountTotal(8888);
 		StorageBill storageBill = new StorageBill();
 		storageBill.setAmountTotal(billetHotsend.getAmountTotal());
 		storageBill.setCastMachine(billetHotsend.getCastMachine());
@@ -214,11 +215,12 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		storageBill.setCarNum("辊道");
 		storageBill.setLibrary("2");
 		storageBill.setBtype("0");
-		storageBill.setSize(billetHotsend.getSizeHeight());
-		storageBill.setSpec(billetHotsend.getSpec());
+//		storageBill.setSize(billetHotsend.getSizeHeight());
+		storageBill.setSize("");
+//		storageBill.setSpec(billetHotsend.getSpec());
 		if(last!=null){
 			billetHotsend.setFurnaceNum(last.getPourHeats());
-			billetHotsend.setBz("5");
+//			billetHotsend.setBz("5");
 			billetHotsend.setShift(last.getShift());
 			billetHotsend.setShiftGroup(last.getShiftGroup());
 			storageBill.setShift(last.getShift());
@@ -235,9 +237,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		rollHeight.setCastMachine(billetHotsend.getCastMachine());
 		rollHeight.setShift(last.getShift());
 		rollHeight.setShiftGroup(last.getShiftGroup());
-		rollHeight.setSize(billetHotsend.getSizeHeight());
+//		rollHeight.setSize(billetHotsend.getSizeHeight());
+		storageBill.setSize("");
 		rollHeight.setSteel(billetHotsend.getSteel());
-		rollHeight.setSpec(billetHotsend.getSpec());
+//		rollHeight.setSpec(billetHotsend.getSpec());
 		rollHeight.setAmountTotal(billetHotsend.getAmountTotal());
 		rollHeight.setCreateDate(new Date());
 		rollHeightService.save(rollHeight);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendAbandons/controller/BilletHotsendAbandonsController.java

@@ -0,0 +1,162 @@
+package org.jeecg.modules.billet.billetHotsendAbandons.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.billet.billetHotsendAbandons.entity.BilletHotsendAbandons;
+import org.jeecg.modules.billet.billetHotsendAbandons.service.IBilletHotsendAbandonsService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+ /**
+ * @Description: 钢坯热送单炉支数传递单判废记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+@Api(tags="钢坯热送单炉支数传递单判废记录")
+@RestController
+@RequestMapping("/billetHotsend/billetHotsendAbandons")
+@Slf4j
+public class BilletHotsendAbandonsController extends JeecgController<BilletHotsendAbandons, IBilletHotsendAbandonsService> {
+	@Autowired
+	private IBilletHotsendAbandonsService billetHotsendAbandonsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param billetHotsendAbandons
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯热送单炉支数传递单判废记录-分页列表查询")
+	@ApiOperation(value="钢坯热送单炉支数传递单判废记录-分页列表查询", notes="钢坯热送单炉支数传递单判废记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BilletHotsendAbandons>> queryPageList(BilletHotsendAbandons billetHotsendAbandons,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BilletHotsendAbandons> queryWrapper = QueryGenerator.initQueryWrapper(billetHotsendAbandons, req.getParameterMap());
+		Page<BilletHotsendAbandons> page = new Page<BilletHotsendAbandons>(pageNo, pageSize);
+		IPage<BilletHotsendAbandons> pageList = billetHotsendAbandonsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param billetHotsendAbandons
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单判废记录-添加")
+	@ApiOperation(value="钢坯热送单炉支数传递单判废记录-添加", notes="钢坯热送单炉支数传递单判废记录-添加")
+	@RequiresPermissions("billetHotsendAbandons:billet_hotsend_abandons:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BilletHotsendAbandons billetHotsendAbandons) {
+		billetHotsendAbandonsService.save(billetHotsendAbandons);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param billetHotsendAbandons
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单判废记录-编辑")
+	@ApiOperation(value="钢坯热送单炉支数传递单判废记录-编辑", notes="钢坯热送单炉支数传递单判废记录-编辑")
+	@RequiresPermissions("billetHotsendAbandons:billet_hotsend_abandons:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BilletHotsendAbandons billetHotsendAbandons) {
+		billetHotsendAbandonsService.updateById(billetHotsendAbandons);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单判废记录-通过id删除")
+	@ApiOperation(value="钢坯热送单炉支数传递单判废记录-通过id删除", notes="钢坯热送单炉支数传递单判废记录-通过id删除")
+	@RequiresPermissions("billetHotsendAbandons:billet_hotsend_abandons:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		billetHotsendAbandonsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单判废记录-批量删除")
+	@ApiOperation(value="钢坯热送单炉支数传递单判废记录-批量删除", notes="钢坯热送单炉支数传递单判废记录-批量删除")
+	@RequiresPermissions("billetHotsendAbandons:billet_hotsend_abandons:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.billetHotsendAbandonsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯热送单炉支数传递单判废记录-通过id查询")
+	@ApiOperation(value="钢坯热送单炉支数传递单判废记录-通过id查询", notes="钢坯热送单炉支数传递单判废记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BilletHotsendAbandons> queryById(@RequestParam(name="id",required=true) String id) {
+		BilletHotsendAbandons billetHotsendAbandons = billetHotsendAbandonsService.getById(id);
+		if(billetHotsendAbandons==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(billetHotsendAbandons);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param billetHotsendAbandons
+    */
+    @RequiresPermissions("billetHotsendAbandons:billet_hotsend_abandons:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BilletHotsendAbandons billetHotsendAbandons) {
+        return super.exportXls(request, billetHotsendAbandons, BilletHotsendAbandons.class, "钢坯热送单炉支数传递单判废记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("billetHotsendAbandons:billet_hotsend_abandons:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BilletHotsendAbandons.class);
+    }
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendAbandons/entity/BilletHotsendAbandons.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.billet.billetHotsendAbandons.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单判废记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("billet_hotsend_abandons")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="billet_hotsend_abandons对象", description="钢坯热送单炉支数传递单判废记录")
+public class BilletHotsendAbandons implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**炉号*/
+	@Excel(name = "炉号", width = 15)
+    @ApiModelProperty(value = "炉号")
+    private String heatNo;
+	/**铸机号*/
+	@Excel(name = "铸机号", width = 15)
+    @ApiModelProperty(value = "铸机号")
+    private String ccmNo;
+	/**坯号*/
+	@Excel(name = "坯号", width = 15)
+    @ApiModelProperty(value = "坯号")
+    private String billetNo;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendAbandons/mapper/BilletHotsendAbandonsMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.billet.billetHotsendAbandons.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.billet.billetHotsendAbandons.entity.BilletHotsendAbandons;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单判废记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+public interface BilletHotsendAbandonsMapper extends BaseMapper<BilletHotsendAbandons> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendAbandons/mapper/xml/BilletHotsendAbandonsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.billet.billetHotsendAbandons.mapper.BilletHotsendAbandonsMapper">
+
+</mapper>

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendAbandons/service/IBilletHotsendAbandonsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.billet.billetHotsendAbandons.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.billet.billetHotsendAbandons.entity.BilletHotsendAbandons;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单判废记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+public interface IBilletHotsendAbandonsService extends IService<BilletHotsendAbandons> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendAbandons/service/impl/BilletHotsendAbandonsServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.billet.billetHotsendAbandons.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.billet.billetHotsendAbandons.entity.BilletHotsendAbandons;
+import org.jeecg.modules.billet.billetHotsendAbandons.mapper.BilletHotsendAbandonsMapper;
+import org.jeecg.modules.billet.billetHotsendAbandons.service.IBilletHotsendAbandonsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单判废记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+@Service
+public class BilletHotsendAbandonsServiceImpl extends ServiceImpl<BilletHotsendAbandonsMapper, BilletHotsendAbandons> implements IBilletHotsendAbandonsService {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendDetails/controller/BilletHotsendDetailsController.java

@@ -0,0 +1,162 @@
+package org.jeecg.modules.billet.billetHotsendDetails.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.billet.billetHotsendDetails.entity.BilletHotsendDetails;
+import org.jeecg.modules.billet.billetHotsendDetails.service.IBilletHotsendDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+ /**
+ * @Description: 钢坯热送单炉支数传递单明细
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+@Api(tags="钢坯热送单炉支数传递单明细")
+@RestController
+@RequestMapping("/billetHotsend/billetHotsendDetails")
+@Slf4j
+public class BilletHotsendDetailsController extends JeecgController<BilletHotsendDetails, IBilletHotsendDetailsService> {
+	@Autowired
+	private IBilletHotsendDetailsService billetHotsendDetailsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param billetHotsendDetails
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯热送单炉支数传递单明细-分页列表查询")
+	@ApiOperation(value="钢坯热送单炉支数传递单明细-分页列表查询", notes="钢坯热送单炉支数传递单明细-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BilletHotsendDetails>> queryPageList(BilletHotsendDetails billetHotsendDetails,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BilletHotsendDetails> queryWrapper = QueryGenerator.initQueryWrapper(billetHotsendDetails, req.getParameterMap());
+		Page<BilletHotsendDetails> page = new Page<BilletHotsendDetails>(pageNo, pageSize);
+		IPage<BilletHotsendDetails> pageList = billetHotsendDetailsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param billetHotsendDetails
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单明细-添加")
+	@ApiOperation(value="钢坯热送单炉支数传递单明细-添加", notes="钢坯热送单炉支数传递单明细-添加")
+	@RequiresPermissions("billetHotsendDetails:billet_hotsend_details:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BilletHotsendDetails billetHotsendDetails) {
+		billetHotsendDetailsService.save(billetHotsendDetails);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param billetHotsendDetails
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单明细-编辑")
+	@ApiOperation(value="钢坯热送单炉支数传递单明细-编辑", notes="钢坯热送单炉支数传递单明细-编辑")
+	@RequiresPermissions("billetHotsendDetails:billet_hotsend_details:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BilletHotsendDetails billetHotsendDetails) {
+		billetHotsendDetailsService.updateById(billetHotsendDetails);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单明细-通过id删除")
+	@ApiOperation(value="钢坯热送单炉支数传递单明细-通过id删除", notes="钢坯热送单炉支数传递单明细-通过id删除")
+	@RequiresPermissions("billetHotsendDetails:billet_hotsend_details:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		billetHotsendDetailsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "钢坯热送单炉支数传递单明细-批量删除")
+	@ApiOperation(value="钢坯热送单炉支数传递单明细-批量删除", notes="钢坯热送单炉支数传递单明细-批量删除")
+	@RequiresPermissions("billetHotsendDetails:billet_hotsend_details:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.billetHotsendDetailsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯热送单炉支数传递单明细-通过id查询")
+	@ApiOperation(value="钢坯热送单炉支数传递单明细-通过id查询", notes="钢坯热送单炉支数传递单明细-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BilletHotsendDetails> queryById(@RequestParam(name="id",required=true) String id) {
+		BilletHotsendDetails billetHotsendDetails = billetHotsendDetailsService.getById(id);
+		if(billetHotsendDetails==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(billetHotsendDetails);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param billetHotsendDetails
+    */
+    @RequiresPermissions("billetHotsendDetails:billet_hotsend_details:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BilletHotsendDetails billetHotsendDetails) {
+        return super.exportXls(request, billetHotsendDetails, BilletHotsendDetails.class, "钢坯热送单炉支数传递单明细");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("billetHotsendDetails:billet_hotsend_details:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BilletHotsendDetails.class);
+    }
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendDetails/entity/BilletHotsendDetails.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.billet.billetHotsendDetails.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单明细
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("billet_hotsend_details")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="billet_hotsend_details对象", description="钢坯热送单炉支数传递单明细")
+public class BilletHotsendDetails implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**炉号*/
+	@Excel(name = "炉号", width = 15)
+    @ApiModelProperty(value = "炉号")
+    private String heatNo;
+	/**铸机号*/
+	@Excel(name = "铸机号", width = 15)
+    @ApiModelProperty(value = "铸机号")
+    private Integer ccmNo;
+	/**坯号*/
+	@Excel(name = "坯号", width = 15)
+    @ApiModelProperty(value = "坯号")
+    private String billetNo;
+	/**类型ID（billet_hotsend_type_config）*/
+	@Excel(name = "类型ID（billet_hotsend_type_config）", width = 15)
+    @ApiModelProperty(value = "类型ID（billet_hotsend_type_config）")
+    private String bhtcId;
+	/**车牌号*/
+	@Excel(name = "车牌号", width = 15)
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+	/**归属类型(0:棒线，1：堆垛类型)*/
+	@Excel(name = "归属类型(0:棒线，1：堆垛类型)", width = 15)
+    @ApiModelProperty(value = "归属类型(0:棒线，1：堆垛类型)")
+    private Integer bhtcType;
+	/**起始根数*/
+	@Excel(name = "起始根数", width = 15)
+    @ApiModelProperty(value = "起始根数")
+    private Integer startNum;
+	/**结束根数*/
+	@Excel(name = "结束根数", width = 15)
+    @ApiModelProperty(value = "结束根数")
+    private Integer endNum;
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendDetails/mapper/BilletHotsendDetailsMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.billet.billetHotsendDetails.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.billet.billetHotsendDetails.entity.BilletHotsendDetails;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单明细
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+public interface BilletHotsendDetailsMapper extends BaseMapper<BilletHotsendDetails> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendDetails/mapper/xml/BilletHotsendDetailsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.billet.billetHotsendDetails.mapper.BilletHotsendDetailsMapper">
+
+</mapper>

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendDetails/service/IBilletHotsendDetailsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.billet.billetHotsendDetails.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.billet.billetHotsendDetails.entity.BilletHotsendDetails;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单明细
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+public interface IBilletHotsendDetailsService extends IService<BilletHotsendDetails> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendDetails/service/impl/BilletHotsendDetailsServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.billet.billetHotsendDetails.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.billet.billetHotsendDetails.entity.BilletHotsendDetails;
+import org.jeecg.modules.billet.billetHotsendDetails.mapper.BilletHotsendDetailsMapper;
+import org.jeecg.modules.billet.billetHotsendDetails.service.IBilletHotsendDetailsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 钢坯热送单炉支数传递单明细
+ * @Author: jeecg-boot
+ * @Date:   2024-11-19
+ * @Version: V1.0
+ */
+@Service
+public class BilletHotsendDetailsServiceImpl extends ServiceImpl<BilletHotsendDetailsMapper, BilletHotsendDetails> implements IBilletHotsendDetailsService {
+
+}

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

@@ -327,44 +327,43 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 String[] msgs = entry.getKey().split("-");
                 billetHotsend.setFurnaceNum(oConvertUtils.isEmpty(msgs[0])?"":msgs[0]);
                 billetHotsend.setSteel(oConvertUtils.isEmpty(msgs[1])?"":msgs[1]);
-                billetHotsend.setSpec(oConvertUtils.isEmpty(msgs[2])?"":msgs[2]);
                 switch (destination){
                     case "0":
-                        billetHotsend.setAmountOne(billetHotsend.getAmountTotal().toString());
-                        billetHotsend.setCarNumOne(carNum);
-                        billetHotsend.setSizeOne(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-                        billetHotsend.setStackAddrOne(stackAddr);
+//                        billetHotsend.setAmountOne(billetHotsend.getAmountTotal().toString());
+//                        billetHotsend.setCarNumOne(carNum);
+//                        billetHotsend.setSizeOne(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
+//                        billetHotsend.setStackAddrOne(stackAddr);
                         break;
                     case "1":
-                        billetHotsend.setAmountTwo(billetHotsend.getAmountTotal().toString());
-                        billetHotsend.setCarNumTwo(carNum);
-                        billetHotsend.setSizeTwo(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-                        billetHotsend.setStackAddrTwo(stackAddr);
+//                        billetHotsend.setAmountTwo(billetHotsend.getAmountTotal().toString());
+//                        billetHotsend.setCarNumTwo(carNum);
+//                        billetHotsend.setSizeTwo(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
+//                        billetHotsend.setStackAddrTwo(stackAddr);
                         break;
                     case "2":
-                        billetHotsend.setAmountThree(billetHotsend.getAmountTotal().toString());
-                        billetHotsend.setCarNumThree(carNum);
-                        billetHotsend.setSizeThree(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-                        billetHotsend.setStackAddrThree(stackAddr);
+//                        billetHotsend.setAmountThree(billetHotsend.getAmountTotal().toString());
+//                        billetHotsend.setCarNumThree(carNum);
+//                        billetHotsend.setSizeThree(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
+//                        billetHotsend.setStackAddrThree(stackAddr);
                         break;
                     case "3":
-                        billetHotsend.setAmountHeight(billetHotsend.getAmountTotal().toString());
-                        billetHotsend.setStackAddrHeight(stackAddr);
-                        billetHotsend.setSizeHeight(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
+//                        billetHotsend.setAmountHeight(billetHotsend.getAmountTotal().toString());
+//                        billetHotsend.setStackAddrHeight(stackAddr);
+//                        billetHotsend.setSizeHeight(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
                         break;
                     case "4":
-                        billetHotsend.setAmountOut(billetHotsend.getAmountTotal().toString());
-                        billetHotsend.setCarNumOut(carNum);
-                        billetHotsend.setStackAddrOut(stackAddr);
-                        billetHotsend.setSizeOut(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
+//                        billetHotsend.setAmountOut(billetHotsend.getAmountTotal().toString());
+//                        billetHotsend.setCarNumOut(carNum);
+//                        billetHotsend.setStackAddrOut(stackAddr);
+//                        billetHotsend.setSizeOut(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
                         break;
                     case "5":
-                        billetHotsend.setAmountStack(billetHotsend.getAmountTotal().toString());
-                        billetHotsend.setStackAddr(stackAddr);
-                        billetHotsend.setSizeStack(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
+//                        billetHotsend.setAmountStack(billetHotsend.getAmountTotal().toString());
+//                        billetHotsend.setStackAddr(stackAddr);
+//                        billetHotsend.setSizeStack(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
                         break;
                 }
-                billetHotsend.setBz(type);
+//                billetHotsend.setBz(type);
                 billetHotsendBaseService.save(billetHotsend);
                 if(type.equals("1")){
                     for (StackingAndLoadingVehicles stackingAndLoadingVehicles : entry.getValue()) {