From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料
---
src/main/java/com/zy/common/web/WcsController.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4946169..6a7ec60 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -43,7 +43,7 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private LocDetlService locDetlService;
+ private LocDetlService locDetlService;
@Autowired
private PltBarcodeService pltBarcodeService;
@@ -66,20 +66,21 @@
if (Cools.isEmpty(pltBarcodes)) {
return R.error("鏉＄爜鏈粍鎵橈細" + param.getBarcode());
}
- 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) {
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
}
}
- if (Cools.isEmpty(param.getLocType1())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- if (Cools.isEmpty(sourceStaNo)){
+ if (Cools.isEmpty(sourceStaNo)) {
return R.error("鍏ュ簱绔欑偣涓嶅瓨鍦�");
}
sourceStaNo.setLocType1(param.getLocType1());
@@ -123,11 +124,14 @@
throw new CoolException("鐗╂枡绫诲埆鑾峰彇澶辫触");
}
- StartupDto dto;
+ StartupDto dto = new StartupDto();
if (devpNo == 304) {
dto = commonService.getLocNoBy304(str5.get(0));
+ } else 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,34 +162,35 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
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()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(), elem.getSource(), elem.getVendor(), elem.getMemo()));
//鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱涓�
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);
+ pltBarcodeService.update(pltBarcode, wrapper);
});
wrkDetlService.createWorkDetail(workNo, matDtos, barcode, null);
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@@ -197,11 +202,11 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
StartupDto dto;
- if (devpNo >= 300) {
- dto = commonService.emptyIngetLocNo(devpNo);
- } else {
- dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
- }
+// if (devpNo >= 300) {
+ dto = commonService.emptyIngetLocNo(devpNo);
+// } else {
+// dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
+// }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -230,19 +235,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
--
Gitblit v1.9.1