From d3c7820992ccfb3296ec031a7c019a4300347b83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 十月 2025 15:30:25 +0800
Subject: [PATCH] 完善erp对接2.0
---
src/main/java/com/zy/asrs/controller/MobileController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5eff674..6520030 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -21,6 +21,7 @@
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import com.zy.third.entity.ExdMaterial;
import com.zy.third.entity.ExdvYanbu;
import com.zy.third.mapper.ExdMaterialMapper;
import lombok.extern.slf4j.Slf4j;
@@ -467,7 +468,7 @@
}
//绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
String rStaNo = "E8";
- if (barcode.substring(0, 1).equals("9")) {
+
String type = "ZONE"; //鍖哄煙
if (barcode.substring(0, 1).equals("9")) {
rStaNo = "E9";
@@ -575,10 +576,8 @@
if (bool) {
return R.ok();
} else {
- return R.error();
+ return R.error(msg);
}
- }
- return R.error();
}
/**
@@ -879,7 +878,10 @@
} else if (sourceStaNo.equals("R02")) {
rcsParam.put("carrierDir", "90");
- } else {
+ } else if(sourceStaNo.substring(0,1).equals("C")){
+ rcsParam.put("carrierDir", "90");
+ }
+ else{
rcsParam.put("carrierDir", "180");
}
@@ -950,13 +952,18 @@
}
R r = R.ok();
+ //闃叉鏈夋湭涓嬫灦鐨勭墿鏂欑洿鎺ヨ繘琛岀┖鏉垮洖搴撴垨鑰呮嫞鏂欏洖搴�
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("wrk_sts", 33));
+ if (!Cools.isEmpty(wrkMast1)) {
+ return R.error("璇ユ墭鐩�="+wrkMast1.getBarcode()+",娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("io_type", 103, 105, 107));
if (wrkMast == null) {
r = FillEmptyPalletsStack(sourceStaNo, staNo);
} else {
if (wrkMast.getWrkSts() > 30) {
- return R.error("璇ユ墭鐩�={},娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
+ return R.error("璇ユ墭鐩�="+wrkMast.getBarcode()+",娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
}
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).in("io_type", 101, 103, 105, 107).lt("wrk_sts", 33));
if (!Cools.isEmpty(wrkMasts)) {
@@ -1006,9 +1013,15 @@
return R.error("鎵规瀵瑰簲鐨勯獙甯冩暟鎹笉瀛樺湪");
}
Mat mat = matService.selectByMatnr(barcode1.getItemnumber());
+ if(Cools.isEmpty(mat.getUuid())) {
+ ExdMaterial fnumber = exdMaterialMapper.getID(barcode1.getItemnumber());
+ mat.setUuid(fnumber.getId());
+ }
mat.setAnfme(barcode1.getQty());
mat.setBc(barcode);
mat.setBatch(barcode1.getBatchno());
+ matService.updateById(mat);
+
return R.ok(mat);
}
--
Gitblit v1.9.1