From 94e4a7598d2ed0bee320174bcd44a3844d59cc0d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 19:25:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 46005e3..5c5fe37 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -115,7 +116,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 10, 12, null,null,null,0, locTypeDto,0);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -143,17 +144,42 @@
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts", "D"));
- if (Cools.isEmpty(locMast)) {
+ public R autoEmptyOut(@RequestParam("crnNo") Integer crnNo) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "D")
+ .eq("crn_no", crnNo)
+ .orderBy("lev1,bay1,row1"));
+ if (locMasts.isEmpty()) {
return R.error("搴撳瓨娌℃湁绌烘澘");
}
- EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
- emptyPlateOutParam.setOutSite(12);
- emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
- WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
- return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+
+ for (LocMast locMast : locMasts) {
+ LocMast locMast0 = null;
+ List<String> outerLocNo = Utils.getGroupLocNo(locMast.getLocNo(), false);
+ for (String loc : outerLocNo) {
+ LocMast locMast1 = locMastService.selectByLoc(loc);
+ if (locMast1 == null) {
+ continue;
+ }
+
+ if (locMast1.getLocSts().equals("D")) {
+ locMast0 = locMast1;
+ break;
+ }
+ }
+
+ if (locMast0 == null) {
+ continue;
+ }
+
+ EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
+ ArrayList<String> locNos = new ArrayList<>();
+ locNos.add(locMast0.getLocNo());
+ emptyPlateOutParam.setLocNos(locNos);
+ WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
+ return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ }
+ return R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触");
}
/**
@@ -176,7 +202,7 @@
}
}
- StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null,0, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -206,12 +232,17 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
+ String uuid = String.valueOf(System.currentTimeMillis());
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setUuid(uuid);
+ wrkDetl.setWeight(waitPakin.getWeight());
+ wrkDetl.setOwner(waitPakin.getOwner());
+ wrkDetl.setPayment(waitPakin.getPayment());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -262,7 +293,7 @@
}
}
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1