From 50eb871e7dfcf064639cc15e53573baf28e60f26 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 12 三月 2026 17:45:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 607bd5b..1124064 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -62,6 +62,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ StartupDto dto = null;
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
@@ -75,7 +76,7 @@
//3S19000677895,M22003772,3 ,KP, 0A2030 ,0A2030202306050023
//3S绠辩爜鍙� ,绔瓙鐗╂枡鍙� ,鏁伴噺,鍗曚綅,渚涘簲鍟嗙紪鍙�,渚涘簲鍟嗘壒娆″彿
//鏁伴噺鍜岄噸閲忚浆鎹㈠嚭鏉ョ殑鏄惁宸笉澶�
- //weight 涓� 43.39 鍘荤毊2.35 = 41.05
+ //weight 涓� 43.39 鍘荤毊2.45 = 40.95
//鎵樼洏鐮佷緥瀛� 845000820308,M11000787,1000,MT,0A1263,0A126320260120
//鎹㈢畻闇�瑕�41.05*24.36绾︾瓑浜�1000
if (Cools.isEmpty(param.getBarcode())) {
@@ -91,8 +92,22 @@
String threeCode = param.getBarcode();
param.setBarcode(barcode);
//瀹為檯绉伴噸鏁伴噺
- Double m = param.getWeight() -2.35;
+ Double m = param.getWeight() -2.45;
+
+ WrkMast wrkMast1 = wrkMastService.selectByBarcode(barcode);
+ if (!Cools.isEmpty(wrkMast1)&&wrkMast1.getWrkSts()==2) {
+ StartupDto dto1 =new StartupDto();
+ dto1.setBarcode(barcode);
+ dto1.setSourceStaNo(Integer.valueOf(wrkMast1.getSourceStaNo()));
+ dto1.setStaNo(Integer.valueOf(wrkMast1.getStaNo()));
+ String s = Utils.WMSLocToWCSLoc(wrkMast1.getLocNo());
+ dto1.setLocNo(s);
+ dto1.setCrnNo(wrkMast1.getCrnNo());
+ dto1.setWorkNo(wrkMast1.getWrkNo());
+ dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
+ return R.ok(dto1);
+ }
Mat mat = matService.selectByMatnr(matnr);
if(mat==null){
log.info("娌℃湁鎵惧埌璇ョ墿鏂欐。妗�--"+matnr+"缁勬墭鏃惰嚜鍔ㄦ柊澧炵墿鏂欙紝榛樿24.36KG/M");
@@ -132,6 +147,7 @@
waitPakin.setZpallet(param.getBarcode());
waitPakin.setAnfme(m);
waitPakin.setThreeCode(threeCode);
+ waitPakins.add(waitPakin);
waitPakinService.insert(waitPakin);
}else {
for(WaitPakin waitPakin : waitPakins){
@@ -148,7 +164,9 @@
if(Cools.isEmpty(waitPakin.getBeBatch())||waitPakin.getBeBatch()!=1){
flag = true;
}
- if (flag && (weight - m < -2.0 || weight - m > 2.0)) {
+ //2.5KG * 姣忓叕鏂ら暱搴� = 璇樊鍊�
+ Double dou= 2.5*mat.getVolume();
+ if (flag && (weight - m < -dou || weight - m > dou)) {
return R.error("浜岀淮鐮�="+threeCode+"鐨勭墿鏂欏疄闄呯О閲嶈浆鎹㈡垚鐨勭背鏁板拰鐗╂枡鏍囩鎻愪緵鐨勭背鏁扮浉宸緝澶ч渶瑕侀��鍥炴垨鑰呮爣璁板悗鎵嶈兘鍏ュ簱锛�");
}
@@ -167,7 +185,6 @@
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
--
Gitblit v1.9.1