From a06eb7682556938481810c2ea36477cc42d002b5 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期六, 04 四月 2026 00:04:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a458757..c42d6f7 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -81,10 +81,10 @@
// dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
return R.ok(dto1);
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
- if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
- return R.error("闄愯");
- }
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
+// if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
+// return R.error("闄愯");
+// }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
return R.error("璇峰厛娣诲姞鍏ュ簱閫氱煡妗�");
@@ -126,6 +126,9 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (waitPakins.get(0).getMatnr().equals("emptyPallet")) {
+ locTypeDto.setLocType2((short) 1);
+ }
StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
@@ -434,6 +437,8 @@
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ long startTime = System.currentTimeMillis();
+ try {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -513,6 +518,9 @@
dto.setLocNo(wcsLoc);
dto.setTaskNo(workNo + "");
return dto;
+ } finally {
+ log.info("startupFullPutStore鑰楁椂:{}ms, sourceStaNo:{}, barcode:{}", System.currentTimeMillis() - startTime, devpNo, barcode);
+ }
}
@Transactional
--
Gitblit v1.9.1