车位 2 特殊处理

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

@@ -318,11 +318,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             String shift = getShiftInfo(storageBill.getCcmNo(), "class:shift:%s");
             // 判断车牌号是否存在未发车的装运单信息
             LambdaQueryWrapper<StorageBill> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
-                    .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate())
+            queryWrapper.eq(StorageBill::getLicensePlate, storageBill.getLicensePlate())
                     .eq(StorageBill::getShiftGroup, shiftGroup)
                     .eq(StorageBill::getShift, shift)
                     .isNull(StorageBill::getOutTime);
+            // 2号车位不验证铸机号
+            if (!storageBill.getCcmNo().equals("2")) {
+                queryWrapper.eq(StorageBill::getCcmNo, storageBill.getCcmNo());
+            }
             StorageBill isStorageBill = baseMapper.selectOne(queryWrapper);
             if (oConvertUtils.isNotEmpty(isStorageBill)) {
                 log.info("查询到存在未发车车辆，车牌号为：{}，新增钢坯装运单失败！", storageBill.getLicensePlate());
@@ -338,25 +341,25 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 result.put("fail", "该车位存在未发车信息，新增钢坯装运单失败！");
                 return result;
             }
-            // 五号机默认为1号车位
-            if ("5".equals(storageBill.getCcmNo())){
-                storageBill.setPositionNum(1);
-            }
+//            // 五号机默认为1号车位
+//            if ("5".equals(storageBill.getCcmNo())){
+//                storageBill.setPositionNum(1);
+//            }
             storageBill.setArrivalTime(new Date());// 到达时间
-            LambdaQueryWrapper<StorageBill> queryWrapper1 = new LambdaQueryWrapper<>();
-            queryWrapper1.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
-                    .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate())
-                    .eq(StorageBill::getShiftGroup, shiftGroup)
-                    .eq(StorageBill::getShift, shift).between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-            long carNum = baseMapper.selectCount(queryWrapper1);
-            storageBill.setCarNum(Math.toIntExact(carNum) + 1);
-
-            LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
-            queryWrapper2.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
-                    .eq(StorageBill::getShiftGroup, shiftGroup)
-                    .eq(StorageBill::getShift, shift).between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-            long carAllNum = baseMapper.selectCount(queryWrapper2);
-            storageBill.setCarAllNum(Math.toIntExact(carAllNum) + 1);
+//            LambdaQueryWrapper<StorageBill> queryWrapper1 = new LambdaQueryWrapper<>();
+//            queryWrapper1.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
+//                    .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate())
+//                    .eq(StorageBill::getShiftGroup, shiftGroup)
+//                    .eq(StorageBill::getShift, shift).between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+//            long carNum = baseMapper.selectCount(queryWrapper1);
+//            storageBill.setCarNum(Math.toIntExact(carNum) + 1);
+
+//            LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
+//            queryWrapper2.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
+//                    .eq(StorageBill::getShiftGroup, shiftGroup)
+//                    .eq(StorageBill::getShift, shift).between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+//            long carAllNum = baseMapper.selectCount(queryWrapper2);
+//            storageBill.setCarAllNum(Math.toIntExact(carAllNum) + 1);
 
             // 通过铸机号、班组、班别去查询交班记录并初始化 车次
 //            LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper3 = new LambdaQueryWrapper<>();