From 41254cb6289ac8f52b03c3526d73993211b37309 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 16 四月 2026 15:46:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 33 +++++++++++++++++++++------------
1 files changed, 21 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 1124064..c527dc6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -92,7 +92,7 @@
String threeCode = param.getBarcode();
param.setBarcode(barcode);
//瀹為檯绉伴噸鏁伴噺
- Double m = param.getWeight() -2.45;
+ Double m = param.getWeight() -2.4;
WrkMast wrkMast1 = wrkMastService.selectByBarcode(barcode);
@@ -104,7 +104,7 @@
String s = Utils.WMSLocToWCSLoc(wrkMast1.getLocNo());
dto1.setLocNo(s);
dto1.setCrnNo(wrkMast1.getCrnNo());
- dto1.setWorkNo(wrkMast1.getWrkNo());
+ dto1.setTaskNo(wrkMast1.getWrkNo());
dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
return R.ok(dto1);
}
@@ -125,17 +125,26 @@
}
m=m*mat.getVolume();
- //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
- Config config = configService.selectConfigByCode("SimulationInbound");
- if (config != null && config.getValue().equals("Y")) {
- WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakin1)) {
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
- if (waitPakin != null) {
- waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
- }
- }
+ Double currentStock = locDetlService.getSumAnfme(matnr);
+ if (currentStock == null) {
+ currentStock = 0D;
}
+ if (mat.getStoreMax() != null && currentStock + m > mat.getStoreMax()) {
+ log.info("WCS鍏ュ簱鎷︽埅: 鐗╂枡瓒呰繃搴撳瓨涓婇檺, matnr={}, currentStock={}, inboundQty={}, storeMax={}",
+ matnr, currentStock, m, mat.getStoreMax());
+ return R.error("鐗╂枡宸插埌杈句笂闄愮姝㈠叆搴�");
+ }
+ //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
+// Config config = configService.selectConfigByCode("SimulationInbound");
+// if (config != null && config.getValue().equals("Y")) {
+// WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+// if (Cools.isEmpty(waitPakin1)) {
+// WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
+// if (waitPakin != null) {
+// waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
+// }
+// }
+// }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
--
Gitblit v1.9.1