From 4f08300aac2fa0fef0a6d5821a4ec2c533ed5346 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 17 八月 2024 09:39:06 +0800
Subject: [PATCH] 出库路径修改
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 9c4ab59..5fa560d 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -108,26 +108,34 @@
/**
* 鍏ㄦ澘鍑哄簱鍒�3077鎴�3106鐨勪换鍔★紝鍒ゆ柇鍑哄簱瑕佽蛋鐨勮矾寰�
* @param wrkMast 宸ヤ綔涓绘。
- * @return 1.鐩存帴鍑哄簱 2.鐞嗚揣璐存爣鍑哄簱 3.璐存爣鎵撳甫鍑哄簱 4.璐存爣鍑哄簱
+ * @return 1.鐩存帴鍑哄簱,鍙湁涓�鏉¤矾寰� 2.鐞嗚揣璐存爣鍑哄簱 3.璐存爣鎵撳甫鍑哄簱 4.璐存爣鍑哄簱
*/
private int getDescToGwcs(WrkMast wrkMast) {
// todo 涓ゆ潯璺嚎鎬庝箞閫�
- int flag = 0;
+ int flag = 1;
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ List<String> collect = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
+
if (wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
// 鏈夊嚑涓湪绠�
- List<String> collect = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
if (collect.size() == 1) { // 涓�绠�
if (wrkDetls.size() == 1) { // 涓�鍗峰幓璐存爣
- flag = 1;
+ flag = 4;
} else { // 澶氬嵎鐩存帴鍑�
}
} else if(collect.size() == 2) { // 涓ょ鍘昏创鏍囨墦甯�
- flag = 2;
+ // todo 鍚屽瀷鍙�(鏈ㄧ鍨嬪彿+绠¤姱+鎴愬搧瑙勬牸)鍘昏创鏍囷紝鎵撳甫锛屼笉鍚屽瀷鍙疯创鏍囧嚭搴� 鍙傛暟涓嶇‘瀹�
+ flag = 3;
}
- } else if (wrkMast.getIoType() == 103 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) {
- flag = 4;
+ } else if (wrkMast.getIoType() == 103 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) { // 涓ょ鍑轰竴绠憋紝闇�妗佹灦鐞嗚揣
+ // 閮借鍏堝幓鐞嗚揣
+ flag = 2;
+// if (wrkDetls.size() == 1) { // 涓�鍗疯创鏍囧嚭搴�
+// flag = 4;
+// } else { // 澶氬嵎鐩存帴鍑哄簱
+//
+// }
}
return flag;
}
--
Gitblit v1.9.1