From 4c83ee8845d2e8701d09903ea7ab14b9eeff4831 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 22 八月 2024 19:03:55 +0800
Subject: [PATCH] #logo
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..481fdfd 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
@@ -341,7 +345,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(locDetl);
waitPakin.setBatch(locDetl.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
- waitPakin.setModel(locDetl.getModel()); //鍗峰彿 鍞竴鍊�
+ waitPakin.setModel(locDetl.getModel()); //MES宸ヤ綔鍙� 鍞竴鍊�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(locDetl.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -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