From 982f4c1175fd0afdf355158bfce7b161c0f6f0ae Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 11 九月 2020 08:36:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/java/com/zy/core/MainProcess.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 13fa3bd..84614d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -88,19 +88,19 @@
continue;
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
- if (staProtocol.isAutoing() && staProtocol.isLoading()
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 0
&& staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
if (wrkMast != null) {
- log.warn("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+ log.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
continue;
}
// 鑾峰彇鍏ュ簱閫氱煡妗�
List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
if (waitPakins.isEmpty()) {
- log.warn("鏃犳鍏ュ簱鏉＄爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
+ log.error("鏃犳鍏ュ簱鏉＄爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
continue;
}
// 宸ヤ綔鍙�
@@ -145,7 +145,7 @@
}
// 灏嗗叆搴撻�氱煡妗ｄ慨鏀逛负宸插惎鍔�
if (wrkMastMapper.updateWaitPakInStep1(barcode) == 0) {
- throw new CoolException("淇敼鍏ュ簱閫氱煡妗ｇ姸鎬佷负宸插惎鍔�");
+ throw new CoolException("淇敼鍏ュ簱閫氱煡妗ｇ姸鎬佷负宸插惎鍔ㄥけ璐�");
}
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c2b260b..811bbd1 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -40,8 +40,8 @@
}
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-// mainService.generateStoreWrkFile();
- mainService.generateStoreWrkFile2();
+ mainService.generateStoreWrkFile();
+// mainService.generateStoreWrkFile2();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
--
Gitblit v1.9.1