From 8a0d2b7f162e1529c23577babbc1f7f7697b2549 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Sat, 14 Jan 2023 16:55:25 +0800
Subject: [PATCH] add mes回传接口
---
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java | 2 ++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MaterialInfo.java | 1 +
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesShipmentMaterial.java | 13 +++++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/IMesService.java | 11 +++++++++++
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java | 16 ++++++++++++++++
5 files changed, 43 insertions(+), 0 deletions(-)
create mode 100644 jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesShipmentMaterial.java
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
index 47c683e..d4f1e4f 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
+++ b/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 {
Result result = mesService.shipmentMaterial(mesReceiptMaterial, warehouseCode);
return result;
}
+
+
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MaterialInfo.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MaterialInfo.java
index 0859f71..b9d6462 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MaterialInfo.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MaterialInfo.java
@@ -9,5 +9,6 @@ public class MaterialInfo {
private String materialCode;
private BigDecimal qty;
+ private int sequence;
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesShipmentMaterial.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesShipmentMaterial.java
new file mode 100644
index 0000000..463ff7d
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesShipmentMaterial.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.wms.api.mes.entity;
+
+import java.util.List;
+
+/**
+ * @author 游杰
+ */
+public class MesShipmentMaterial {
+
+ private String referCode;
+ private String toPort;
+ private List<MaterialInfo> materialInfoList;
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/IMesService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/IMesService.java
index efe4888..ecae1fd 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/IMesService.java
+++ b/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;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
/**
* @author 游杰
@@ -11,4 +12,14 @@ public interface IMesService {
public Result receiptMaterial(MesReceiptMaterial mesReceiptMaterial, String warehouseCode);
public Result shipmentMaterial(MesReceiptMaterial mesMaterial, String warehouseCode);
+
+ /**
+ * 回传入库单
+ */
+ public Result backMesReceipt(ReceiptHeader receiptHeader);
+
+ /**
+ * 回传出库单
+ */
+ public Result backMesShipment(ReceiptHeader receiptHeader);
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
index 5cda275..50d0f73 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.wms.api.mes.servuce.impl;
+import com.alibaba.fastjson.JSON;
import com.aliyun.oss.ServiceException;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.api.erp.entity.ErpBackReceipt;
import org.jeecg.modules.wms.api.mes.entity.MaterialInfo;
import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial;
import org.jeecg.modules.wms.api.mes.servuce.IMesService;
@@ -13,6 +15,10 @@ import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService
import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
+import org.jeecg.utils.http.OkHttpUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -95,4 +101,14 @@ public class MesServiceImpl implements IMesService {
return null;
}
+
+ @Override
+ public Result backMesReceipt(TaskHeader taskHeader) {
+ return null;
+ }
+
+ @Override
+ public Result backMesShipment(ReceiptHeader receiptHeader) {
+ return null;
+ }
}
--
libgit2 0.22.2