20250429

src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java

@@ -797,10 +797,10 @@ public class BoardServiceImpl implements BoardService {
 
     @Override
     public IPage<Inventory> queryPartInventory(int no, int size, Inventory inventory) {
-        SysUserEntity loginUser =  (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
-        if (Objects.nonNull(loginUser)){
-            inventory.setLoginUser(loginUser.getUsername());
-        }
+//        SysUserEntity loginUser =  (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+//        if (Objects.nonNull(loginUser)){
+//            inventory.setLoginUser(loginUser.getUsername());
+//        }
         if (Objects.nonNull(inventory.getEndFirstInDate())){
             inventory.getEndFirstInDate().setHours(23);
             inventory.getEndFirstInDate().setMinutes(59);

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1521,6 +1521,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         workCenterResourceData.setResourceID(getSOScheduledRoutingOutData.get(0).getsResourceID());
         workCenterResourceData.setWorkCenterNo(getSOScheduledRoutingOutData.get(0).getsWorkCenterNo());
         WorkCenterResourceData getWorkCenterResourceData= dailyPlanMapper.getWorkCenterResourceData(workCenterResourceData);
+        if (Objects.isNull(getWorkCenterResourceData)){
+            throw new RuntimeException("没有找到可用的机台!");
+        }
         if(checkShopOrder.getPartNo().startsWith("SP") || "Y".equals(getWorkCenterResourceData.getFqcFlag())) {
             String transNo = dailyPlanMapper.getTransNo();
             checkUserSeqNo.get(0).setTransNo(transNo);