|
|
@@ -106,8 +106,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
// 2号车位不验证铸机号
|
|
|
if (!positionNum.equals("2")) {
|
|
|
queryWrapper.eq(StorageBill::getCcmNo, ccmNo);
|
|
|
- }else{
|
|
|
- queryWrapper.eq(StorageBill::getCcmNo, 0);
|
|
|
}
|
|
|
StorageBill isStorageBill = baseMapper.selectOne(queryWrapper);
|
|
|
if (oConvertUtils.isNotEmpty(isStorageBill)) {
|
|
|
@@ -150,7 +148,12 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
// int carAllNum = calculateCarAllNum(ccmNo, shiftGroup, shift);
|
|
|
// storageBill.setCarAllNum(carAllNum + 1);
|
|
|
// 保存储运单信息
|
|
|
- storageBill.setCcmNo(ccmNo);
|
|
|
+ // 2号车位铸机号给0
|
|
|
+ if (!positionNum.equals("2")) {
|
|
|
+ storageBill.setCcmNo(ccmNo);
|
|
|
+ }else{
|
|
|
+ storageBill.setCcmNo("0");
|
|
|
+ }
|
|
|
// 根据铸机号、班组、班别，创建时间倒序 只返回一条，查询储运配置信息
|
|
|
LambdaQueryWrapper<ShiftConfiguration> queryWrapper1 = new LambdaQueryWrapper<ShiftConfiguration>();
|
|
|
queryWrapper1.eq(ShiftConfiguration::getCcmNo, ccmNo)
|
