From e52bc2b90ee7bbff60e15786af1bc5578fe01b3d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:10:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 77a1587..a10cb7f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -72,9 +72,9 @@
return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
}
}
- if (Cools.isEmpty(param.getLocType1())){
- return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
- }
+// if (Cools.isEmpty(param.getLocType1())){
+// return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+// }
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
@@ -91,7 +91,7 @@
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
case 103:// 鎷ｆ枡鍏ュ簱
- break;
+ case 104:// 骞舵澘鍏ュ簱
case 107:// 鐩樼偣鍏ュ簱
dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
break;
@@ -251,8 +251,7 @@
}
// 妫�绱㈠簱浣�
List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, ioType, devpNo, matnrList, locTypeDto,0);
- return dto; // 搴撲綅鍙凤紝 鍫嗗灈鏈�
+ return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
}
--
Gitblit v1.9.1