pda调用库位释放接口

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -70,9 +70,9 @@ public class StartService implements CommandLineRunner {
      * 临时写
      */
     public void write() {
-//        PlcService.plcWritepassedProductRightBlanking1();
-        //测试合格品左上空托
-        plcCallAgvService.readTheEmptyPalletOnThequalifiedLeftTest();
+        PlcService.plcWritepassedProductRightBlanking1();
+//        //测试合格品左上空托
+//        plcCallAgvService.readTheEmptyPalletOnThequalifiedLeftTest();
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaInvLotLocIdController.java

@@ -11,6 +11,8 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.controller.warewms.ams.LocationViewController;
+import com.ruoyi.web.controller.warewms.ams.LocationViewSafeController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,9 @@ public class PdaInvLotLocIdController {
     private IInvLotLocIdService invLotLocIdService;
     @Autowired
     private InvLotLocIdMapper invLotLocIdMapper;
+    @Autowired
+    private LocationViewSafeController locationViewSafeController;
+
 
     /**
      * 获取库存物料 待检
@@ -141,10 +146,24 @@ public class PdaInvLotLocIdController {
     @Log(title = "PDA库存清理", businessType = BusinessType.CLEAN)
     @PostMapping("/clear")
     public AjaxResult clear(String locationId, String updateBy) {
-
         return invLotLocIdService.clear(locationId, Constant.WAREHOUSE_ID, updateBy);
     }
 
+    /**
+     * 设置为空托
+     *
+     * @param locationId
+     * @param updateBy
+     * @return
+     */
+    @Log(title = "设置为空托", businessType = BusinessType.binLocationRelease)
+    @PostMapping("/binLocationRelease")
+    public AjaxResult binLocationRelease(@RequestBody InvLotLocIdMoveForm invLotLocIdMoveForm) {
+        invLotLocIdService.clear(invLotLocIdMoveForm.getLocationFrom(), Constant.WAREHOUSE_ID, "pda");
+        locationViewSafeController.setIsEmptyPallent(Long.parseLong(invLotLocIdMoveForm.getLocationFrom()));
+        return locationViewSafeController.adjLocationIsEmpty(Long.parseLong(invLotLocIdMoveForm.getLocationFrom()));
+    }
+
     /**
      * 库位任务状态调整
      *

ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java

@@ -2,7 +2,7 @@ package com.ruoyi.common.enums;
 
 /**
  * 业务操作类型
- * 
+ *
  * @author ruoyi
  */
 public enum BusinessType
@@ -51,9 +51,14 @@ public enum BusinessType
      * 生成代码
      */
     GENCODE,
-    
+
     /**
      * 清空数据
      */
     CLEAN,
+
+    /**
+     * 设置为空托
+     */
+    binLocationRelease,
 }