From fffcf8f632eb551f11d018184547ce01dcc4907f Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 23 十二月 2024 08:13:58 +0800
Subject: [PATCH] 完善erp上报流程
---
src/main/java/com/zy/common/web/WcsController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 113b666..3def9f9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -116,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();
@@ -144,7 +144,7 @@
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(@RequestParam("crnNo") Integer crnNo) {
+ public R autoEmptyOut(@RequestParam("crnNo") Integer crnNo,@RequestParam("staNo") Integer staNo) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "D")
.eq("crn_no", crnNo)
@@ -176,6 +176,7 @@
ArrayList<String> locNos = new ArrayList<>();
locNos.add(locMast0.getLocNo());
emptyPlateOutParam.setLocNos(locNos);
+ emptyPlateOutParam.setOutSite(staNo);
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
@@ -190,7 +191,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
int rowCount = rowLastnoService.selectCount(null);
Integer integer = 2;
for (int i = 1; i <= rowCount; i++) {
@@ -202,7 +204,7 @@
}
}
- StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null,0, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -293,7 +295,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