From 3387ed612b1ea2dba41d6eeb724bb0843a549d6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 16:16:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0c71376..ca4de1f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -61,7 +61,9 @@
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
mat = matService.selectByMatnr(param.getBarcode());
-
+ if (Cools.isEmpty(mat)) {
+ return R.error(param.getBarcode() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
+ }
// waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
// if (Cools.isEmpty(waitPakins)) {
// WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -88,7 +90,7 @@
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert mat != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mat);
+ dto = startupFullPutStore(param.getSourceStaNo(), null, locTypeDto, mat);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
@@ -115,7 +117,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<Mat> mats = Collections.singletonList(mat);
- List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList());
+ List<String> matnrList = mats.stream().map(Mat::getMaktx).distinct().collect(Collectors.toList());
StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
@@ -149,7 +151,8 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
- wrkDetl.setAnfme(1.0D);
+ wrkDetl.setAnfme(mat.getWeight());
+// wrkDetl.setAnfme(1.0D);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -253,7 +256,7 @@
throw new CoolException(CodeRes.NONE_DETL_900);
}
// 妫�绱㈠簱浣�
- List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
+ List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMaktx).distinct().collect(Collectors.toList());
return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
--
Gitblit v1.9.1