班次实绩、目的地确认

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/controller/BilletHotsendChangeShiftController.java

@@ -957,8 +957,7 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 		// 根据铸机号、交班结束时间倒序并不为空，查询交班记录，
 		LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, "5")
-				.orderByDesc(BilletHotsendChangeShift::getChangeShiftTime)
-				.ne(BilletHotsendChangeShift::getChangeShiftTime, null)
+				.orderByDesc(BilletHotsendChangeShift::getCreateTime)
 				.last("limit 1");
 		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
 		if (billetHotsendChangeShift == null) {

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

@@ -2752,8 +2752,9 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             // 根据装运单ID查询钢坯临时表
             List<BilletAutoTmp> billetAutoTmpList = billetAutoTmpService.list(new LambdaQueryWrapper<BilletAutoTmp>()
                     .eq(BilletAutoTmp::getStorageBillId, storageBill.getId()));
-            if (oConvertUtils.listIsEmpty(billetAutoTmpList) || "1024".equals(storageBill.getTypeConfigId())){
-                result.put("fail", "钢坯轧钢外运未知目的地明细不存在！");
+            if (oConvertUtils.listIsEmpty(billetAutoTmpList)){
+                baseMapper.updateById(storageBill);
+                result.put("fail", "钢坯轧钢外运未知目的地明细不存在,更新目的地成功！");
                 return result;
             }
             billetAutoTmpList.forEach(x ->{