From 01e44ad191f1a9756640d0baec00987009281ecf Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 20 八月 2024 13:44:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index 215b615..d8243c6 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -130,8 +130,18 @@
}
} else if(collect.size() == 2) { // 涓ょ鍘昏创鏍囨墦甯�
- // todo 鍚屽瀷鍙�(鏈ㄧ鍨嬪彿+绠¤姱+鎴愬搧瑙勬牸)鍘昏创鏍囷紝鎵撳甫锛屼笉鍚屽瀷鍙疯创鏍囧嚭搴� 鍙傛暟涓嶇‘瀹�
+
+ // 涓ょ鑲畾閮芥槸鍗曞嵎鎯呭喌 鍚屽瀷鍙�(鏈ㄧ鍨嬪彿-绠¤姱绫诲瀷-瀹炴祴瀹藉箙-鐢熺當鍘氬害-鍒嗗垏涓嬫枡鏃堕棿)鍘昏创鏍囷紝鎵撳甫锛屼笉鍚屽瀷鍙疯创鏍囧嚭搴�
+ WrkDetl wrkDetl1 = wrkDetls.get(0);
+ WrkDetl wrkDetl2 = wrkDetls.get(1);
+ if (wrkDetl1.getColor().equals(wrkDetl2.getColor())&&
+ wrkDetl1.getSku().equals(wrkDetl2.getSku())&&
+ wrkDetl1.getManu().equals(wrkDetl2.getManu())&&
+ wrkDetl1.getItemNum().equals(wrkDetl2.getItemNum())) {
flag = 3;
+ } else {
+ flag = 4;
+ }
}
} else if (wrkMast.getIoType() == 103 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) { // 涓ょ鍑轰竴绠憋紝闇�妗佹灦鐞嗚揣
// 閮借鍏堝幓鐞嗚揣
--
Gitblit v1.9.1