From 35553f1448463dcf4664de7afa3da70054e52fab Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 30 七月 2025 13:05:41 +0800
Subject: [PATCH] 三期初始化
---
src/main/java/com/zy/common/web/WcsController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4f616dc..64242a3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -49,7 +49,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
- public R getLocNo(@RequestBody SearchLocParam param) {
+ public synchronized R getLocNo(@RequestBody SearchLocParam param) {
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
@@ -123,11 +123,14 @@
throw new CoolException("鐗╂枡绫诲埆鑾峰彇澶辫触");
}
- StartupDto dto;
+ StartupDto dto=new StartupDto();
if (devpNo == 304) {
dto = commonService.getLocNoBy304(str5.get(0));
+ }if(devpNo == 311){
+ dto = commonService.getLocNoBy311(str5.get(0));
} else {
- dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+// dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+ dto = commonService.getLocNoNew(1, devpNo,barcode);
}
int workNo = dto.getWorkNo();
@@ -158,6 +161,7 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
+ StartupDto finalDto = dto;
pltBarcodes.forEach(elem -> {
matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor(),elem.getMemo()));
@@ -165,7 +169,7 @@
Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())
.eq("bill_no", elem.getBillNo()).eq("seq_no", elem.getSeqNo()).eq("mat_no", elem.getMatNo());
PltBarcode pltBarcode = pltBarcodeService.selectOne(wrapper);
- pltBarcode.setLocNo(dto.getLocNo());
+ pltBarcode.setLocNo(finalDto.getLocNo());
pltBarcode.setIoStatus(1);//鍏ュ簱涓�
pltBarcodeService.update(pltBarcode,wrapper);
});
@@ -197,11 +201,11 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
StartupDto dto;
- if (devpNo >= 300) {
+// if (devpNo >= 300) {
dto = commonService.emptyIngetLocNo(devpNo);
- } else {
- dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
- }
+// } else {
+// dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
+// }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1