From 853a65ae9b42fe890b66ecc3bdb427f69b23d210 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:36:48 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 13 +++++-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 47 ++++++++++++++++++++++-
src/main/java/com/zy/asrs/service/MobileService.java | 22 +++++++++--
4 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 93d7de8..b1f24d1 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -86,9 +86,25 @@
return mobileService.collectionPakin(params, getUserId());
}
+ /**
+ * 鍛煎彨绌烘澘
+ * @author Ryan
+ * @date 2026/4/1 16:24
+ * @param params
+ * @return com.core.common.R
+ */
@PostMapping("/agv/callEmptyCar")
@ManagerAuth
public R pdaAgvFinishedCall(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrgSite())) {
+ return R.error("璧峰搴撳尯涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getTarSite())) {
+ return R.error("鐩爣绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
return mobileService.callEmptyCar(params, getUserId());
}
@@ -223,7 +239,7 @@
* @version 1.0
*/
@PostMapping("/cache/out/call")
- @ApiOperation("鍛煎彨AGV鎼繍/缂撳瓨鍑哄簱")
+ @ApiOperation("鍛煎彨AGV鎼繍")
@ManagerAuth
public R OutCallAgv(@RequestBody AgvCallParams params) {
if (Objects.isNull(params)) {
@@ -373,7 +389,6 @@
return mobileService.getEmptyOutStock(params);
}
-
/**
*
* 鑾峰彇鎹嗗寘鍑哄簱鏄庣粏
@@ -389,6 +404,15 @@
return mobileService.getAllBindInfo(params);
}
+ @ManagerAuth(memo = "鑾峰彇鍙版墍鏈夋槑缁�")
+ @RequestMapping("/agv/tc/all")
+ public R getTCAllMatnrs(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params) || Cools.isEmpty(params.getCarBarcode())) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getTcAllInfos(params);
+ }
+
@ManagerAuth(memo = "纭鍙拌溅鍑哄簱")
@RequestMapping("/confirm/all/out")
public R confirmAllOut(@RequestBody AgvCallParams params) {
@@ -396,7 +420,24 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return mobileService.outStockByTc(params);
+ }
+ @ManagerAuth(memo = "鑾峰彇绔欑偣瑙ｇ粦淇℃伅")
+ @RequestMapping("/site/unbind")
+ public R getStationInfos(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params) || Objects.isNull(params.getCarBarcode())) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getStationInfos(params);
+ }
+
+ @ManagerAuth(memo = "绔欑偣鐗╂枡瑙ｇ粦")
+ @RequestMapping("/unbind/site/matnr")
+ public R unbindMatnr(@RequestBody CombParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.unbindMatnr(params);
}
@ApiOperation("纭鎹嗗寘鍑哄簱")
@@ -426,6 +467,8 @@
}
+
+
@ManagerAuth(memo = "缂撳啿搴撶‘璁や笂鏋�(妯℃嫙鐗╃悊鎸夐挳)")
@RequestMapping("/cache/comb/pub")
public R cacheCombPub(@RequestBody CompleteParam combParam) {
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 381d7c2..2a5e995 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -3,6 +3,7 @@
import com.core.common.Cools;
import lombok.Data;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -10,7 +11,7 @@
* Created by vincent on 2020/6/18
*/
@Data
-public class LocDetlAdjustParam {
+public class LocDetlAdjustParam implements Serializable {
// 搴撲綅鍙�
private String locNo;
@@ -30,10 +31,16 @@
// 鍙樻洿鏁伴噺
private Double count;
- public LocDetlAdjust(String matnr, String batch, Double count) {
+ private String suppCode;
+
+ private String boxType1;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String suppCode, String boxType1) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
+ this.suppCode = suppCode;
+ this.boxType1 = boxType1;
}
}
@@ -52,7 +59,7 @@
}
}
if (!exit) {
- copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount()));
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getSuppCode(), adjust.getBoxType1()));
}
}
list = copyList;
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index e75cc71..f29820e 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -215,11 +215,25 @@
R getEmptyOutStock(AgvCallParams params);
/**
- * 鎸夊彴杞﹀嚭搴�
- * @author Ryan
- * @date 2026/3/28 8:40
+ * 鑾峰彇鍑哄簱鍖哄彴杞︽墍鏈変俊鎭�
* @param params
- * @return com.core.common.R
+ * @return
*/
+ R getTcAllInfos(AgvCallParams params);
+
R outStockByTc(AgvCallParams params);
+
+ /**
+ * 鑾峰彇绔欑偣鏄庣粏淇℃伅
+ * @param params
+ * @return
+ */
+ R getStationInfos(AgvCallParams params);
+
+ /**
+ * 绔欑偣鐗╂枡瑙ｇ粦
+ * @param params
+ * @return
+ */
+ R unbindMatnr(CombParam params);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 1ac3184..dd38ffb 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -61,7 +61,6 @@
.eq(!Cools.isEmpty(locNo),"loc_no", locNo)
.eq(!Cools.isEmpty(locNo),"matnr", matnr)
// .eq(!Cools.isEmpty(locNo),"batch", batch)
- .eq(!Cools.isEmpty(brand),"brand", brand)
.eq(!Cools.isEmpty(standby1),"standby1", standby1)
// .eq(!Cools.isEmpty(standby2),"standby2", standby2)
// .eq(!Cools.isEmpty(standby3),"standby3", standby3)
@@ -73,6 +72,7 @@
return false;
}
if (anfme <= 0 && locDetl.getDiffQty().compareTo(BigDecimal.ZERO) == 0) {
+// return this.baseMapper.delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr).eq("supp_code", standby1)) > 0;
return this.baseMapper.deleteItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0;
} else {
return baseMapper.updateAnfme(anfme, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0;
--
Gitblit v1.9.1