From 224e8d3b57fecf5a904ffa06ef0bb8b646d73a29 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 21 十一月 2025 09:28:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e40f6f4..cb895b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -217,10 +217,15 @@
if (orgBigDecimal.compareTo(adjustBigDecimal) == 0){
continue;
}
- manLocDetl1.setAnfme(adjustBigDecimal.doubleValue());
- if (!manLocDetlService.update(manLocDetl1,manLocDetlEntityWrapper)){
- throw new CoolException("鏇存柊鏁版嵁澶辫触");
+ if (adjustBigDecimal.compareTo(BigDecimal.ZERO) == 0){
+ manLocDetlService.delete(manLocDetlEntityWrapper);
+ }else {
+ manLocDetl1.setAnfme(adjustBigDecimal.doubleValue());
+ if (!manLocDetlService.update(manLocDetl1,manLocDetlEntityWrapper)){
+ throw new CoolException("鏇存柊鏁版嵁澶辫触");
+ }
}
+
@@ -233,24 +238,24 @@
BasDevp basDevp = basDevpMapper.selectById(inSta);
// 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
- Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
+ Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103,104, 107, 110);
switch (inSta) {
case "1040":
- wrapper.in("source_sta_no", "1043", "1044");
+ wrapper.in("source_sta_no", "1043", "1044","1048");
break;
case "2010":
- wrapper.in("source_sta_no", "2013", "2014");
+ wrapper.in("source_sta_no", "2013", "2014","2018");
break;
case "2000":
- wrapper.in("source_sta_no", "2003", "2004");
+ wrapper.in("source_sta_no", "2003", "2004","2008");
break;
case "3010":
- wrapper.in("source_sta_no", "3013", "3014");
+ wrapper.in("source_sta_no", "3013", "3014","3018");
break;
case "1000":
case "1035":
- wrapper.in("source_sta_no", "1024", "1028");
+ wrapper.in("source_sta_no", "1024", "1028","1031");
break;
default:
}
@@ -332,7 +337,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","3"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
jsonObject.put("indBind","0"); // 1缁戝畾锛�0瑙ｇ粦
@@ -606,7 +611,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","3"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
jsonObject.put("indBind","1"); // 1缁戝畾锛�0瑙ｇ粦
@@ -1663,6 +1668,45 @@
return R.ok();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R lineCall2(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));
+
+ if (Cools.isEmpty(orgAgvSite)) {
+ return R.error("绔欑偣鏁版嵁閿欒");
+ }
+
+
+ WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(5L);
+ wrkMastService.updateById(wrkMast);
+ }
+
+ //鏇存柊org绔欑偣鐘舵��
+ orgAgvSite.setStatus(0);
+ orgAgvSite.setWorkNo(null);
+ if (!agvSiteService.updateById(orgAgvSite)){
+ throw new CoolException("婧愮珯鏇存柊澶辫触");
+ }
+
+
+
+// 鍛煎彨agv
+ boolean success = sendAgvTask(orgSite, tarSite,"GT7");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
public void uploadErp(InventoryErpParam param){
String response = "";
--
Gitblit v1.9.1