qiangxuan 6 months ago
parent
commit
cda04b44b1

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

@@ -1014,7 +1014,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		}
 		storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
 		storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
-		storageBill.setCarAllNum(storageBillService.list().size() + 1);
 		storageBill.setOutTime(new Date());
 		storageBillService.updateById(storageBill);
 		// 生成储运单

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

@@ -668,18 +668,10 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
         // 6 更新装运单 storage_bill 新增储运信息
         StorageBill storageBill = loadingParams.getStorageBill();
-        LambdaQueryWrapper<StorageBill> queryWrapperSB = new LambdaQueryWrapper<>();
-        queryWrapperSB.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
-                     .eq(StorageBill::getShift, finalCacheShint1)
-                   .eq(StorageBill::getShiftGroup, finalCacheShintGroup1)
-                    .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate());
-        List<StorageBill> storageBillList = storageBillService.list(queryWrapperSB);
-        storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
         storageBill.setTypeConfigId(loadingParams.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
         storageBill.setDestination(loadingParams.getStorageBill().getDestination());// 目的地
         storageBill.setAmountTotal(storageBill.getAmountTotal() + stackingAndLoadingVehiclesList.size() * 4);
         storageBill.setOutTime(new Date());
-        storageBill.setCarAllNum(storageBillService.list().size() + 1);
         storageBillService.updateById(storageBill);
         // 7 发车后,新增钢坯堆垛储运信息,生成储运单 storage_car_log
         StorageCarLog storageCarLog = new StorageCarLog();

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

@@ -172,8 +172,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		if (oConvertUtils.isNotEmpty(isStorageBill.getOutTime()) && storageBill.getLicensePlate().equals(isStorageBill.getLicensePlate())) {
 			return Result.OK("该车已发车,请勿重复发车!");
 		}
-		storageBill.setCarNum(isStorageBill.getCarNum() + 1);
-		storageBill.setCarAllNum(storageBillService.list().size() + 1);
 		storageBill.setUpdateTime(new Date());
 		storageBillService.updateById(storageBill);
 		// 7 发车后,新增钢坯堆垛储运信息,生成储运单 storage_car_log