2026.4.27

大更新

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

@@ -1,10 +1,7 @@
 package com.ruoyi.pda.controller;
 
-import com.ruoyi.api.domain.AgvMoveParam;
 import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.domain.WcsPort;
-import com.ruoyi.api.service.IToWcsService;
-import com.ruoyi.bas.agvPoint.domain.AgvPoint;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -35,8 +32,6 @@ public class PdaController extends BaseController {
     private PdaService pdaService;
     @Autowired
     private IInStockinDetailService iInStockinDetailService;
-    @Autowired
-    private IToWcsService iToWcsService;
 
     /**
      * 查询是否有半满托盘
@@ -55,7 +50,7 @@ public class PdaController extends BaseController {
     @ResponseBody
     public AjaxResult selectDetailById(String inStockinDetailId) {
         InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        if(inStockinDetail != null) {
+        if (inStockinDetail != null) {
             inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
         }
         return AjaxResult.success(inStockinDetail);
@@ -110,12 +105,13 @@ public class PdaController extends BaseController {
 
     /**
      * 出库确认查询子作业信息
+     *
      * @param trayCodeMsg
      * @return
      */
     @RequestMapping("/selectJobDetailByTray")
     @ResponseBody
-    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){
+    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg) {
         return pdaService.selectJobDetailByTray(trayCodeMsg);
     }
 
@@ -144,19 +140,12 @@ public class PdaController extends BaseController {
     }
 
 
-
     @RequestMapping("/selectDetailByPDTray")
     @ResponseBody
     public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
         return pdaService.selectDetailByPDTray(trayCodeMakeSure);
     }
 
-    @RequestMapping("/selectHcTray")
-    @ResponseBody
-    public AjaxResult selectHcTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
-        return pdaService.selectHcTray(trayCodeMakeSure);
-    }
-
 
     /**
      * 盘点出库确认
@@ -184,31 +173,33 @@ public class PdaController extends BaseController {
         return pdaService.updateWcsPort(wcsPort);
     }
 
-    /**
-     * 根据类型查询AGV站点
-     */
-    @RequestMapping("/selectAgvPointByType")
-    @ResponseBody
-    public AjaxResult selectAgvPointByType(String type) {
-        List<AgvPoint> list = pdaService.selectAgvPointByType(type);
-        return AjaxResult.success(list);
-    }
-
-    @RequestMapping("/insertAgvJob")
-    @ResponseBody
-    public AjaxResult insertAgvJob(@RequestBody AgvMoveParam agvMoveParam) {
-        return iToWcsService.insertAgvMoveJob(agvMoveParam);
-    }
-
     @RequestMapping("/hcoutMakesure")
     @ResponseBody
-    @Log(title = "手持机缓存出库确认",businessType = BusinessType.OTHER)
-    public AjaxResult hcoutMakesure(String trayCode ){
+    @Log(title = "手持机缓存出库确认", businessType = BusinessType.OTHER)
+    public AjaxResult hcoutMakesure(String trayCode) {
 
         return pdaService.hcoutMakesure(trayCode);
     }
 
 
+    /**
+     * 平库入库
+     */
+    @RequestMapping("/inStockPk")
+    @ResponseBody
+    public AjaxResult inStockPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.completeInPk(trayCodeMakeSure);
+    }
+
+    /**
+     * 库存查询(平库扫码查询托盘入库信息)
+     */
+    @RequestMapping("/searchStock")
+    @ResponseBody
+    public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+
+        return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode()));
+    }
 
 
 }