From 072e9fbd7854ce30cf4bcfadad10cc817c8441d9 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期六, 17 八月 2024 13:06:55 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 344ba76..b8542e2 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -39,6 +39,10 @@ // 搴撲綅鎺掑彿鍒嗛厤榛樿绫诲埆 private static final int DEFAULT_ROW_NO_TYPE = 1; + public static final List<Integer> OVER_TORN_STA_NO_LIST = new ArrayList<Integer>() {{ + add(126);add(131);add(310);add(312); + }}; + @Autowired private MatService matService; @Autowired @@ -560,8 +564,8 @@ wrkMast.setEmptyMk("N"); // 绌烘澘 wrkMast.setLinkMis("N"); wrkMast.setSheetNo("0"); - if (staDesc.getStnNo()<118 || staDesc.getStnNo()>121){ - wrkMast.setSheetNo("3"); + if (!OVER_TORN_STA_NO_LIST.contains(staDesc.getStnNo())){ + wrkMast.setSheetNo("2"); } wrkMast.setBarcode(locMast.getBarcode()); wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁 @@ -1263,7 +1267,7 @@ wrkMast.setCrnEndTime(now); wrkMast.setModiTime(now); wrkMast.setModiUser(userId); - wrkMast.setSheetNo("3"); + wrkMast.setSheetNo("2"); // 瀹屾垚鎿嶄綔浜哄憳璁板綍 wrkMast.setManuType("鎵嬪姩瀹屾垚"); if (!wrkMastService.updateById(wrkMast)) { -- Gitblit v1.9.1