From 8e50919bbf442ed17f4d75aa55786e3acb07304c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 07 三月 2026 09:18:01 +0800
Subject: [PATCH] 组托时没有入库通知档的数据，自动生成空托盘数据入库
---
src/main/java/com/zy/common/web/WcsController.java | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 30f438b..a4d3b9e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -56,14 +56,11 @@
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
- }
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
List<WaitPakin> waitPakins = null;
- if (param.getIoType() == 1) {
+
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
@@ -73,14 +70,32 @@
if (wrkMast != null && wrkMast.getIoType() == 103) {
return R.parse(CodeRes.PICK_600);
}
- return R.parse(CodeRes.NO_COMB_700);
+ Date now = new Date();
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.setMatnr("emptyPallet");
+ waitPakin.setBatch("");
+ waitPakin.setAnfme(1D);
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakin.setIoStatus("N");
+ waitPakin.setStatus("Y");
+ waitPakin.setAppeUser(9999L);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(9999L);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ return R.error("鑷姩鐢熸垚鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(waitPakins)) {
+ return R.error("鑷姩鐢熸垚鍏ュ簱閫氱煡妗ｅ悗鏈煡璇㈠埌鏁版嵁");
+ }
+ log.info("WCS鍏ュ簱鎺ュ彛鑷姩鐢熸垚鍏ュ簱閫氱煡妗�, zpallet:{}, matnr:{}, anfme:{}", param.getBarcode(), "32149", 1D);
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
if (countLoc > 0 || countWrk > 0) {
return R.error(CodeRes.EXIST_500);
}
- }
if (Cools.isEmpty(param.getLocType1())){
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -125,15 +140,18 @@
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
+ if(sourceStaNo.getWrkNo() == 0 && sourceStaNo.getDevNo() != 2033){
+ return R.error("绔欑偣宸ヤ綔鍙蜂笉瀛樺湪");
+ }
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-
+ param.setIoType(10);
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
case 10://绌烘墭鐩樺叆搴�
- dto = startupFullPutStoreAgv(param.getSourceStaNo(), param.getBarcode(), locTypeDto);
+ dto = startupFullPutStoreAgv(param.getSourceStaNo(), param.getBarcode(), locTypeDto,param.getOutArea());
break;
// dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
// break;
@@ -256,18 +274,21 @@
}
return workNo;
}
- @PostMapping("/auto/銆�" +
- "TransplantingOut/v1")
+ @PostMapping("/auto/TransplantingOut/v1")
@ResponseBody
public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
// 婧愮珯鐐圭姸鎬佹娴�
// BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true);
WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode());
-// if(sourceStaNo ==null ){
+// if(sourceStaNo ==null )hnagbao1{
// return R.error("璇ョ珯鐐圭洏鐐圭Щ鏍借鍙紝璇锋煡鐪嬫簮绔欑偣鐘舵�佹娴�");
// }
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
+ }
+ WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",9997));
+ if(wrkMast2 != null){
+ throw new CoolException("瀛樺湪9997鐩樼偣绉绘牻浠诲姟");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
Date now = new Date();
@@ -318,6 +339,10 @@
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
+ WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",9996));
+ if(wrkMast2 != null){
+ throw new CoolException("瀛樺湪9996鐩樼偣绉绘牻浠诲姟");
+ }
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
Date now = new Date();
@@ -360,15 +385,19 @@
* 鍏ㄦ澘鍏ュ簱AGV
*/
@Transactional
- public StartupDto startupFullPutStoreAgv(Integer devpNo, String barcode, LocTypeDto locTypeDto) {
+ public StartupDto startupFullPutStoreAgv(Integer devpNo, String barcode, LocTypeDto locTypeDto,Integer outArea) {
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
+ findLocNoAttributeVo.setOutArea(outArea);
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
// 鏇存柊鐩爣搴撲綅鐘舵��
Date now = new Date();
+ if(dto == null){
+ throw new CoolException("鏈壘鍒板簱浣�");
+ }
LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
--
Gitblit v1.9.1