1. 增加ERP、MES 的接口处理

肖超群
1 parent dddeae2b
Showing 22 changed files with 623 additions and 57 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/api/api.js
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpBackReceipt.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpBackShipment.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpReceiptDetail.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/InventorySummary.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/service/IErpService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mes/entity/MesMaterial.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/entity/Material.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/monitor/job/ErpTask.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/monitor/job/RyTask.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -167,6 +167,10 @@ export const listShipmentByShipmentDetailId = (params)=&gt;postAction(&#39;/shipment/sh
 export const getInventoryFromShipmentDetail = (params)=>postAction('/shipment/shipmentCombination/getInventoryFromShipmentDetail', params);
 //配盘
 export const combination = (params)=>postAction('/shipment/shipmentCombination/combination', params);
+//回传入库单
+export const backErpReceipt = (params)=>postAction('/receipt/receiptHeader/backErpReceipt', params);
+//回传出库单
+export const backErpShipment = (params)=>postAction('/shipment/shipmentHeader/backErpShipment', params);
 // 中转HTTP请求
 export const transitRESTful = {
@@ -164,11 +164,6 @@
             dataIndex: 'name'
           },
           {
-            title:'货主编码',
-            align:"center",
-            dataIndex: 'companyCode'
-          },
-          {
             title:'规格',
             align:"center",
             dataIndex: 'spec'
@@ -161,13 +161,17 @@
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'receiptHeader:edit'" @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
+            <a>回传</a>
+          </a-popconfirm>
           <a v-if="record.lastStatus < 800" @click="receive(record)">组盘</a>
           <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
+               <a-menu-item v-has="'receiptHeader:edit'">
+                  <a @click="handleEdit(record)">编辑</a>
+               </a-menu-item>
               <a-menu-item v-has="'receiptHeader:delete'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -201,7 +205,7 @@
   import '@/assets/less/TableExpand.less'
   import {getCompanyList} from '@/api/api'
   import {getReceiptTypeList} from '@/api/api'
-  import {getSupplierList} from '@/api/api'
+  import {getSupplierList, backErpReceipt} from '@/api/api'
   import ReceiveModal from "./modules/ReceiveModal";
@@ -414,6 +418,16 @@
         fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
         this.superFieldList = fieldList
       },
+      hanleBack(record) {
+        backErpReceipt(record).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+          } else {
+            that.$message.warning(res.message);
+          }
+          this.searchQuery();
+        });
+      },
       loadFrom() {
         getCompanyList().then((res) => {
           if (res.success) {
@@ -166,7 +166,9 @@
         </template>
         <span slot="action" slot-scope="text, record">
-          <a-divider type="vertical" />
+           <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
+            <a>回传</a>
+          </a-popconfirm>
           <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)">自动配盘</a>
           <a-divider type="vertical" />
           <a v-has="'shipmentHeader:edit'" @click="handleEdit(record)">编辑</a>
@@ -205,7 +207,7 @@
   import ShipmentDetailList from './ShipmentDetailList'
   import {initDictOptions,filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import '@/assets/less/TableExpand.less'
-  import {getCompanyList} from '@/api/api'
+  import {getCompanyList, backErpShipment} from '@/api/api'
   import {getShipmentTypeList} from '@/api/api'
   import {getCustomerList} from '@/api/api'
   import {autoCombination} from '@/api/api'
@@ -373,6 +375,16 @@
         this.selectedRowKeys = selectedRowKeys;
         this.selectionRows = selectionRows;
       },
+      hanleBack(record) {
+        backErpShipment(record).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+          } else {
+            that.$message.warning(res.message);
+          }
+          this.searchQuery();
+        });
+      },
       loadFrom() {
         getCompanyList().then((res) => {
           if (res.success) {
@@ -24,9 +24,9 @@ import lombok.Data;
 @TableName("sys_quartz_job")
 public class QuartzJob implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
 	private java.lang.String id;
 	/**创建人*/
 	private java.lang.String createBy;
@@ -9,12 +9,10 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceiptDetail;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceiptHeader;
-import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
+import org.jeecg.modules.wms.api.erp.entity.*;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.api.wcs.entity.WarecellDomain;
+import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
 import org.jeecg.modules.wms.framework.controller.BaseController;
 import org.jeecg.utils.StringUtils;
@@ -41,13 +39,7 @@ public class ErpController extends BaseController {
     @ApiLogger(apiName = "入库单下发", from="ERP")
     public Result receipt(@RequestBody ErpReceipt erpReceipt, HttpServletRequest req) {
        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
-       Result result =  handleMultiProcess("receipt", new JeecgController.MultiProcessListener() {
-            @Override
-            public Result doProcess() {
-                return erpService.receipt(erpReceipt, warehouseCode);
-            }
-        });
-        return result;
+       return erpService.receipt(erpReceipt, warehouseCode);
     }
     @PostMapping("/cancelReceipt")
@@ -56,13 +48,7 @@ public class ErpController extends BaseController {
     public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
         String referCode = param.get("referCode");
         String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
-        Result result =  handleMultiProcess("cancelReceipt", new JeecgController.MultiProcessListener() {
-            @Override
-            public Result doProcess() {
-                return erpService.cancelReceipt(referCode, warehouseCode);
-            }
-        });
-        return result;
+        return erpService.cancelReceipt(referCode, warehouseCode);
     }
@@ -95,4 +81,27 @@ public class ErpController extends BaseController {
         });
         return result;
     }
+
+    @PostMapping("/searchInventory")
+    @ResponseBody
+    @ApiLogger(apiName = "查询库存", from="ERP")
+    public Result searchInventory(@RequestBody InventoryQueryParam inventoryQueryParam, HttpServletRequest req) {
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  erpService.searchInventory(inventoryQueryParam);
+        return result;
+    }
+
+    @PostMapping("/addMaterial")
+    @ResponseBody
+    @ApiLogger(apiName = "增加物料", from="ERP")
+    public Result addMaterial(@RequestBody Material material, HttpServletRequest req) {
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  handleMultiProcess("addMaterial", new JeecgController.MultiProcessListener() {
+            @Override
+            public Result doProcess() {
+                return erpService.addMaterial(material, warehouseCode);
+            }
+        });
+        return result;
+    }
 }
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
+
+import java.util.List;
+
+/**
+ * @author 游杰
+ */
+@Data
+public class ErpBackReceipt {
+
+    private ReceiptHeader receiptHeader;
+    private List<ReceiptDetail> receiptDetailList;
+
+}
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
+
+import java.util.List;
+
+@Data
+public class ErpBackShipment {
+
+    private ShipmentHeader shipmentHeader;
+    private List<ShipmentDetail> shipmentDetailList;
+
+}
@@ -16,6 +16,22 @@ public class ErpReceiptDetail {
     private String materialCode;
     /**
+     * 物料名称
+     */
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    private String materialSpec;
+
+    /**
+     * 物料单位
+     */
+    private String materialUnit;
+
+
+    /**
      * 单据数量
      */
     private BigDecimal qty;
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InventorySummary {
+
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+    /**
+     * 仓库
+     */
+    private String warehouseCode;
+    /**
+     * 货主
+     */
+    private String companyCode;
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+    /**
+     * 锁定数量
+     */
+    private BigDecimal taskQty;
+    /**
+     * 可用数量
+     */
+    private BigDecimal availQty;
+}
@@ -4,16 +4,49 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
 import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
 import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
+import org.jeecg.modules.wms.config.material.entity.Material;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
 public interface IErpService {
+    /**
+     * 下发入库单
+     */
     public Result receipt(ErpReceipt erpReceipt, String warehouseCode);
+    /**
+     * 取消入库单
+     */
     public Result cancelReceipt(String referCode, String warehouseCode);
+    /**
+     * 取消出库单
+     */
     public Result shipment(ErpShipment erpShipment, String warehouseCode);
+    /**
+     * 取消出库单
+     */
     public Result cancelShipment(String referCode, String warehouseCode);
+    /**
+     * 查询库存
+     */
     public Result searchInventory(InventoryQueryParam inventoryQueryParam);
+
+    /**
+     * 增加物料信息
+     */
+    public Result addMaterial(Material material, String warehouseCode);
+
+    /**
+     * 回传入库单
+     */
+    public Result backReceipt(ReceiptHeader receiptHeader);
+
+    /**
+     * 回传出库单
+     */
+    public Result backShipment(ShipmentHeader shipmentHeader);
 }
 package org.jeecg.modules.wms.api.erp.service.impl;
+import com.alibaba.fastjson.JSON;
 import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.api.erp.entity.*;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
+import org.jeecg.modules.wms.config.address.service.IAddressService;
 import org.jeecg.modules.wms.config.company.entity.Company;
 import org.jeecg.modules.wms.config.company.service.ICompanyService;
 import org.jeecg.modules.wms.config.material.entity.Material;
@@ -24,12 +26,17 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailServ
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
+import org.jeecg.utils.http.OkHttpUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 /**
  * @author 游杰
@@ -53,10 +60,13 @@ public class ErpServiceImpl implements IErpService {
     private IShipmentDetailService shipmentDetailService;
     @Resource
     private IInventoryDetailService inventoryDetailService;
+    @Resource
+    private IAddressService addressService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result receipt(ErpReceipt erpReceipt, String warehouseCode) {
+        boolean success = false;
         if(StringUtils.isEmpty(warehouseCode)) {
             return  Result.error("入库单下发，仓库编码为空");
         }
@@ -112,6 +122,9 @@ public class ErpServiceImpl implements IErpService {
         for(ErpReceiptDetail erpReceiptDetail : erpReceiptDetailList) {
             BigDecimal qty = erpReceiptDetail.getQty();
             String materialCode = erpReceiptDetail.getMaterialCode();
+            String materialName = erpReceiptDetail.getMaterialName();
+            String materialSpec = erpReceiptDetail.getMaterialSpec();
+            String materialUnit = erpReceiptDetail.getMaterialUnit();
             String inventoryStatus = erpReceiptDetail.getInventoryStatus();
             String batch = erpReceiptDetail.getBatch();
             String lot = erpReceiptDetail.getLot();
@@ -134,7 +147,17 @@ public class ErpServiceImpl implements IErpService {
             receiptDetail.setQty(qty);
             Material material = materialService.getMaterialByCode(materialCode);
             if(material == null) {
-                throw new ServiceException("入库单下发, 没有找到物料信息" + materialCode);
+                material = new Material();
+                material.setCode(materialCode);
+                material.setName(materialName);
+                material.setWarehouseCode(warehouseCode);
+                material.setSpec(materialSpec);
+                material.setUnit(materialUnit);
+                material.setEnable(QuantityConstant.STATUS_ENABLE);
+                success = materialService.save(material);
+                if(!success) {
+                    throw new ServiceException("入库单下发, 保存物料失败");
+                }
             }
             receiptDetail.setInventoryStatus(inventoryStatus);
             receiptDetail.setMaterialCode(materialCode);
@@ -144,12 +167,12 @@ public class ErpServiceImpl implements IErpService {
             receiptDetail.setBatch(batch);
             receiptDetail.setLot(lot);
             receiptDetail.setProject(project);
-            boolean success = receiptDetailService.save(receiptDetail);
+            success = receiptDetailService.save(receiptDetail);
             if(!success) {
                 throw new ServiceException("入库单下发, 保存入库单详情失败");
             }
         }
-        boolean success = receiptHeaderService.updateReceiptHeader(receiptHeader.getId());
+        success = receiptHeaderService.updateReceiptHeader(receiptHeader.getId());
         if(!success) {
             throw new ServiceException("入库单下发, 更新入库单失败");
         }
@@ -177,6 +200,7 @@ public class ErpServiceImpl implements IErpService {
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result shipment(ErpShipment erpShipment, String warehouseCode) {
         if(StringUtils.isEmpty(warehouseCode)) {
             return  Result.error("出库单下发，仓库编码为空");
@@ -317,7 +341,137 @@ public class ErpServiceImpl implements IErpService {
         if(inventoryDetailList.size() == 0) {
             return Result.error("没有找到对应库存");
         }
-        return Result.ok(inventoryDetailList);
+        for(InventoryDetail inventoryDetail: inventoryDetailList){
+            BigDecimal numQty = BigDecimal.ZERO;
+            BigDecimal numTaskQty = BigDecimal.ZERO;
+            for (InventoryDetail t:inventoryDetailList){
+                if(inventoryDetail.getWarehouseCode().equals(t.getWarehouseCode()) &&
+                        inventoryDetail.getCompanyCode().equals(t.getCompanyCode()) &&
+                        inventoryDetail.getMaterialCode().equals(t.getMaterialCode())){
+                    numQty = numQty.add(t.getQty());
+                    numTaskQty = numTaskQty.add(t.getTaskQty());
+                    inventoryDetail.setQty(numQty);
+                    inventoryDetail.setTaskQty(numTaskQty);
+                }
+            }
+        }
+        List<InventoryDetail> materialSummaryList = new ArrayList<>();
+        inventoryDetailList.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(
+                        Comparator.comparing(
+                                inventoryMaterialSummary ->
+                                        inventoryMaterialSummary.getCompanyCode() + ";" + inventoryMaterialSummary.getMaterialCode() + ";"  + inventoryMaterialSummary.getWarehouseCode()))),
+                ArrayList::new))
+                .forEach(list -> materialSummaryList.add(list));
+        List<InventorySummary> inventorySummaryList = new ArrayList<>();
+        for(InventoryDetail inventoryDetail : materialSummaryList) {
+            InventorySummary inventorySummary = new InventorySummary();
+            inventorySummary.setWarehouseCode(inventoryDetail.getWarehouseCode());
+            inventorySummary.setCompanyCode(inventoryDetail.getCompanyCode());
+            inventorySummary.setMaterialCode(inventoryDetail.getMaterialCode());
+            BigDecimal availQty = inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty());
+            inventorySummary.setQty(inventoryDetail.getQty());
+            inventorySummary.setTaskQty(inventoryDetail.getTaskQty());
+            inventorySummary.setAvailQty(availQty);
+            inventorySummaryList.add(inventorySummary);
+        }
+        return Result.ok(inventorySummaryList);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result addMaterial(Material material, String warehouseCode) {
+        if(StringUtils.isEmpty(material.getCode())){
+            return Result.error("增加物料失败, 物料编码不能为空!!");
+        }
+        if(StringUtils.isEmpty(material.getName())){
+            return Result.error("增加物料失败, 物料名称不能为空!!");
+        }
+        if(StringUtils.isEmpty(warehouseCode)){
+            return Result.error("增加物料失败, 仓库编码不能为空!!");
+        }
+
+        Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+        if(warehouse == null) {
+            return Result.error("增加物料失败, 仓库为空!!");
+        }
+        material.setWarehouseCode(warehouseCode);
+        material.setEnable(QuantityConstant.STATUS_ENABLE);
+        Material material1 = materialService.getMaterialByCode(material.getCode());
+        if(material1 != null) {
+            return Result.error("增加物料失败, 物料已经存在!!");
+        }
+        boolean success = materialService.save(material);
+        if(!success) {
+            throw new ServiceException("增加物料失败, 保存时报错");
+        }
+        return Result.error("增加物料成功");
+    }
+
+    @Override
+    public Result backReceipt(ReceiptHeader receiptHeader) {
+        if(receiptHeader == null) {
+            return Result.error("回传入库单, 入库单为空!!");
+        }
+        List<ReceiptDetail> receiptDetailList = receiptDetailService.
+                selectByMainId(String.valueOf(receiptHeader.getId()));
+        if(receiptDetailList.size() == 0) {
+            return Result.error("回传入库单, 入库单详情为空!!");
+        }
+        String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_ERP_BACK_RECEIPT);
+        ErpBackReceipt erpBackReceipt = new ErpBackReceipt();
+        erpBackReceipt.setReceiptHeader(receiptHeader);
+        erpBackReceipt.setReceiptDetailList(receiptDetailList);
+        String jsonParam = JSON.toJSONString(erpBackReceipt);
+        System.out.println(jsonParam);
+        String body = OkHttpUtils.bodypost(url, jsonParam);
+        if(StringUtils.isEmpty(body)) {
+            throw new ServiceException("接口地址错误或返回为空");
+        }
+        Result result = JSON.parseObject(body, Result.class);
+        if(result.getCode() != QuantityConstant.HTTP_OK) {
+            return Result.error(result.getMsg());
+        }
+        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
+        boolean success = receiptHeaderService.updateById(receiptHeader);
+        if(!success) {
+            throw new ServiceException("回传入库单失败, 更新入库单头失败");
+        }
+        return Result.ok("回传入库单成功");
+    }
+
+    @Override
+    public Result backShipment(ShipmentHeader shipmentHeader) {
+        if(shipmentHeader == null) {
+            return Result.error("回传出库单, 出库单为空!!");
+        }
+        List<ShipmentDetail> shipmentDetailList = shipmentDetailService.
+                selectByMainId(String.valueOf(shipmentHeader.getId()));
+        if(shipmentDetailList.size() == 0) {
+            return Result.error("回传出库单, 出库单详情为空!!");
+        }
+        String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_ERP_BACK_SHIPMENT);
+        ErpBackShipment erpBackShipment = new ErpBackShipment();
+        erpBackShipment.setShipmentHeader(shipmentHeader);
+        erpBackShipment.setShipmentDetailList(shipmentDetailList);
+        String jsonParam = JSON.toJSONString(erpBackShipment);
+        System.out.println(jsonParam);
+        String body = OkHttpUtils.bodypost(url, jsonParam);
+        if(StringUtils.isEmpty(body)) {
+            throw new ServiceException("接口地址错误或返回为空");
+        }
+        Result result = JSON.parseObject(body, Result.class);
+        if(result.getCode() != QuantityConstant.HTTP_OK) {
+            return Result.error(result.getMsg());
+        }
+        shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+        shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
+        boolean success = shipmentHeaderService.updateById(shipmentHeader);
+        if(!success) {
+            throw new ServiceException("回传出库单失败, 更新出库单头失败");
+        }
+        return Result.ok("回传出库单成功");
     }
+package org.jeecg.modules.wms.api.mes.controller;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
+import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
+import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
+import org.jeecg.modules.wms.api.erp.service.IErpService;
+import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
+import org.jeecg.modules.wms.framework.controller.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @author 游杰
+ */
+@RestController
+@RequestMapping("/API/WMS/mes")
+public class MesController extends BaseController {
+
+    @Resource
+    private IErpService erpService;
+
+    @PostMapping("/receipt")
+    @ResponseBody
+    @ApiLogger(apiName = "入库单下发", from="ERP")
+    public Result receipt(@RequestBody ErpReceipt erpReceipt, HttpServletRequest req) {
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        return erpService.receipt(erpReceipt, warehouseCode);
+    }
+
+    @PostMapping("/cancelReceipt")
+    @ResponseBody
+    @ApiLogger(apiName = "取消入库单", from="ERP")
+    public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
+        String referCode = param.get("referCode");
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        return erpService.cancelReceipt(referCode, warehouseCode);
+    }
+
+
+    @PostMapping("/shipment")
+    @ResponseBody
+    @ApiLogger(apiName = "出库单下发", from="ERP")
+    public Result shipment(@RequestBody ErpShipment erpShipment, HttpServletRequest req) {
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  handleMultiProcess("shipment", new JeecgController.MultiProcessListener() {
+            @Override
+            public Result doProcess() {
+                return erpService.shipment(erpShipment, warehouseCode);
+            }
+        });
+        return result;
+    }
+
+
+    @PostMapping("/cancelShipment")
+    @ResponseBody
+    @ApiLogger(apiName = "取消出库单", from="ERP")
+    public Result cancelShipment(@RequestBody Map<String, String> param, HttpServletRequest req) {
+        String referCode = param.get("referCode");
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  handleMultiProcess("cancelShipment", new JeecgController.MultiProcessListener() {
+            @Override
+            public Result doProcess() {
+                return erpService.cancelShipment(referCode, warehouseCode);
+            }
+        });
+        return result;
+    }
+
+    @PostMapping("/searchInventory")
+    @ResponseBody
+    @ApiLogger(apiName = "查询库存", from="ERP")
+    public Result searchInventory(@RequestBody InventoryQueryParam inventoryQueryParam, HttpServletRequest req) {
+        Result result =  erpService.searchInventory(inventoryQueryParam);
+        return result;
+    }
+
+
+}
+package org.jeecg.modules.wms.api.mes.entity;
+
+import java.math.BigDecimal;
+
+public class MesMaterial {
+
+    private String materialCode;
+    private BigDecimal qty;
+    
+
+}
@@ -368,18 +368,12 @@ public class WcsServiceImpl implements  WcsService {
             throw new ServiceException("下发任务时，容器没有找到");
         }
-//        String zoneCode = container.getZoneCode();
-//        if(StringUtils.isEmpty(zoneCode)) {
-//            throw new ServiceException("下发任务时，库区编码为空");
-//        }
         String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_CONNECT_WCS);
         if(StringUtils.isEmpty(value)) {
             throw new ServiceException("下发任务时，没有找到连接WCS的数据配置");
         }
         int connectWCS = Integer.parseInt(value);
         if (connectWCS == QuantityConstant.RULE_WCS_CONNECT) {
-//            String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TASK_ASSIGN,
-//                    warehouseCode, zoneCode);
             String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TASK_ASSIGN);
             wcsTask = switchTaskTypeToWcs(wcsTask);
             String jsonParam = JSON.toJSONString(wcsTask);
@@ -389,7 +383,7 @@ public class WcsServiceImpl implements  WcsService {
                 throw new ServiceException("接口地址错误或返回为空");
             }
             Result result = JSON.parseObject(body, Result.class);
-            if(result.getCode() == QuantityConstant.HTTP_OK) {
+            if(result.getCode() != QuantityConstant.HTTP_OK) {
                 return Result.error(result.getMsg());
             }
         }
@@ -111,7 +111,7 @@ public class Material implements Serializable {
 	@Excel(name = "可用状态", width = 15, dicCode = "enable_status")
 	@Dict(dicCode = "enable_status")
     @ApiModelProperty(value = "可用状态")
-    private String enable;
+    private Integer enable;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+package org.jeecg.modules.wms.monitor.job;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.jeecg.modules.wms.api.erp.service.IErpService;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
+import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
+import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
+import org.jeecg.utils.constant.QuantityConstant;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 定时回传ERP
+ * @author 游杰
+ */
+
+@Slf4j
+public class ErpTask implements Job {
+
+    @Resource
+    private IReceiptHeaderService receiptHeaderService;
+    @Resource
+    private IShipmentHeaderService shipmentHeaderService;
+    @Resource
+    private IErpService erpService;
+    //并发控制
+    Map<String, Boolean> runningTaskMap = new HashMap<>();
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        String taskKey = "erpBack";
+        if(MapUtils.getBoolean(runningTaskMap, taskKey, false)) {
+            return;
+        }
+        try {
+            runningTaskMap.put(taskKey, true);
+            LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+            receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED)
+                    .eq(ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED);
+            List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderLambdaQueryWrapper);
+            for (ReceiptHeader receiptHeader : receiptHeaderList) {
+                try {
+                    erpService.backReceipt(receiptHeader);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+            shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED)
+                    .eq(ShipmentHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED);
+            List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
+            for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
+                try {
+                    erpService.backShipment(shipmentHeader);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            runningTaskMap.put(taskKey, false);
+        }
+    }
+}
+package org.jeecg.modules.wms.monitor.job;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
+import org.jeecg.utils.constant.QuantityConstant;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 定时任务
+ */
+
+@Slf4j
+public class RyTask implements Job {
+
+    //并发控制
+    Map<String, Boolean> runningTaskMap = new HashMap<>();
+    @Resource
+    private ITaskHeaderService taskHeaderService;
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        log.info(String.format(" Jeecg-Boot 执行任务!  时间:" + DateUtils.getTimestamp()));
+        String taskKey = "executeTask";
+        if(MapUtils.getBoolean(runningTaskMap, taskKey, false)) {
+            return;
+        }
+        try {
+            runningTaskMap.put(taskKey, true);
+            LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+            taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD);
+            List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
+            for(TaskHeader taskHeader : taskHeaderList) {
+                try {
+                    taskHeaderService.sendTaskToWcs(taskHeader.getId());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            runningTaskMap.put(taskKey, false);
+        }
+    }
+}
@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.config.material.service.IMaterialService;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
@@ -67,6 +68,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
 	private IReceiptDetailService receiptDetailService;
 	@Resource
 	private IMaterialService materialService;
+	@Resource
+	private IErpService erpService;
 	/*---------------------------------主表处理-begin-------------------------------------*/
@@ -335,5 +338,17 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     /*--------------------------------子表处理-入库单详情-end----------------------------------------------*/
-
+	 /**
+	  *  回传入库单
+	  * @param receiptHeader
+	  * @return
+	  */
+	 @AutoLog(value = "回传入库单")
+	 @ApiOperation(value="回传入库单", notes="回传入库单")
+	 @RequiresPermissions("receiptHeader:back")
+	 @RequestMapping(value = "/backErpReceipt", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> backErpReceipt(@RequestBody ReceiptHeader receiptHeader) {
+		 Result result = erpService.backReceipt(receiptHeader);
+		 return result;
+	 }
 }
@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
@@ -20,6 +21,8 @@ import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.ModelAndView;
@@ -59,6 +62,8 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
 	@Autowired
 	private IShipmentDetailService shipmentDetailService;
+	@Resource
+	private IErpService erpService;
 	/*---------------------------------主表处理-begin-------------------------------------*/
@@ -327,5 +332,17 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
-
+	 /**
+	  *  回传出库单
+	  * @param shipmentHeader
+	  * @return
+	  */
+	 @AutoLog(value = "回传出库单")
+	 @ApiOperation(value="回传出库单", notes="回传出库单")
+	 @RequiresPermissions("shipmentHeader:back")
+	 @RequestMapping(value = "/backErpShipment", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> backErpShipment(@RequestBody ShipmentHeader shipmentHeader) {
+		 Result result = erpService.backShipment(shipmentHeader);
+		 return result;
+	 }
 }
@@ -382,20 +382,18 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
 	 @PostMapping( "/execute")
 	 @RequiresPermissions("taskHeader:executeTask")
 	 public Result execute(@RequestBody  TaskHeader taskHeader) {
-		 {
-			 if (taskHeader == null) {
-				 return Result.error("taskHeader不能为空");
-			 }
-			 Integer taskId = taskHeader.getId();
-			 Result result = handleMultiProcess("execute", new MultiProcessListener() {
-				 @Override
-				 public Result doProcess() {
-					 Result result = taskHeaderService.sendTaskToWcs(taskId);
-					 return result;
-				 }
-			 });
-			 return result;
+		 if (taskHeader == null) {
+			 return Result.error("taskHeader不能为空");
 		 }
+		 Integer taskId = taskHeader.getId();
+		 Result result = handleMultiProcess("execute", new MultiProcessListener() {
+			 @Override
+			 public Result doProcess() {
+				 Result result = taskHeaderService.sendTaskToWcs(taskId);
+				 return result;
+			 }
+		 });
+		 return result;
 	 }
 	 /**
@@ -426,6 +426,13 @@ public class QuantityConstant {
     public static final String ADDRESS_AGV_TASK_UPDATE = "AGV_TASK_UPDATE";
     //ERP
+
+    //回传ERP入库单
+    public static final String ADDRESS_ERP_BACK_RECEIPT = "ERP_BACK_RECEIPT";
+    //回传ERP出库单
+    public static final String ADDRESS_ERP_BACK_SHIPMENT = "ERP_BACK_SHIPMENT";
+
+
     public static final String PLATFORM_CODING = "赋码系统";
     public static final String PLATFORM_ERP = "ERP";
     public static final String PLATFORM_WMS = "WMS";