From 7b3d21cd1c68a48e558fb4255321da8ad7f13b7b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 16 八月 2024 09:04:09 +0800
Subject: [PATCH] 成品入库修改
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 839bd1e..9c4ab59 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -108,14 +108,15 @@
/**
* 鍏ㄦ澘鍑哄簱鍒�3077鎴�3106鐨勪换鍔★紝鍒ゆ柇鍑哄簱瑕佽蛋鐨勮矾寰�
* @param wrkMast 宸ヤ綔涓绘。
- * @return 0.鍙湁涓�鏉¤矾寰勶紝1.鐞嗚揣璐存爣鍑哄簱璺緞锛�2.璐存爣鎵撳甫鍑哄簱璺緞
+ * @return 1.鐩存帴鍑哄簱 2.鐞嗚揣璐存爣鍑哄簱 3.璐存爣鎵撳甫鍑哄簱 4.璐存爣鍑哄簱
*/
private int getDescToGwcs(WrkMast wrkMast) {
+ // todo 涓ゆ潯璺嚎鎬庝箞閫�
int flag = 0;
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::getOrigin).distinct().collect(Collectors.toList());
+ // 鏈夊嚑涓湪绠�
+ List<String> collect = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
if (collect.size() == 1) { // 涓�绠�
if (wrkDetls.size() == 1) { // 涓�鍗峰幓璐存爣
flag = 1;
@@ -125,6 +126,8 @@
} else if(collect.size() == 2) { // 涓ょ鍘昏创鏍囨墦甯�
flag = 2;
}
+ } else if (wrkMast.getIoType() == 103 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) {
+ flag = 4;
}
return flag;
}
--
Gitblit v1.9.1