手持机部分

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

@@ -9,8 +9,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockin.service.IInStockinService;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.service.PdaService;
+import com.ruoyi.pda.trayMsg.domain.TrayMsg;
+import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.service.IBasStockService;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,11 +35,13 @@ public class PdaController extends BaseController {
     @Autowired
     private PdaService pdaService;
     @Autowired
-    private IInStockinService inStockinService;
+    private IInStockinDetailService inStockinDetailService;
     @Autowired
     private IBasStockService basStockService;
     @Autowired
     private IBasWarehouseService basWarehouseService;
+    @Autowired
+    private ITrayMsgService trayMsgService;
 
     /**
      * 空托盘入库
@@ -116,12 +122,54 @@ public class PdaController extends BaseController {
         return pdaService.emptyBoxOut(trayCodeMsg);
     }
 
-
-    @RequestMapping("/inorder/list")
+    /**
+     * 绑盘查询入库单详情
+     * @param stockinDetailId
+     * @return
+     */
+    @RequestMapping("/inorder/detail")
     @ResponseBody
-    public List<InStockin> inoderList(String stockinDetailId) {
-        List<InStockin> stockins = inStockinService.selectStockinByDetail(stockinDetailId);
-        return stockins;
+    public List<InStockinDetail> inoderList(String stockinDetailId) {
+        List<InStockinDetail> inStockinDetail = inStockinDetailService.selectStockinByDetailById(stockinDetailId);
+        return inStockinDetail;
+    }
+    /**
+     * 绑定托盘物料
+     */
+    @RequestMapping("/bindTrayMsg")
+    @ResponseBody
+    public AjaxResult bindTrayMsg(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.bindTrayMsg(trayCodeMsg);
+    }
+
+    /**
+     * 查询托盘已绑定物料
+     */
+    @RequestMapping("/bindMsg")
+    @ResponseBody
+    public AjaxResult bindMsg(String trayCode) {
+        TrayMsg trayMsg = new TrayMsg();
+        trayMsg.setTrayCode(trayCode);
+        List<TrayMsg> trayMsgs = trayMsgService.selectTrayMsgList(trayMsg);
+        return AjaxResult.success(trayMsgs);
+    }
+    /**
+     * 确认入库
+     */
+    @RequestMapping("/addInJob")
+    @ResponseBody
+    public AjaxResult addInJob(@RequestBody TrayCodeMsg trayCodeMsg) {
+        BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId());
+        if(basWarehouse==null){
+            return AjaxResult.error("仓库不存在");
+        }
+        if("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())){
+            return AjaxResult.error("请选择高架库货位");
+        }
+        if("2".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getEntranceId())){
+            return AjaxResult.error("请选择入口");
+        }
+        return pdaService.addInJob(trayCodeMsg);
     }
 }