|
|
@@ -2688,6 +2688,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
public JSONObject billetAutoTmpDataSyn(StorageBill storageBill) {
|
|
|
JSONObject result = new JSONObject();
|
|
|
try {
|
|
|
+
|
|
|
+ // 从 Redis 获取班次信息
|
|
|
+ String shiftGroup = getShiftInfo(storageBill.getCcmNo(), "class:shift:group:%s");
|
|
|
+ String shift = getShiftInfo(storageBill.getCcmNo(), "class:shift:%s");
|
|
|
+
|
|
|
log.info("{}{}", "钢坯轧钢外运未知目的地数据同步装运单信息：", JSON.toJSON(storageBill));
|
|
|
List<RollClubCommon> rollClubCommonList = new ArrayList<>();
|
|
|
// 根据装运单ID查询钢坯临时表
|
|
|
@@ -2772,6 +2777,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
String sizeString = String.join(",", sizeList.stream().map(String::valueOf).collect(Collectors.toList()));
|
|
|
storageBill.setSize(sizeString);// 定尺
|
|
|
|
|
|
+ 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);
|
|
|
+
|
|
|
List<String> assemblyNumberList = billetBasicInfoList.stream().map(BilletBasicInfo::getAssemblyNumber).filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber)).collect(Collectors.toList());
|
|
|
if(oConvertUtils.listIsNotEmpty(assemblyNumberList)) {
|
|
|
String distinctAssemblyNumber = billetBasicInfoList.stream()
|
