From e7d8e2c64facfa261e8b168b84e81ef6c835f57d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 09:25:19 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作下线账号
---
src/main/java/com/zy/common/web/WcsController.java | 25 +++++++++++++------------
1 files changed, 13 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 f4534a5..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());
@@ -87,21 +91,11 @@
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())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
- try {
- // 寤惰繜 3 绉掑啀妫�娴�
- Thread.sleep(3000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
@@ -328,6 +322,7 @@
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ long start = System.currentTimeMillis();
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -366,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);
@@ -378,12 +376,14 @@
wrkDetl.setProType(orderDetl.getProType());
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
-// wrkDetl.setLuHao(orderDetl.getLuHao());
- wrkDetl.setWeight(wrkMast.getScWeight());
+ 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)) {
@@ -418,6 +418,7 @@
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ log.info("搴撲綅妫�绱㈣�楁椂: {} ms", System.currentTimeMillis() - start);
return dto;
}
--
Gitblit v1.9.1