Commit 8a0d2b7f162e1529c23577babbc1f7f7697b2549
1 parent
78ccf8c8
add mes回传接口
Showing
5 changed files
with
43 additions
and
0 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
@@ -90,4 +90,6 @@ public class MesController extends BaseController { | @@ -90,4 +90,6 @@ public class MesController extends BaseController { | ||
90 | Result result = mesService.shipmentMaterial(mesReceiptMaterial, warehouseCode); | 90 | Result result = mesService.shipmentMaterial(mesReceiptMaterial, warehouseCode); |
91 | return result; | 91 | return result; |
92 | } | 92 | } |
93 | + | ||
94 | + | ||
93 | } | 95 | } |
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MaterialInfo.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesShipmentMaterial.java
0 → 100644
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/IMesService.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.wms.api.mes.servuce; | @@ -2,6 +2,7 @@ package org.jeecg.modules.wms.api.mes.servuce; | ||
2 | 2 | ||
3 | import org.jeecg.common.api.vo.Result; | 3 | import org.jeecg.common.api.vo.Result; |
4 | import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial; | 4 | import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial; |
5 | +import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader; | ||
5 | 6 | ||
6 | /** | 7 | /** |
7 | * @author 游杰 | 8 | * @author 游杰 |
@@ -11,4 +12,14 @@ public interface IMesService { | @@ -11,4 +12,14 @@ public interface IMesService { | ||
11 | public Result receiptMaterial(MesReceiptMaterial mesReceiptMaterial, String warehouseCode); | 12 | public Result receiptMaterial(MesReceiptMaterial mesReceiptMaterial, String warehouseCode); |
12 | 13 | ||
13 | public Result shipmentMaterial(MesReceiptMaterial mesMaterial, String warehouseCode); | 14 | public Result shipmentMaterial(MesReceiptMaterial mesMaterial, String warehouseCode); |
15 | + | ||
16 | + /** | ||
17 | + * 回传入库单 | ||
18 | + */ | ||
19 | + public Result backMesReceipt(ReceiptHeader receiptHeader); | ||
20 | + | ||
21 | + /** | ||
22 | + * 回传出库单 | ||
23 | + */ | ||
24 | + public Result backMesShipment(ReceiptHeader receiptHeader); | ||
14 | } | 25 | } |
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
1 | package org.jeecg.modules.wms.api.mes.servuce.impl; | 1 | package org.jeecg.modules.wms.api.mes.servuce.impl; |
2 | 2 | ||
3 | +import com.alibaba.fastjson.JSON; | ||
3 | import com.aliyun.oss.ServiceException; | 4 | import com.aliyun.oss.ServiceException; |
4 | import org.jeecg.common.api.vo.Result; | 5 | import org.jeecg.common.api.vo.Result; |
6 | +import org.jeecg.modules.wms.api.erp.entity.ErpBackReceipt; | ||
5 | import org.jeecg.modules.wms.api.mes.entity.MaterialInfo; | 7 | import org.jeecg.modules.wms.api.mes.entity.MaterialInfo; |
6 | import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial; | 8 | import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial; |
7 | import org.jeecg.modules.wms.api.mes.servuce.IMesService; | 9 | import org.jeecg.modules.wms.api.mes.servuce.IMesService; |
@@ -13,6 +15,10 @@ import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService | @@ -13,6 +15,10 @@ import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService | ||
13 | import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService; | 15 | import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService; |
14 | import org.jeecg.modules.wms.receipt.receiving.domain.Receive; | 16 | import org.jeecg.modules.wms.receipt.receiving.domain.Receive; |
15 | import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService; | 17 | import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService; |
18 | +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader; | ||
19 | +import org.jeecg.utils.StringUtils; | ||
20 | +import org.jeecg.utils.constant.QuantityConstant; | ||
21 | +import org.jeecg.utils.http.OkHttpUtils; | ||
16 | import org.springframework.stereotype.Service; | 22 | import org.springframework.stereotype.Service; |
17 | 23 | ||
18 | import javax.annotation.Resource; | 24 | import javax.annotation.Resource; |
@@ -95,4 +101,14 @@ public class MesServiceImpl implements IMesService { | @@ -95,4 +101,14 @@ public class MesServiceImpl implements IMesService { | ||
95 | 101 | ||
96 | return null; | 102 | return null; |
97 | } | 103 | } |
104 | + | ||
105 | + @Override | ||
106 | + public Result backMesReceipt(TaskHeader taskHeader) { | ||
107 | + return null; | ||
108 | + } | ||
109 | + | ||
110 | + @Override | ||
111 | + public Result backMesShipment(ReceiptHeader receiptHeader) { | ||
112 | + return null; | ||
113 | + } | ||
98 | } | 114 | } |