盘点功能完善

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

@@ -2,6 +2,9 @@ package com.ruoyi.pda.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import com.ruoyi.bas.stock.domain.BasStock;
+import com.ruoyi.bas.stock.service.IBasStockInfoService;
+import com.ruoyi.bas.stock.service.IBasStockService;
 import com.ruoyi.common.TaskType;
 import com.ruoyi.common.Utils.DecimalUtil;
 import com.ruoyi.common.core.controller.BaseController;
@@ -47,6 +50,8 @@ public class PdaController extends BaseController {
     IInStockinService inStockinService;
     @Autowired
     IInStockinDetailService inStockinDetailService;
+    @Autowired
+    IBasStockService basStockService;
 
 
     /**
@@ -211,7 +216,6 @@ public class PdaController extends BaseController {
     }
 
 
-
     /**
      * 入库绑盘-查询物料信息（子单号查询）
      * @param detailId 子单号
@@ -439,4 +443,71 @@ public class PdaController extends BaseController {
     }
 
 
+
+
+    //==================================== 盘点 ========================================
+    //==================================== 盘点 ========================================
+    //==================================== 盘点 ========================================
+
+
+    /**
+     * 盘点出库待处理任务列表
+     */
+    @GetMapping("/inventoryOutTaskList")
+    @PreAuthorize("@ss.hasPermi('inventory:task:list')")
+    public TableDataInfo listInventoryTask(MydoJob mydoJob) {
+        mydoJob.setInOrOut(TaskType.TASKTYPE_STOCKOUT_INVENTORY);
+        startPage();
+        List<MydoJob> list = mydoJobService.selectMydoJobList(mydoJob);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 盘点-查询物料库存（托盘号查询）
+     * @param trayCode 托盘号
+     * @return
+     */
+    @GetMapping("/getInventoryOutInfoByTrayCode")
+    @PreAuthorize("@ss.hasPermi('out:inventory:task:info')")
+    public AjaxResult getInventoryOutInfoByTrayCode(String trayCode) {
+        try {
+            MydoJob job = mydoJobService.selectMydoJobByTrayCode(trayCode);
+//            List<MydoJobDetail> info = pdaService.getStockoutInfoByTrayCode(trayCode);
+            List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(trayCode);
+            if(ObjUtil.isNull(job) || stocks.isEmpty()){
+                return AjaxResult.error("找不到当前托盘出库明细，请检查作业状态");
+            }else{
+                return AjaxResult.success(stocks);
+            }
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 物料（版辊）库存【产品状态】异常标记
+     * @param params
+     * @return
+     */
+    @PostMapping("/inventoryStockExcetion")
+    @PreAuthorize("@ss.hasPermi('out:inventory:task:info')")
+    public AjaxResult inventoryStockExcetion(@RequestBody Map<String, Object> params) {
+        return pdaService.inventoryStockExcetion(params);
+    }
+
+
+    /**
+     * 手动指定出库确认 - 版辊单独确认
+     * @param params
+     * @return
+     */
+    @PostMapping("/inventoryTrayCodeComplete")
+    @PreAuthorize("@ss.hasPermi('out:bound:task:info')")
+    public AjaxResult inventoryTrayCodeComplete(Map<String, Object> params) {
+        return pdaService.inventoryTrayCodeComplete(params);
+    }
+
+
 }