移除无用代码

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

@@ -152,8 +152,8 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
     @ApiOperation(value="钢坯热送附加信息-编辑", notes="钢坯热送附加信息-编辑")
     @PutMapping(value = "/editDesc")
     public Result<?> editDesc(@RequestBody BilletHotsend billetHotsend) {
+        billetHotsendBaseService.updateById(billetHotsend);
         operateLogService.add(billetHotsendBaseService.getById(billetHotsend.getId()),billetHotsend,BilletHotsend.class);
-        billetHotsendBaseService.updateDesc(billetHotsend);
         return Result.OK("编辑成功!");
     }
 
@@ -215,22 +215,6 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
         return Result.OK(billetHotsendList);
     }
 
-    @AutoLog(value = "棒一新增")
-    @ApiOperation(value="棒一新增", notes="棒一新增")
-    @PostMapping(value = "/addOne")
-    public Result<?> addOne(@RequestBody BilletHotsend billetHotsend) {
-        billetHotsendBaseService.addOne(billetHotsend);
-        return Result.OK("新增成功！");
-    }
-
-    @AutoLog(value = "高线新增")
-    @ApiOperation(value="高线新增", notes="高线新增")
-    @PostMapping(value = "/addHeight")
-    public Result<?> addHeight(@RequestBody BilletHotsend billetHotsend) {
-        billetHotsendBaseService.addHeight(billetHotsend);
-        return Result.OK("新增成功！");
-    }
-
    /**
    * 导出excel
    *
@@ -271,8 +255,9 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
 
     /**
      * 通过铸机、炉号查询结束位
-     *
-     * @param id
+     * @param ccmNo
+     * @param heatNo
+     * @param belongTable
      * @return
      */
     @ApiOperation(value="钢坯热送单炉支数结束根数-通过铸机号和炉号查询", notes="钢坯热送单炉支数结束根数-通过铸机号和炉号查询")

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

@@ -14,13 +14,6 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IBilletHotsendBaseService extends IService<BilletHotsend> {
-
-	void updateDesc(BilletHotsend billetHotsendVo);
-
-    void addOne(BilletHotsend billetHotsend);
-
-    void addHeight(BilletHotsend billetHotsend);
-
     List<BilletHotsend> queryByCastMachineAndFurnaceNum(String castMachine, String furnaceNum);
 
     JSONObject saveBilletHotsendDetails(BilletHotsendDetailsVo billetHotsendDetailsVo);

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

@@ -13,10 +13,8 @@ import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBillet
 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;
-import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
 import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
 import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
 import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
@@ -45,8 +43,6 @@ import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippService;
 import org.jeecg.modules.billet.storageBill.entity.ShiftEnum;
 import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
 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;
@@ -76,12 +72,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	@Autowired
 	private IStorageCarLogService storageCarLogService;
 	@Autowired
-	private IRulerDefaultConfigService rulerDefaultConfigService;
-	@Autowired
 	private IStorageBillService storageBillService;
 	@Autowired
-	private IStorageBillModelService storageBillModelService;
-	@Autowired
 	private IRollClubOneService rollClubOneService;
 	@Autowired
 	private IRollClubOneDetailsService rollClubOneDetailsService;
@@ -803,204 +795,4 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	public List<BilletHotsend> queryByCastMachineAndFurnaceNum(String castMachine, String furnaceNum) {
 		return billetHotsendBaseMapper.selectList(new LambdaQueryWrapper<BilletHotsend>().eq(BilletHotsend::getCcmNo, castMachine).eq(BilletHotsend::getHeatNo, furnaceNum));
 	}
-
-	@Override
-	public void updateDesc(BilletHotsend billetHotsend) {
-		RulerDefaultConfig last = rulerDefaultConfigService.getLast(billetHotsend.getCcmNo());
-		boolean isFirst = false;
-		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(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);
-//			}
-//		}
-	}
-
-	@Override
-	public void addOne(BilletHotsend billetHotsend) {
-		RulerDefaultConfig last = rulerDefaultConfigService.getLast(billetHotsend.getCcmNo());
-		StorageBillModel storageBillModel = storageBillModelService.getOne(new LambdaQueryWrapper<StorageBillModel>().eq(StorageBillModel::getCastMachine,billetHotsend.getCcmNo()));
-//		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.setCcmNo(billetHotsend.getCcmNo());
-//		storageBill.setAmountOne(billetHotsend.getAmountTotal());
-//		storageBill.setCarNum("辊道");
-//		storageBill.setLibrary("4");
-		storageBill.setBtype("0");
-//		storageBill.setSize(billetHotsend.getSizeOne());// 定尺
-//		storageBill.setSpec(billetHotsend.getSpec());
-		if(last!=null){
-			billetHotsend.setHeatNo(last.getPourHeats());
-//			billetHotsend.setBz("4");
-			billetHotsend.setShift(last.getShift());
-			billetHotsend.setShiftGroup(last.getShiftGroup());
-			storageBill.setShift(last.getShift());
-			storageBill.setShiftGroup(last.getShiftGroup());
-//			storageBill.setHeatsOne(last.getPourHeats());
-		}
-		storageBillModel.setAmountTotal(storageBillModel.getAmountTotal()+storageBill.getAmountTotal());
-		storageBillModel.setShiftProduct(storageBillModel.getShiftProduct()+storageBill.getAmountTotal());
-		storageBillModelService.updateById(storageBillModel);
-		storageBillService.save(storageBill);
-		baseMapper.insert(billetHotsend);
-		RollClubOne rollClubOne = new RollClubOne();
-		rollClubOne.setHeatNo(billetHotsend.getHeatNo());
-		rollClubOne.setCcmNo(billetHotsend.getCcmNo());
-		rollClubOne.setShift(last.getShift());
-		rollClubOne.setShiftGroup(last.getShiftGroup());
-//		rollClubOne.setSize(billetHotsend.getSizeOne());
-		rollClubOne.setSteel(billetHotsend.getSteel());
-//		rollClubOne.setSpec(billetHotsend.getSpec());
-		rollClubOne.setAmountTotal(billetHotsend.getAmountTotal());
-		rollClubOne.setCreateDate(new Date());
-		rollClubOneService.save(rollClubOne);
-	}
-
-	@Override
-	public void addHeight(BilletHotsend billetHotsend) {
-		RulerDefaultConfig last = rulerDefaultConfigService.getLast(billetHotsend.getCcmNo());
-		StorageBillModel storageBillModel = storageBillModelService.getOne(new LambdaQueryWrapper<StorageBillModel>().eq(StorageBillModel::getCastMachine,billetHotsend.getCcmNo()));
-//		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.setCcmNo(billetHotsend.getCcmNo());
-//		storageBill.setAmountOne(billetHotsend.getAmountTotal());
-//		storageBill.setCarNum("辊道");
-//		storageBill.setLibrary("2");
-		storageBill.setBtype("0");
-//		storageBill.setSize(billetHotsend.getSizeHeight());
-		storageBill.setSize("");
-//		storageBill.setSpec(billetHotsend.getSpec());
-		if(last!=null){
-			billetHotsend.setHeatNo(last.getPourHeats());
-//			billetHotsend.setBz("5");
-			billetHotsend.setShift(last.getShift());
-			billetHotsend.setShiftGroup(last.getShiftGroup());
-			storageBill.setShift(last.getShift());
-			storageBill.setShiftGroup(last.getShiftGroup());
-//			storageBill.setHeatsOne(last.getPourHeats());
-		}
-		storageBillModel.setAmountTotal(storageBillModel.getAmountTotal()+storageBill.getAmountTotal());
-		storageBillModel.setShiftProduct(storageBillModel.getShiftProduct()+storageBill.getAmountTotal());
-		storageBillModelService.updateById(storageBillModel);
-		storageBillService.save(storageBill);
-		baseMapper.insert(billetHotsend);
-		RollHeight rollHeight = new RollHeight();
-		rollHeight.setHeatNo(billetHotsend.getHeatNo());
-		rollHeight.setCcmNo(billetHotsend.getCcmNo());
-		rollHeight.setShift(last.getShift());
-		rollHeight.setShiftGroup(last.getShiftGroup());
-//		rollHeight.setSize(billetHotsend.getSizeHeight());
-		storageBill.setSize("");
-		rollHeight.setSteel(billetHotsend.getSteel());
-//		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/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -39,7 +39,6 @@ import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLo
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
 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;
@@ -73,8 +72,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
     @Autowired
     private IStorageBillService storageBillService;
     @Autowired
-    private IStorageBillModelService storageBillModelService;
-    @Autowired
     private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
     @Autowired
     private IStackingUpLogService stackingUpLogService;
@@ -1049,146 +1046,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         return vehicle;
     }
 
-    public void addStorageBill(List<StackingAndLoadingVehicles> savs,String castMachine,String carNum,String destination){
-        StorageBillModel storageBillModel = storageBillModelService.getOne(new LambdaQueryWrapper<StorageBillModel>().eq(StorageBillModel::getCastMachine,castMachine));
-        Integer carTimes = 0;
-        RulerDefaultConfig last = rulerDefaultConfigService.getLast(castMachine);
-        if(!carNum.equals("辊道")&&!carNum.equals("默认")){
-            carTimes = Integer.valueOf(last.getCureentCarTimes());
-        }
-        HashMap<String,List<StackingAndLoadingVehicles>> map = new HashMap<>();
-        Long currentDate = new Date().getTime();
-        for (StackingAndLoadingVehicles sav : savs) {
-            if(sav.getCreateTime()==null||currentDate-sav.getCreateTime().getTime()<30*60*1000){
-                List<StackingAndLoadingVehicles> hot = map.get("hot"+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize());
-                if(hot==null){
-                    hot = new ArrayList<>();
-                    map.put("hot"+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize(),hot);
-                }
-                hot.add(sav);
-            }else{
-                List<StackingAndLoadingVehicles> cold = map.get("cold"+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize());
-                if(cold==null){
-                    cold = new ArrayList<>();
-                    map.put("cold"+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize(),cold);
-                }
-                cold.add(sav);
-            }
-        }
-        for (Map.Entry<String, List<StackingAndLoadingVehicles>> entry : map.entrySet()) {
-            String bType = "";
-            String[] msgs = entry.getKey().split("-");
-            bType = msgs[0].equals("hot")?"0":"1";
-            HashMap<String,Integer> heatsTotal = new HashMap<>();
-            for (StackingAndLoadingVehicles sav : entry.getValue()) {
-                if(heatsTotal.get(sav.getHeatNo())==null){
-                    heatsTotal.put(sav.getHeatNo(),4);
-                }else{
-                    heatsTotal.put(sav.getHeatNo(),heatsTotal.get(sav.getHeatNo())+4);
-                }
-            }
-            StorageBill storageBill = new StorageBill();
-            storageBill.setAmountTotal(4*entry.getValue().size());
-            storageBill.setSteel(oConvertUtils.isEmpty(msgs[1])?"":msgs[1]);
-            storageBill.setSpec(oConvertUtils.isEmpty(msgs[2])?"":msgs[2]);
-            storageBill.setSize(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-            storageBillModel.setAmountTotal(oConvertUtils.isEmpty(storageBillModel.getAmountTotal())?0:storageBillModel.getAmountTotal()+storageBill.getAmountTotal());
-            storageBillModel.setShiftProduct(oConvertUtils.isEmpty(storageBillModel.getShiftProduct())?0:storageBillModel.getShiftProduct()+storageBill.getAmountTotal());
-            storageBill.setCcmNo(castMachine);
-            for (Map.Entry<String, Integer> hentry : heatsTotal.entrySet()){
-//                if(oConvertUtils.isEmpty(storageBill.getAmountOne())){
-//                    storageBill.setHeatsOne(hentry.getKey());
-//                    storageBill.setAmountOne(hentry.getValue());
-//                }else if(oConvertUtils.isEmpty(storageBill.getAmountTwo())){
-//                    storageBill.setHeatsTwo(hentry.getKey());
-//                    storageBill.setAmountTwo(hentry.getValue());
-//                }else if(oConvertUtils.isEmpty(storageBill.getAmountThree())){
-//                    storageBill.setHeatsThree(hentry.getKey());
-//                    storageBill.setAmountThree(hentry.getValue());
-//                }
-            }
-//            storageBill.setLibrary(destination);
-//            storageBill.setCarNum(carNum);
-            storageBill.setShift(last.getShift());
-            storageBill.setShiftGroup(last.getShiftGroup());
-            storageBill.setBtype(bType);
-            if(!carNum.equals("辊道")&&!carNum.equals("默认")){
-//                storageBill.setCarTimes(carTimes);
-            }
-            storageBillService.save(storageBill);
-        }
-        storageBillModelService.updateById(storageBillModel);
-
-    }
-
-
-    private void addRolling(LoadingParams loadingParams) {
-//        RulerDefaultConfig last = rulerDefaultConfigService.getLast(loadingParams.getCastMachine());
-//        if(oConvertUtils.listIsNotEmpty(loadingParams.getSavs())){
-//            HashMap<String, RollClubOne> rollingMap = new HashMap<>();
-//            for (StackingAndLoadingVehicles sav : loadingParams.getSavs()) {
-//                RollClubOne rollClubOne = rollingMap.get(sav.getSize() + "-" + sav.getSpec() + "-" + sav.getSteel() + "-" + sav.getHeatNo());
-//                if(oConvertUtils.isEmpty(rollClubOne)){
-//                    rollClubOne = new RollClubOne();
-//                    rollClubOne.setHeatNo(sav.getHeatNo());
-//                    rollClubOne.setCcmNo(loadingParams.getCastMachine());
-//                    rollClubOne.setShift(last.getShift());
-//                    rollClubOne.setShiftGroup(last.getShiftGroup());
-//                    rollClubOne.setSize(sav.getSize());
-//                    rollClubOne.setSteel(sav.getSteel());
-//                    rollClubOne.setSpec(sav.getSpec());
-//                    rollClubOne.setAmountTotal(0);
-//                    rollClubOne.setCreateDate(new Date());
-//                    rollingMap.put(sav.getSize() + "-" + sav.getSpec() + "-" + sav.getSteel() + "-" + sav.getHeatNo(),rollClubOne);
-//                }
-//                rollClubOne.setAmountTotal(rollClubOne.getAmountTotal()+4);
-//            }
-//            ArrayList<RollClubOne> rollClubOnes = new ArrayList<>(rollingMap.values());
-//            switch (loadingParams.getDestination()){
-//                case "0":
-//                    rollClubOneService.saveBatch(rollClubOnes);
-//                    break;
-//                case "1":
-//                    ArrayList<RollClubTwo> rollClubTwos = new ArrayList<>();
-//                    rollClubOnes.forEach(rollClubOne -> {
-//                        RollClubTwo rollClubTwo = new RollClubTwo();
-//                        BeanUtils.copyProperties(rollClubOne,rollClubTwo);
-//                        rollClubTwos.add(rollClubTwo);
-//                    });
-//                    rollClubTwoService.saveBatch(rollClubTwos);
-//                    break;
-//                case "2":
-//                    ArrayList<RollClubThree> rollClubThrees = new ArrayList<>();
-//                    rollClubOnes.forEach(rollClubOne -> {
-//                        RollClubThree rollClubThree = new RollClubThree();
-//                        BeanUtils.copyProperties(rollClubOne,rollClubThree);
-//                        rollClubThrees.add(rollClubThree);
-//                    });
-//                    rollClubThreeService.saveBatch(rollClubThrees);
-//                    break;
-//                case "3":
-//                    ArrayList<RollHeight> rollHeights = new ArrayList<>();
-//                    rollClubOnes.forEach(rollClubOne -> {
-//                        RollHeight rollHeight = new RollHeight();
-//                        BeanUtils.copyProperties(rollClubOne,rollHeight);
-//                        rollHeights.add(rollHeight);
-//                    });
-//                    rollHeightService.saveBatch(rollHeights);
-//                    break;
-//                case "4":
-//                    ArrayList<RollOutShipp> rollOutShipps = new ArrayList<>();
-//                    rollClubOnes.forEach(rollClubOne -> {
-//                        RollOutShipp rollOutShipp = new RollOutShipp();
-//                        BeanUtils.copyProperties(rollClubOne,rollOutShipp);
-//                        rollOutShipps.add(rollOutShipp);
-//                    });
-//                    rollOutShippService.saveBatch(rollOutShipps);
-//                    break;
-//            }
-//        }
-    }
-
-
     /**
      * 根据铸机号、班次、班别查询当天交班记录，并根据提供的日志列表更新相应的总支数
      *

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

@@ -240,7 +240,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 	 @ApiOperation(value="车运大屏-左右两侧信息", notes="车运大屏-左右两侧信息")
 	 @GetMapping(value = "/getStats")
 	 public Result<?> getStats() {
-		 return Result.OK(storageBillService.getStats());
+		 return Result.OK();
 	 }
 
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/mapper/StorageBillMapper.java

@@ -2,8 +2,6 @@ package org.jeecg.modules.billet.storageBill.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.billet.storageBill.entity.CastAndBtTypeStats;
-import org.jeecg.modules.billet.storageBill.entity.CastStats;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 
 import java.util.List;
@@ -16,11 +14,6 @@ import java.util.List;
  */
 public interface StorageBillMapper extends BaseMapper<StorageBill> {
 
-    void subCarTimes(Integer times);
-
-    CastStats castStats(String castMachine);
-
-    CastAndBtTypeStats castAndBtTypeStats(@Param("castMachine") String castMachine, @Param("btype") String btype);
-
     List<StorageBill> findCar(@Param("ccmNo") String ccmNo, @Param("destination") String destination);
+
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/mapper/xml/StorageBillMapper.xml

@@ -2,105 +2,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.storageBill.mapper.StorageBillMapper">
 
-    <update id="subCarTimes">
-        update storage_bill
-        set car_times = (car_times-1)
-        where car_times > #{times}
-    </update>
-
-    <select id="castStats" resultType="org.jeecg.modules.billet.storageBill.entity.CastStats">
-        SELECT total.amount as total,rolling.amount as rollingTotal,stack.amount as stackTotal,hotsend.amount as hotsendTotal,cartimes.amount as times,sbmb.shift,sbmz.shift_group as shiftGroup,rdc.amount as outSatckAmount
-        FROM (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-        )as total, (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND library IN ('0','1','2','3','4')
-        )as rolling, (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND library NOT IN ('0','1','2','3','4')
-        )as stack, (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND library IN ('2','4')
-                AND btype = '0'
-        )as hotsend, (
-                SELECT COUNT(0) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND library IN ('0','1','3')
-        )as cartimes,(
-                SELECT SUM(IFNULL(out_amount,0)) as amount
-                From ruler_default_config
-                WHERE cast_machine = #{castMachine}
-        )as rdc
-        LEFT JOIN (
-                SELECT sdib.item_text as shift
-                From storage_bill_model sbm
-                LEFT JOIN sys_dict sdb
-                ON sdb.dict_code = 'lg_bb'
-                LEFT JOIN sys_dict_item sdib
-                ON sdib.dict_id = sdb.id
-                WHERE cast_machine = #{castMachine}
-                AND sdib.item_value = sbm.shift
-        ) sbmb
-		ON 1 = 1
-		LEFT JOIN (
-                SELECT sdiz.item_text as shift_group
-                From storage_bill_model sbm
-                LEFT JOIN sys_dict sdz
-                ON sdz.dict_code = 'lg_bz'
-                LEFT JOIN sys_dict_item sdiz
-                ON sdiz.dict_id = sdz.id
-                WHERE cast_machine = #{castMachine}
-                AND sdiz.item_value = sbm.shift_group
-        ) sbmz
-		ON 1 = 1
-
-    </select>
-    
-    <select id="castAndBtTypeStats" resultType="org.jeecg.modules.billet.storageBill.entity.CastAndBtTypeStats">
-        SELECT total.amount as total,two.amount as twoTotal,three.amount as threeTotal,sr.amount as srTotal,cartimes.amount as times
-        FROM (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND btype = #{btype}
-                AND library IN ('0','1','3')
-        )as total, (
-                SELECT COUNT(0) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-				AND btype = #{btype}
-                AND library IN ('0','1','3')
-        )as cartimes, (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND btype = #{btype}
-                AND library = '0'
-        )as two, (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND btype = #{btype}
-                AND library = '2'
-        )as three, (
-                SELECT SUM(IFNULL(amount_three,0)+IFNULL(amount_one,0)++IFNULL(amount_two,0)) as amount
-                From storage_bill
-                WHERE cast_machine = #{castMachine}
-                AND btype = #{btype}
-                AND library = '3'
-        )as sr
-    </select>
-
     <select id="findCar" resultType="org.jeecg.modules.billet.storageBill.entity.StorageBill">
         SELECT * FROM storage_bill WHERE ccm_no = #{ccmNo} AND arrival_time IS NOT NULL AND out_time IS NULL AND (destination IS NULL OR destination = #{destination});
     </select>
+
 </mapper>

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/IStorageBillService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
 import org.jeecg.modules.billet.storageBill.entity.BilletHotsendDetails;
-import org.jeecg.modules.billet.storageBill.entity.GetStatsResponse;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 
 import java.util.List;
@@ -18,11 +17,6 @@ import java.util.Map;
  */
 public interface IStorageBillService extends IService<StorageBill> {
 
-    void subCarTimes(Integer times);
-
-
-    GetStatsResponse getStats();
-
     void departHandle(BilletHotsendDetailsVo billetHotsendDetailsVo);
 
     BilletHotsendDetails findBilletHotsendDetails(StorageBill storageBill);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -84,23 +84,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Autowired
     private IOperateLogService operateLogService;
 
-    @Override
-    public void subCarTimes(Integer times) {
-        storageBillMapper.subCarTimes(times);
-    }
-
-    @Override
-    public GetStatsResponse getStats() {
-        GetStatsResponse getStatsResponse = new GetStatsResponse();
-        getStatsResponse.setFive(storageBillMapper.castStats("5"));
-        getStatsResponse.setFiveHot(storageBillMapper.castAndBtTypeStats("5","0"));
-        getStatsResponse.setFiveCold(storageBillMapper.castAndBtTypeStats("5","1"));
-        getStatsResponse.setSix(storageBillMapper.castStats("6"));
-        getStatsResponse.setSixHot(storageBillMapper.castAndBtTypeStats("6","0"));
-        getStatsResponse.setSixCold(storageBillMapper.castAndBtTypeStats("6","1"));
-        return getStatsResponse;
-    }
-
     @Override
     public void departHandle(BilletHotsendDetailsVo billetHotsendDetailsVo) {
         StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();