补空托（空托暂存区）（空托区1 -> 空托2）

ruoyi-admin/src/main/java/com/ruoyi/nieyan/controller/pda/PdaAgvCallController.java

@@ -0,0 +1,52 @@
+package com.ruoyi.nieyan.controller.pda;
+
+import com.ruoyi.ams.nieyan.domain.form.AgvCallForm;
+import com.ruoyi.ams.nieyan.service.AgvCallProxyService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 镍盐PDA接口
+ * Created by IntelliJ IDEA.
+ * User: jwk
+ * Date: 2023/05/25
+ */
+@Api("镍盐PDA接口")
+@Slf4j
+@RestController
+@RequestMapping("/pda/agvCall")
+public class PdaAgvCallController {
+
+
+    @Autowired
+    private AgvCallProxyService agvCallProxyService;
+
+    /**
+     * 补空托（空托暂存区）
+     * 空托区1 -> 空托区2
+     *
+     * @param agvCallForm
+     * @return
+     */
+    @ApiOperation("补空托（空托暂存区）")
+    @PostMapping("supplementEmptyTray")
+    public AjaxResult supplementEmptyTray(@RequestBody AgvCallForm agvCallForm) {
+        if (StringUtils.isEmpty(agvCallForm.getLocationFrom())) {
+            return AjaxResult.error("起始库位为空！");
+        }
+        String locationFrom = agvCallForm.getLocationFrom();
+        String locationTo = agvCallForm.getLocationTo();
+        String createUser = agvCallForm.getCreateUser();
+        return agvCallProxyService.supplementEmptyTray(locationFrom, locationTo, createUser);
+    }
+
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -140,12 +140,16 @@ public class BusinessServiceImpl implements IBusinessService {
                 }
 
                 if (flowConfigHeaderVO.getFlowType().equals("ASN")) {
-                    // 统计入库箱数
-                    List<AgvCallItemDTO> agvCallItemDTOList = agvCallDTO.getAgvCallItemDTOList();
                     List<BaseLocationInfo> locationFromList = this.convertLocation(paramLocationFrom, agvCallDTO.getWarehouseId(), null);
                     List<BaseLocationInfo> locationToList = this.convertLocation(paramLocationTo, agvCallDTO.getWarehouseId(), "shift_no+ 0,shift_index");
                     locationFrom = this.zoneLocationAllocation(locationFromList, "locationFrom", "ASN", asnSoStrategy, token);
                     locationTo = this.zoneLocationAllocation(locationToList, "locationTo", "ASN", asnSoStrategy, token);
+                    // 初始化库存
+                    if (agvCallDTO.getAgvCallItemDTOList().size() > 0) {
+                        iInvLotAttService.deleteInvLotAttBylocationId(locationFrom.getId());
+                        invLotLocIdService.deleteInvLotLocIdById(locationFrom.getId());
+                        invLotLocIdService.initInv(locationFrom.getId().toString(), agvCallDTO);
+                    }
                     wcsTaskList.addAll(this.genTask(locationFrom, locationTo, flowConfigHeaderVO, agvCallDTO, token));
 
                 } else if (flowConfigHeaderVO.getFlowType().equals("SO")) {
@@ -302,7 +306,7 @@ public class BusinessServiceImpl implements IBusinessService {
                     break;
                 }
                 if (locationInfo == null) {
-                    throw new ServiceException("目标点没有可以分配的库位", token);
+                    throw new ServiceException("入库目标点没有可以分配的库位", token);
                 }
             }
         } else if (type.equals("SO")) {
@@ -324,7 +328,7 @@ public class BusinessServiceImpl implements IBusinessService {
                     break;
                 }
                 if (locationInfo == null) {
-                    throw new ServiceException("起始点没有可以分配的库存！", token);
+                    throw new ServiceException("出库起始点没有可以分配的库存！", token);
                 }
 
             } else { //目标库位
@@ -339,7 +343,7 @@ public class BusinessServiceImpl implements IBusinessService {
                     break;
                 }
                 if (locationInfo == null) {
-                    throw new ServiceException("目标点没有可以分配的库位", token);
+                    throw new ServiceException("出库目标点没有可以分配的库位", token);
                 }
             }
         } else { //移库
@@ -358,7 +362,7 @@ public class BusinessServiceImpl implements IBusinessService {
 
                 //进行判断
                 if (locationInfo == null) {
-                    throw new ServiceException("起始点没有可以分配的库位", token);
+                    throw new ServiceException("搬运起始点没有可以分配的库位", token);
                 }
 
             } else {
@@ -375,7 +379,7 @@ public class BusinessServiceImpl implements IBusinessService {
 
                 //进行判断
                 if (locationInfo == null) {
-                    throw new ServiceException("目标点没有可以分配的库位", token);
+                    throw new ServiceException("搬运目标点没有可以分配的库位", token);
                 }
             }
         }
@@ -431,6 +435,7 @@ public class BusinessServiceImpl implements IBusinessService {
             wcsTask.setPriority(1L);
             wcsTask.setShopId(Constant.WAREHOUSE_ID.toString());
             wcsTask.setCreateDate(new Date());
+            wcsTask.setCreateUser(agvCallDTO.getCreateUser());
             wcsTask.setBusinessType("01");
             wcsTask.setTaskType(Constant.TASK_TYPE.FORWARD.getValue());
             wcsTask.setExt8(token.toString());

warewms-ams/src/main/java/com/ruoyi/ams/config/domain/dto/AgvCallDTO.java

@@ -16,6 +16,7 @@ public class AgvCallDTO {
     private String palletNo;
     private String extParam;
     private Long warehouseId;
+    private String createUser;
     private String toArea;// 目标区域（货物最终去掉区域）
     private List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
 }

warewms-ams/src/main/java/com/ruoyi/ams/nieyan/domain/form/AgvCallForm.java

@@ -0,0 +1,25 @@
+package com.ruoyi.ams.nieyan.domain.form;
+
+import lombok.Data;
+
+/**
+ * @author JWK
+ * @version 1.0
+ * @date 2023/5/25 18:00
+ */
+@Data
+public class AgvCallForm {
+
+    /**
+     * 起始库位
+     */
+    private String locationFrom;
+    /**
+     * 目标库位
+     */
+    private String locationTo;
+    /**
+     * 创建人
+     */
+    private String createUser;
+}

warewms-ams/src/main/java/com/ruoyi/ams/nieyan/service/AgvCallProxyService.java

@@ -0,0 +1,53 @@
+package com.ruoyi.ams.nieyan.service;
+
+import com.ruoyi.ams.business.IBusinessService;
+import com.ruoyi.ams.config.domain.dto.AgvCallDTO;
+import com.ruoyi.ams.config.domain.dto.AgvCallItemDTO;
+import com.ruoyi.base.constant.Constant;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * AGV搬运任务代理类
+ *
+ * @author jwk
+ * @version 1.0
+ * @date 2023/5/25 15:42
+ */
+@Slf4j
+@Service
+public class AgvCallProxyService {
+
+    @Autowired
+    private IBusinessService iBusinessService;
+
+
+    /**
+     * 补空托（空托暂存区）
+     * 空托区1 -> 空托区2
+     *
+     * @param locationFrom
+     * @param locationTo
+     * @param createUser
+     * @return
+     */
+    public AjaxResult supplementEmptyTray(String locationFrom, String locationTo, String createUser) {
+        AgvCallDTO agvCallDTO = new AgvCallDTO();
+        agvCallDTO.setLocationFrom(locationFrom);
+        agvCallDTO.setLocationTo(locationTo);
+        agvCallDTO.setCreateUser(createUser);
+        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+        agvCallItemDTO.setSku(Constant.EMPTY_TRAY); //物料号
+        agvCallItemDTOList.add(agvCallItemDTO);
+        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+        return iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.ONE.getValue(), agvCallDTO);
+    }
+
+}
+

warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -7,6 +7,9 @@ package com.ruoyi.base.constant;
  */
 public class Constant {
     public static final String CUSTOMER_ID = "default";
+    public static final String EMPTY_TRAY = "EMPTY_TRAY"; // 空托盘
+    public static final String WASTE = "WASTE"; // 废料
+    public static final String WASTE_BAS = "WASTE_BAS"; // 空废料篓
     public static final Long WAREHOUSE_ID = 1L;
     /**
      * 入库缓存位