From cdfb6025516e43275982780291b4c5bd866bd9d7 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 25 七月 2025 09:24:16 +0800
Subject: [PATCH] #erp对接修改
---
src/main/java/com/zy/common/web/WcsController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 00a4bf2..ba10177 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -75,6 +75,10 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ if (countWrk > 0) {
+ return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
+ }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -86,10 +90,6 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
if (countLoc > 0) {
return R.error("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
- }
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countWrk > 0) {
- return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
}
}
if (Cools.isEmpty(param.getLocType1())) {
@@ -105,7 +105,7 @@
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -321,7 +321,8 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ long start = System.currentTimeMillis();
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -347,6 +348,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
+ wrkMast.setScWeight(weight);
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
@@ -359,6 +361,9 @@
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
+ wrkDetl.setProType(waitPakin.getProType());
+ wrkDetl.setTemp2(waitPakin.getTemp2());
+ wrkDetl.setWeight(wrkMast.getScWeight());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -372,10 +377,13 @@
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
wrkDetl.setLuHao(orderDetl.getLuHao());
+ wrkDetl.setSupp(orderDetl.getSupp());
+ wrkDetl.setSuppCode(orderDetl.getSuppCode());
wrkDetl.setPacking(orderDetl.getPacking());
wrkDetl.setColor(orderDetl.getColor());
wrkDetl.setWareId(orderDetl.getWareId());
wrkDetl.setWareName(orderDetl.getWareName());
+ wrkDetl.setTemp1(orderDetl.getTemp1());
}
}
if (!wrkDetlService.insert(wrkDetl)) {
@@ -386,6 +394,7 @@
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
WaitPakin setParam = new WaitPakin();
+ setParam.setWeight(weight);//灏嗘暣鎵橀噸閲忚鍏ラ�氱煡妗�
setParam.setLocNo(dto.getLocNo());
setParam.setIoStatus("Y");
setParam.setModiTime(now);
@@ -409,6 +418,7 @@
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ log.info("搴撲綅妫�绱㈣�楁椂: {} ms", System.currentTimeMillis() - start);
return dto;
}
--
Gitblit v1.9.1