From 483f084456725ed3b6b6472b02df6dd8545b2815 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 18 十月 2023 13:48:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ca975c4..2f40c38 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,7 +10,7 @@
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.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -48,7 +48,13 @@
@Autowired
private MatService matService;
@Autowired
- private ErpService erpService;
+ private AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ private AgvWorkService agvWorkService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+// @Autowired
+// private ErpService erpService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -104,6 +110,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ locTypeDto.setLocType1(param.getLocType1());
StartupDto dto = null;
switch (param.getIoType()) {
@@ -177,6 +184,9 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
});
// for (Mat mat : mats) {
// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -293,4 +303,44 @@
return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
+ /*
+ 鍥涢」搴撳線AGV琛ヨ揣锛岀敓鎴怉GV鍏ュ簱閫氱煡妗�
+ */
+ @PostMapping("/replenishment")
+ @ResponseBody
+ public R replenishment(@RequestBody ReplenishmentParam param){
+ Date now = new Date();
+ Integer wrkNo = param.getWrkNo();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
+ wrkDetls.forEach(wrkDetl -> {
+ AgvWaitPakin agvWaitPakin = new AgvWaitPakin();
+ BeanUtils.copyProperties(wrkDetl,agvWaitPakin);
+ agvWaitPakin.setIoStatus("Y");
+ agvWaitPakin.setModiTime(now);
+ agvWaitPakin.setAppeTime(now);
+ agvWaitPakinService.insert(agvWaitPakin);
+
+ });
+
+ return R.ok();
+ }
+
+ /*
+ 鐢熸垚AGV宸ヤ綔妗�
+ */
+ @PostMapping("/start")
+ @ResponseBody
+ public R start(@RequestBody ReplenishmentParam param){
+
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",param.getContainerCode());
+
+ //鐢熸垚宸ヤ綔妗�
+ List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
+ agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null);
+
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1