From 0c79b5072495ad34c3a408e4b5a9e39de4e1a741 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 22 八月 2024 11:00:30 +0800
Subject: [PATCH] 出库代码
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/req/IdReq.java | 17 ++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ViewLocDetlMapper.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 34 +++++++++++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 46 ++++++++++++++++++++++-
zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java | 4 +-
7 files changed, 97 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
index a2b6d08..26fbee4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.controller;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.controller.req.IdReq;
import com.zy.asrs.wms.asrs.controller.req.OutReq;
import com.zy.asrs.wms.asrs.entity.LocDetl;
import com.zy.asrs.wms.asrs.manage.OutManage;
@@ -16,6 +17,9 @@
/**
* 杩欓噷澶勭悊鎵�鏈夌殑鍑哄簱娴佺▼鐨勬帴鍙�
+ * 鍑哄簱閫昏緫涓昏鍦ㄦ煡璇㈠尮閰嶇殑搴撳瓨淇℃伅锛�
+ * 1. 鑾峰彇搴撳瓨锛屾牴鎹潯浠讹紙鐏垫椿閰嶇疆锛夋煡璇㈠簱瀛橈紝杩斿洖缁欏墠绔緵鐢ㄦ埛閫夋嫨锛堣繑鍥炴椂锛屾瘡鏉″簱瀛樿褰曡鎼哄甫loc_detl琛ㄧ殑涓婚敭id锛岃繖鏍风珛鍗冲嚭搴擄紝鍙浼犻�抣oc_detl琛╥d+鏁伴噺锛屽氨鍙互鏄庣‘鍑哄簱鍑哄摢浜涙暟鎹簡锛屼笉闇�瑕佷簩娆″尮閰嶏級
+ * 2. 鍑哄簱锛堝彧闇�瑕佷竴涓帴鍙ｏ紙鍗�/out/start鎺ュ彛锛夛紝鍙搴撲綅璇︽儏鐨刬d鍜屽嚭搴撴暟閲忎互鍙婂嚭搴撳埌鍝釜绔欑偣锛夛紙浠ュ強娑夊強鍒扮Щ搴擄級
*/
@RestController
@RequestMapping("/api")
@@ -32,20 +36,44 @@
* @return
*/
@PostMapping("/out/getStock")
- public R page(@RequestBody Map<String, Object> map) {
- List<LocDetl> suitableMat = outManage.getSuitableMat(map);
+ public R getStock(@RequestBody Map<String, Object> map) {
+ List<LocDetl> suitableMat = outManage.listSuitableMat(map);
return R.ok(suitableMat);
}
+ /**
+ * 鑾峰彇搴撳瓨
+ *
+ * @param order
+ * @return
+ */
+ @PostMapping("/out/getStockByOrder")
+ public R getStockByOrder(@RequestBody IdReq order) {
+ List<LocDetl> suitableMat = outManage.listSuitableMatByOrder(order.getId());
+ return R.ok(suitableMat);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨
+ *
+ * @param wave
+ * @return
+ */
+ @PostMapping("/out/getStockByWave")
+ public R getStockByWave(@RequestBody IdReq wave) {
+ List<LocDetl> suitableMat = outManage.listSuitableMatByWave(wave.getId());
+ return R.ok(suitableMat);
+ }
/**
* 鍑哄簱
+ * 鍑哄簱鍙渶瑕佷竴涓帴鍙ｏ紝鍙鍑哄埌鍝釜绔欑偣锛屽簱浣嶅嚭澶氬皯鏁伴噺锛屽嵆OutReq瀵硅薄
*
* @param outReq 鍑哄簱鍒楄〃
* @return
*/
@PostMapping("/out/start")
- public R page(@RequestBody OutReq outReq) {
+ public R start(@RequestBody OutReq outReq) {
outManage.out(outReq);
return R.ok();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/req/IdReq.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/req/IdReq.java
new file mode 100644
index 0000000..db76f88
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/req/IdReq.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.wms.asrs.controller.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class IdReq implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ private Long id;
+
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index bb1e025..b84d50a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -5,6 +5,8 @@
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,6 +20,8 @@
*/
@Service
public class OutManage {
+
+ private static Logger logger = LoggerFactory.getLogger(LocManage.class);
@Autowired
private TaskService taskService;
@@ -38,6 +42,11 @@
private WorkService workService;
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
/**
@@ -45,7 +54,7 @@
*
* @param map
*/
- public List<LocDetl> getSuitableMat(Map<String, Object> map) {
+ public List<LocDetl> listSuitableMat(Map<String, Object> map) {
List<FieldParam> param = new ArrayList<>();
map.entrySet().stream().filter(entry -> entry.getValue() != null).forEach(entry -> {
FieldParam fieldParam = new FieldParam();
@@ -55,7 +64,40 @@
});
//TODO 杩欓噷鍔犱笂鍑哄簱瑙勫垯
- List<LocDetl> stock = locDetlService.getSuitableMat(param, null);
+ List<LocDetl> stock = locDetlService.listSuitableMat(param, null);
+ return stock;
+ }
+
+ /**
+ * 鏍规嵁璁㈠崟id鑾峰彇搴撳瓨
+ *
+ * @param orderId 璁㈠崟ID
+ */
+ public List<LocDetl> listSuitableMatByOrder(Long orderId) {
+ Order order = orderService.getById(orderId);
+ List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId);
+ //TODO 杩欓噷鍔犱笂鍑哄簱瑙勫垯
+ for (OrderDetl orderDetl : orderDetls) {
+
+ }
+ List<FieldParam> param = new ArrayList<>();
+
+
+ List<LocDetl> stock = locDetlService.listSuitableMat(param, null);
+ return stock;
+ }
+
+ /**
+ * 鏍规嵁璁㈠崟id鑾峰彇搴撳瓨
+ *
+ * @param waveId 璁㈠崟ID
+ */
+ public List<LocDetl> listSuitableMatByWave(Long waveId) {
+
+ List<FieldParam> param = new ArrayList<>();
+
+
+ List<LocDetl> stock = locDetlService.listSuitableMat(param, null);
return stock;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ViewLocDetlMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ViewLocDetlMapper.java
index ed0c5b5..503084d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ViewLocDetlMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ViewLocDetlMapper.java
@@ -23,6 +23,6 @@
Map<String,Object> getById(Long id);
- List<Map<String,Object>> getSuitableMat( @Param("param") List<FieldParam> param, @Param("sortParam") List<FieldSortParam> sortParam);
+ List<Map<String,Object>> listSuitableMat( @Param("param") List<FieldParam> param, @Param("sortParam") List<FieldSortParam> sortParam);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
index c569982..cba2bb2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
@@ -21,6 +21,6 @@
List<LocDetl> parseLocDetl(List<LocDetl> list);
- List<LocDetl> getSuitableMat( List<FieldParam> param, List<FieldSortParam> sortParam);
+ List<LocDetl> listSuitableMat( List<FieldParam> param, List<FieldSortParam> sortParam);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
index d8aaacc..7a13a1a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -95,8 +95,8 @@
* @return
*/
@Override
- public List<LocDetl> getSuitableMat( List<FieldParam> param, List<FieldSortParam> sortParam) {
- List<Map<String, Object>> stock = viewLocDetlMapper.getSuitableMat(param, sortParam);
+ public List<LocDetl> listSuitableMat( List<FieldParam> param, List<FieldSortParam> sortParam) {
+ List<Map<String, Object>> stock = viewLocDetlMapper.listSuitableMat(param, sortParam);
List<LocDetl> locDetls = new ArrayList<>();
for (Map<String, Object> objectMap : stock) {
LocDetl detl = JSON.parseObject(JSON.toJSONString(objectMap), LocDetl.class);
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
index 505c629..a4f852b 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/ViewLocDetlMapper.xml
@@ -38,7 +38,7 @@
- <select id="getSuitableMat" resultType="map">
+ <select id="listSuitableMat" resultType="map">
select * from view_man_loc_detl ld
where 1=1
<if test="param!=null and param.size()>0">
--
Gitblit v1.9.1