From 45333415b7634fc20b03b7e8ae3b7eee91101bda Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 07 十二月 2023 10:48:31 +0800
Subject: [PATCH] 增加筛选条件
---
src/main/java/com/zy/common/web/WcsController.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 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 213dc39..b50cb8c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -51,6 +51,10 @@
private AgvWaitPakinService agvWaitPakinService;
@Autowired
private AgvWorkService agvWorkService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
// @Autowired
// private ErpService erpService;
@@ -297,7 +301,7 @@
throw new CoolException(CodeRes.NONE_DETL_900);
}
// 妫�绱㈠簱浣�
- List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMaktx).distinct().collect(Collectors.toList());
+ List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
@@ -311,13 +315,14 @@
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);
-
+ if(!Cools.isEmpty(wrkDetl.getSuppCode()) && Cools.isEmpty(agvWaitPakinService.selectByContainerCode(wrkDetl.getSuppCode()))){
+ AgvWaitPakin agvWaitPakin = new AgvWaitPakin();
+ BeanUtils.copyProperties(wrkDetl,agvWaitPakin);
+ agvWaitPakin.setIoStatus("Y");
+ agvWaitPakin.setModiTime(now);
+ agvWaitPakin.setAppeTime(now);
+ agvWaitPakinService.insert(agvWaitPakin);
+ }
});
return R.ok();
@@ -330,13 +335,38 @@
@ResponseBody
public R start(@RequestBody ReplenishmentParam param){
+ String containerCode = param.getContainerCode();
+ if(Cools.isEmpty(containerCode)){
+ throw new CoolException("鏂欑鐮佷负绌�");
+ }
+
+ if(!Character.isDigit(containerCode.charAt(0))){
+ containerCode = containerCode.substring(3,containerCode.length());
+ }
+
+ AgvBasDevp agvBasDevp = agvBasDevpService.getByDevNo(param.getDevNo());
+
+ if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
+ throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
+ }
+ if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ throw new CoolException("璇ユ枡绠变綅缁勬墭");
+ }
+
+ //鍘绘壘agv宸ヤ綔妗ｄ换鍔�
+ if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)))){
+ throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
+ }
//缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
-
- //agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+ //鐢熸垚宸ヤ綔妗�
+ List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
+ agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
return R.ok();
}
+
}
--
Gitblit v1.9.1