From 2c5cd00985bb587710c67a4f642b6413c2590141 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 十二月 2022 11:29:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 22 +++++++++++++++++-----
1 files changed, 17 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 cc9295a..bd97d3b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -9,6 +9,8 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.common.service.erp.ErpService;
+import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,8 @@
private LocDetlService locDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private ErpService erpService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -60,9 +64,15 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- mat = matService.selectByMatnr(param.getBarcode());
+ Goods goods = erpService.selectGoodsOne(param.getBarcode());
+ if (Cools.isEmpty(goods)) {
+ return R.error(param.getBarcode() + "鏉＄爜涓嶅瓨鍦紝璇锋鏌RP鏁版嵁锛�");
+ } else {
+ erpService.updateStateForGoods(param.getBarcode(), 2);
+ }
+ mat = matService.selectByMatnr(goods.getMaterialNO());
if (Cools.isEmpty(mat)) {
- return R.error(param.getBarcode() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
+ return R.error(goods.getMaterialNO() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
}
// waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
// if (Cools.isEmpty(waitPakins)) {
@@ -90,7 +100,7 @@
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert mat != null;
- dto = startupFullPutStore(param.getSourceStaNo(), null, locTypeDto, mat);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mat);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
@@ -151,7 +161,9 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
- wrkDetl.setAnfme(1.0D);
+ wrkDetl.setAnfme(mat.getWeight());
+ wrkDetl.setBatch(barcode);
+// wrkDetl.setAnfme(1.0D);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -255,7 +267,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