feat: 换站任务创建时接收MES的JSON字符串保存，任务完成回传时再返回MES

pengyongcheng
1 parent 59ea08d3
Showing 12 changed files with 159 additions and 36 deletions
src/main/java/com/huaheng/api/mes/controller/MesController.java
src/main/java/com/huaheng/api/mes/domain/MesOverStationDto.java
src/main/java/com/huaheng/api/mes/domain/MesReturn.java
src/main/java/com/huaheng/api/mes/service/MesService.java
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
src/main/java/com/huaheng/common/constant/QuantityConstant.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -3,6 +3,7 @@ package com.huaheng.api.mes.controller;
 import com.huaheng.api.mes.domain.*;
 import com.huaheng.api.mes.service.MesService;
 import com.huaheng.common.constant.QuantityConstant;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.web.controller.BaseController;
@@ -31,7 +32,7 @@ public class MesController extends BaseController {
  
     /**
      * 生成空托盘入库任务
-     * 7 料点呼叫移走空容器
+     * 7 料点呼叫移走空载具
      *
      * @return
      */
@@ -277,6 +278,42 @@ public class MesController extends BaseController {
     }
  
     /**
+     * 工位之间载具流转 11
+     *
+     * @return
+     */
+    @PostMapping("/overStation")
+    @ApiOperation("MES载具流转")
+    @ApiLogger(apiName = "MES载具流转", from = "MES")
+    public AjaxResult overStation(@RequestBody MesOverStationDto mesOverStationDto) {
+        String containerCode = mesOverStationDto.getContainerCode();
+        String starPort = mesOverStationDto.getStartPort();
+        String endPort = mesOverStationDto.getEndPort();
+        String taskNo = mesOverStationDto.getTaskNo();
+        String vehicleCode = mesOverStationDto.getVehicleCode();
+        String orderCode = mesOverStationDto.getOrderCode();
+        if (StringUtils.isEmpty(containerCode)) {
+            return AjaxResult.error("containerCode 为空");
+        }
+        if (StringUtils.isEmpty(starPort)) {
+            return AjaxResult.error("startPort 为空");
+        }
+        if (StringUtils.isEmpty(endPort)) {
+            return AjaxResult.error("endPort 为空");
+        }
+        if (StringUtils.isEmpty(taskNo)) {
+            return AjaxResult.error("taskNo 为空");
+        }
+        if (StringUtils.isEmpty(vehicleCode)) {
+            return AjaxResult.error("vehicleCode 为空");
+        }
+        if (StringUtils.isEmpty(orderCode)) {
+            return AjaxResult.error("orderCode 为空");
+        }
+        return handleMultiProcess(() -> mesService.createOverStation(mesOverStationDto));
+    }
+
+    /**
      * MES物料入库
      * 6 料点呼叫移走物料
      *
@@ -505,15 +542,15 @@ public class MesController extends BaseController {
     }
  
     /**
-     * 空容器入库出库回传
+     * 工位之间载具流转回传
      */
-    @PostMapping("/backEmpty")
+    @PostMapping("/backChangeStation")
     @ResponseBody
-    @ApiLogger(from = "WMS", to = "MES", apiName = "空容器任务回传")
+    @ApiLogger(from = "WMS", to = "MES", apiName = "工位之间载具流转回传")
     public AjaxResult backEmpty(String id) {
         if (StringUtils.isEmpty(id)) {
-            return AjaxResult.error("id不能为空");
+            return AjaxResult.error("任务id不能为空");
         }
-        return mesService.backEmpty(id);
+        return mesService.backChangeStation(id);
     }
 }
+package com.huaheng.api.mes.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesOverStationDto extends MesShipmentProduct implements Serializable {
+
+    /**
+     * 接收MES传来的某些信息，字段先随便写
+     */
+    private String temp;
+}
@@ -6,16 +6,68 @@ import java.util.List;
  
 @Data
 public class MesReturn {
+    /**
+     * 任务号
+     */
     private String taskNo;
+
+    /**
+     * 任务状态
+     */
     private Integer taskStatus;
+
+    /**
+     * 工单号
+     */
     private String orderCode;
+
+    /**
+     * 领料单号
+     */
     private String shipmentReferCode;
+
+    /**
+     * 载具类型编码
+     */
     private String containerTypeCode;
+
+    /**
+     * 载具编码
+     */
     private String containerCode;
+
+    /**
+     * 料点编码。入库时代表fromPort，出库时代表toPort
+     */
     private String toPort;
+
+    /**
+     * 盛具编码
+     */
     private String vehicleCode;
+
+    /**
+     * 盛具类型编码
+     */
     private String vehicleTypeCode;
+
+    /**
+     * x轴最大列
+     */
     private Integer maxX;
+
+    /**
+     * y轴最大列
+     */
     private Integer maxY;
+
+    /**
+     * 物料信息
+     */
     private List<MaterialData> materialDataList;
+
+    /**
+     * 接收MES传来的某些信息，字段先随便写
+     */
+    private String temp;
 }
@@ -59,4 +59,9 @@ public interface MesService {
     List<InventoryDetail> lockRawInventory(List<InventoryDetail> inventoryList,
                                            MesOrderMaterial mesOrderMaterial,
                                            MesShipmentOrder mesShipmentOrder);
+
+    /**
+     * 载具工位之间流转
+     */
+    AjaxResult createOverStation(MesOverStationDto mesOverStationDto);
 }
@@ -351,6 +351,20 @@ public class MesServiceImpl implements MesService {
         return invList;
     }
  
+    @Override
+    public AjaxResult createOverStation(MesOverStationDto mesOverStationDto) {
+        Container container = containerService.getContainerByCode(mesOverStationDto.getContainerCode());
+        Vehicle vehicle = vehicleService.getVehicleByCode(mesOverStationDto.getVehicleCode());
+        String fromPort = mesOverStationDto.getStartPort();
+        String toPort = mesOverStationDto.getEndPort();
+        String temp = mesOverStationDto.getTemp();
+        boolean success = taskHeaderService.createOverStationTask(container, vehicle, fromPort, toPort, temp);
+        if (!success){
+            throw new ServiceException("换站失败，创建换站任务失败");
+        }
+        return AjaxResult.success("创建换站任务成功");
+    }
+
     public List<ShipmentDetail> crateShipmentDetailByInventory(List<InventoryDetail> invList,
                                                                ShipmentHeader shipmentHeader,
                                                                MesOrderMaterial mesOrderMaterial, MesShipmentOrder mesShipmentOrder) {
@@ -518,7 +532,7 @@ public class MesServiceImpl implements MesService {
         //原材料、半成品入库 没有入库单，需手动生成入库单。余料退库不生成入库单
         mesService.receiptOrder(mesOrder);
         // 新建保存组盘头表记录
-        // 根据容器编码查询组盘表头记录
+        // 根据载具编码查询组盘表头记录
         LambdaQueryWrapper<ReceiptContainerHeader> lambda = Wrappers.lambdaQuery();
         lambda.eq(ReceiptContainerHeader::getContainerCode, mesReceipt.getContainerCode())
                 .eq(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_BUILD);
@@ -826,10 +840,13 @@ public class MesServiceImpl implements MesService {
         List<MaterialData> materialDataList = new ArrayList<>();
         taskDetailList.forEach(taskDetail -> {
             MaterialData materialData = new MaterialData();
-            materialData.setIsMaterial(StringUtils.isEmpty(taskDetail.getOrderCode()));
+            materialData.setIsMaterial(taskDetail.getIsMaterial());
             materialData.setMaterialCode(taskDetail.getMaterialCode());
             materialData.setQty(taskDetail.getQty());
             materialData.setTracingNo(taskDetail.getTracingNo());
+            materialData.setSupplierCode(taskDetail.getSupplierCode());
+            materialData.setTracingNo(taskDetail.getTracingNo());
+            materialData.setBatch(taskDetail.getBatch());
 //            materialData.setSequence();
             materialData.setLocationNoX(taskDetail.getLocationNoX());
             materialData.setLocationNoY(taskDetail.getLocationNoY());
@@ -851,12 +868,12 @@ public class MesServiceImpl implements MesService {
         vehicleTypeQueryWrapper.eq(VehicleType::getCode, mesReturn.getVehicleTypeCode());
         VehicleType vehicleType = vehicleTypeService.getOne(vehicleTypeQueryWrapper);
         if (StringUtils.isNull(vehicleType)) {
-            throw new ServiceException(StringUtils.format("不存在盛具编码: {}", mesReturn.getVehicleTypeCode()));
+            throw new ServiceException(StringUtils.format("出库回传失败，不存在盛具编码: {}", mesReturn.getVehicleTypeCode()));
         }
         mesReturn.setMaxX(vehicleType.getMaxX());
         mesReturn.setMaxY(vehicleType.getMaxY());
         mesReturn.setMaterialDataList(materialDataList);
-        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES_BACK_TASK, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
+        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
         String jsonParam = JSON.toJSONString(mesReturn);
         ResponseEntity<JSONObject> result = RestUtil.request_post(url, QuantityConstant.DEFAULT_WAREHOUSE, jsonParam);
         if (result != null && result.getBody() != null) {
@@ -905,6 +922,8 @@ public class MesServiceImpl implements MesService {
             details.setIsMaterial(detail.getIsMaterial());
             details.setQty(detail.getQty());
             details.setTracingNo(detail.getTracingNo());
+            details.setBatch(detail.getBatch());
+            details.setSupplierCode(detail.getSupplierCode());
             details.setMaterialCode(detail.getMaterialCode());
             lst.add(details);
         }
@@ -922,7 +941,7 @@ public class MesServiceImpl implements MesService {
         mesReturn.setVehicleCode(header.getVehicleCode());
         mesReturn.setVehicleTypeCode(header.getVehicleTypeCode());
         mesReturn.setMaterialDataList(lst);
-        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES_BACK_TASK, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
+        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
         String jsonParam = JSON.toJSONString(mesReturn);
         ResponseEntity<JSONObject> result = RestUtil.request_post(url, QuantityConstant.DEFAULT_WAREHOUSE, jsonParam);
         if (result != null && result.getBody() != null) {
@@ -948,17 +967,17 @@ public class MesServiceImpl implements MesService {
         TaskHeader taskHeader = taskHeaderService.getById(id);
         Container container = containerService.getContainerByCode(taskHeader.getContainerCode(), QuantityConstant.DEFAULT_WAREHOUSE);
         if (StringUtils.isNull(container)) {
-            throw new ServiceException("空容器入出库时，没有找到载具: ".concat(taskHeader.getContainerCode()));
+            throw new ServiceException("回传空载具入出库时，没有找到载具: ".concat(taskHeader.getContainerCode()));
         }
         Vehicle vehicle = vehicleService.getVehicleByCode(taskHeader.getVehicleCode(), QuantityConstant.DEFAULT_WAREHOUSE);
         if (StringUtils.isNull(vehicle)) {
-            throw new ServiceException("空容器入出库时，没有找到盛具: ".concat(taskHeader.getVehicleCode()));
+            throw new ServiceException("回传空载具入出库时，没有找到盛具: ".concat(taskHeader.getVehicleCode()));
         }
         LambdaQueryWrapper<VehicleType> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(VehicleType::getCode, taskHeader.getVehicleType());
         VehicleType vehicleType = vehicleTypeService.getOne(queryWrapper);
         if (StringUtils.isNull(vehicle)) {
-            throw new ServiceException("空容器入出库时，没有找到盛具类型: ".concat(taskHeader.getVehicleType()));
+            throw new ServiceException("回传空载具入出库时，没有找到盛具类型: ".concat(taskHeader.getVehicleType()));
         }
         MesReturn mesReturn = new MesReturn();
         mesReturn.setTaskNo(taskHeader.getTaskNo());
@@ -976,7 +995,7 @@ public class MesServiceImpl implements MesService {
         mesReturn.setVehicleTypeCode(taskHeader.getVehicleType());
         mesReturn.setMaxX(vehicleType.getMaxX());
         mesReturn.setMaxY(vehicleType.getMaxY());
-        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES_BACK_TASK, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
+        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
         String jsonParam = JSON.toJSONString(mesReturn);
         ResponseEntity<JSONObject> result = RestUtil.request_post(url, QuantityConstant.DEFAULT_WAREHOUSE, jsonParam);
         if (result != null && result.getBody() != null) {
@@ -988,7 +1007,6 @@ public class MesServiceImpl implements MesService {
         } else {
             throw new ServiceException("接口地址错误或返回为空");
         }
-        taskHeader.setUserDef2(QuantityConstant.EMPTY_CHECK);
         taskHeader.setIsBack(QuantityConstant.MES_TASK_BACK);
         taskHeaderService.updateById(taskHeader);
         return AjaxResult.success(mesReturn);
@@ -1019,7 +1037,9 @@ public class MesServiceImpl implements MesService {
         mesReturn.setMaxX(vehicleType.getMaxX());
         mesReturn.setMaxY(vehicleType.getMaxY());
         mesReturn.setOrderCode(taskHeader.getOrderCode());
-        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES_BACK_TASK, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
+        mesReturn.setTemp(taskHeader.getUserDef2());
+
+        String url = addressService.selectAddress(QuantityConstant.ADDRESS_MES, QuantityConstant.DEFAULT_WAREHOUSE, QuantityConstant.DEFAULT_AREA);
         String jsonParam = JSON.toJSONString(mesReturn);
         ResponseEntity<JSONObject> result = RestUtil.request_post(url, QuantityConstant.DEFAULT_WAREHOUSE, jsonParam);
         if (result != null && result.getBody() != null) {
@@ -1031,7 +1051,6 @@ public class MesServiceImpl implements MesService {
         } else {
             throw new ServiceException("接口地址错误或返回为空");
         }
-        taskHeader.setUserDef2(QuantityConstant.EMPTY_CHECK);
         taskHeader.setIsBack(QuantityConstant.MES_TASK_BACK);
         taskHeaderService.updateById(taskHeader);
         return AjaxResult.success(mesReturn);
@@ -779,15 +779,9 @@ public class QuantityConstant {
     public static final Boolean IS_MATERIAL = true;
  
     /**
-     * 空容器入库出库回传状态
-     */
-    public static final String EMPTY_NO_CHECK = "0";
-    public static final String EMPTY_CHECK = "1";
-
-    /**
      * MES 任务完成回传
      */
-    public static final String ADDRESS_MES_BACK_TASK = "MES_BACK_TASK";
+    public static final String ADDRESS_MES = "MES";
  
     /**
      * MES指定任务完成 返回 1
@@ -707,7 +707,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
             throw new ServiceException("换站失败，锁定载具和绑定盛具失败");
         }
  
-        success = taskHeaderService.createOverStationTask(container, vehicle, fromPort, toPort);
+        success = taskHeaderService.createOverStationTask(container, vehicle, fromPort, toPort, null);
         if (!success){
             throw new ServiceException("换站失败，创建换站任务失败");
         }
@@ -267,6 +267,9 @@ public class RyTask extends BaseController {
         }
     }
  
+    /**
+     * 入库任务回传
+     */
     public void backReceipt() {
         // 入库 按单据回传
         String taskKey = "backReceipt";
@@ -296,7 +299,7 @@ public class RyTask extends BaseController {
     }
  
     /**
-     * 任务回传
+     * 出库任务回传
      */
     public void backShipment() {
         // 出库 按任务回传
@@ -325,7 +328,7 @@ public class RyTask extends BaseController {
     }
  
     /**
-     * 任务回传
+     * 空载具出入库回传
      */
     public void backEmptyInOut() {
         String taskKey = "backEmptyInOut";
@@ -360,7 +363,7 @@ public class RyTask extends BaseController {
     }
  
     /**
-     * 任务回传
+     * 换站回传
      */
     public void backChangeStation() {
         String taskKey = "backChangeStation";
@@ -334,10 +334,10 @@ public class TaskHeader implements Serializable {
     private String userDef1;
  
     /**
-     * 自定义字段2
+     * MES下发换站任务时，WMS接收的一段JSON字符串，任务完成时将值回传给MES
      */
     @TableField(value = "userDef2")
-    @ApiModelProperty(value="自定义字段2")
+    @ApiModelProperty(value="JSON字符串")
     private String userDef2;
  
     /**
@@ -84,7 +84,8 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt; {
      * @param vehicle 盛具
      * @param fromPort 来源站台
      * @param toPort 目标站台
+     * @param temp json字符
      * @return true：创建成功， false：创建失败
      */
-    boolean createOverStationTask(Container container, Vehicle vehicle, String fromPort, String toPort);
+    boolean createOverStationTask(Container container, Vehicle vehicle, String fromPort, String toPort, String temp);
 }
@@ -685,7 +685,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
-    public boolean createOverStationTask(Container container, Vehicle vehicle, String fromPort, String toPort) {
+    public boolean createOverStationTask(Container container, Vehicle vehicle, String fromPort, String toPort, String temp) {
         TaskHeader taskHeader = new TaskHeader();
         taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
         taskHeader.setTaskType(QuantityConstant.TASK_TYPE_OVER_STATION);
@@ -699,6 +699,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         taskHeader.setFromPort(fromPort);
         taskHeader.setPort(toPort);
+        taskHeader.setUserDef2(temp);
         return taskHeaderService.save(taskHeader);
     }
  
@@ -784,7 +784,6 @@ public class WorkTaskService {
      */
     public AjaxResult completeManyEmptyIn(TaskHeader taskHeader) {
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
-        taskHeader.setUserDef2(QuantityConstant.EMPTY_NO_CHECK);
         if (!taskHeaderService.updateById(taskHeader)) {
             throw new ServiceException("任务单据状态更新失败！");
         }
@@ -806,7 +805,6 @@ public class WorkTaskService {
      */
     public AjaxResult completeEmptyOut(TaskHeader taskHeader) {
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
-        taskHeader.setUserDef2(QuantityConstant.EMPTY_NO_CHECK);
         if (!taskHeaderService.updateById(taskHeader)) {
             throw new ServiceException("任务单据状态更新失败！");
         }
@@ -826,7 +824,6 @@ public class WorkTaskService {
      */
     public AjaxResult completeManyEmptyOut(TaskHeader taskHeader) {
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
-        taskHeader.setUserDef2(QuantityConstant.EMPTY_NO_CHECK);
         if (!taskHeaderService.updateById(taskHeader)) {
             throw new ServiceException("任务单据状态更新失败！");
         }