From d8e70f219528870dd643b3f5a83b2a8471f4da9b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 09 十月 2023 10:33:58 +0800
Subject: [PATCH] ERP单据上传接口更改
---
src/main/java/com/zy/common/web/WcsController.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c14495a..2d9dd2b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -11,15 +11,15 @@
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.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -109,10 +109,10 @@
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
case 103:// 鎷ｆ枡鍏ュ簱
case 104:// 骞舵澘鍏ュ簱
@@ -131,7 +131,7 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -166,11 +166,13 @@
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- for (Mat mat : mats) {
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ waitPakins.forEach(waitPakin -> {
+ Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
+ if(Cools.isEmpty(mat)){
+ throw new CoolException(waitPakin.getMatnr() + "璇ョ墿鏂欏彿鏃犳硶鏌ヨ锛岃鏌ョ湅鐗╂枡淇℃伅鏄惁瀛樺湪");
+ }
WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(mat);
- wrkDetl.setAnfme(mat.getWeight());
+ BeanUtils.copyProperties(waitPakin,wrkDetl);
wrkDetl.setZpallet(barcode);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
@@ -179,7 +181,21 @@
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
- }
+ });
+// for (Mat mat : mats) {
+// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+// WrkDetl wrkDetl = new WrkDetl();
+// wrkDetl.sync(mat);
+// wrkDetl.setAnfme(mat.getWeight());
+// wrkDetl.setZpallet(barcode);
+// wrkDetl.setWrkNo(wrkMast.getWrkNo());
+// wrkDetl.setIoTime(wrkMast.getIoTime());
+// wrkDetl.setAppeTime(now);
+// wrkDetl.setModiTime(now);
+// if (!wrkDetlService.insert(wrkDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// }
// // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
// Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
@@ -281,4 +297,15 @@
return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
+ /*
+ 鍥涢」搴撳線AGV琛ヨ揣锛寃cs璋冪敤姝ゆ帴鍙�
+ */
+ @PostMapping("/replenishment")
+ @ResponseBody
+ public R replenishment(@RequestBody ReplenishmentParam param){
+
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1