初始化

ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java

@@ -4,11 +4,11 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.in.sotckindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.pda.domain.AddInJobRequest;
+import com.ruoyi.pda.domain.TrayMsgBinding;
 import com.ruoyi.pda.domain.BindTrayRequest;
-import com.ruoyi.pda.service.PdaService;
-import io.netty.util.internal.ObjectUtil;
+import com.ruoyi.pda.service.IPdaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +26,8 @@ import java.util.List;
 public class PdaController extends BaseController {
 
     @Autowired
-    private PdaService pdaService;
+    private IPdaService pdaService;
+
 
     /**
      * 入库待处理任务列表
@@ -39,6 +40,7 @@ public class PdaController extends BaseController {
         return getDataTable(list);
     }
 
+
     /**
      * 入库绑盘（支持一托多料）
      * <p>
@@ -67,6 +69,27 @@ public class PdaController extends BaseController {
         }
     }
 
+
+    /**
+     * 入库绑盘
+     */
+    @PostMapping("/bindTrayMsg")
+    @PreAuthorize("@ss.hasPermi('in:bound:msg:add')")
+    public AjaxResult bindTray(@RequestBody TrayMsgBinding bindTray) {
+        try {
+            if (bindTray == null) {
+                return AjaxResult.error();
+            }
+
+            return pdaService.bindingTrayMsg(bindTray);
+
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+
     /**
      * 生成入库作业
      * @param request
@@ -83,14 +106,16 @@ public class PdaController extends BaseController {
         }
     }
 
+
+
     /**
      * 入库绑盘-查询物料信息
-     * @param detailId
+     * @param detailId 子单号
      * @return
      */
     @GetMapping("/getProductInfoByInDetailId")
     @PreAuthorize("@ss.hasPermi('in:bound:task:info')")
-    public  AjaxResult getProductInfoByInDetailId(String detailId) {
+    public AjaxResult getProductInfoByInDetailId(String detailId) {
         try {
             InStockinDetail info = pdaService.getProductInfoByInDetailId(detailId);
             return AjaxResult.success(info);
@@ -99,4 +124,33 @@ public class PdaController extends BaseController {
         }
     }
 
+
+    /**
+     * 入库绑盘-查询物料信息
+     * @param rollerNumber 辊号
+     * @return
+     */
+    @GetMapping("/getProductInfoByRollerNumber")
+    @PreAuthorize("@ss.hasPermi('in:bound:task:info')")
+    public AjaxResult getProductInfoByRollerNumber(String rollerNumber) {
+        try {
+            InStockinDetail info = pdaService.getProductInfoByRollerNumber(rollerNumber);
+            return AjaxResult.success(info);
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 呼叫空托出库
+     * @param palletType 托盘类型
+     * @return
+     */
+    @GetMapping("/callStockOutForEmptyPallet")
+    @PreAuthorize("@ss.hasPermi('out:bound:task:info')")
+    public AjaxResult callStockOutForEmptyPallet(int palletType) {
+        return pdaService.callContainerStockOut(palletType);
+    }
+
 }