入库部分和接口

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

@@ -6,8 +6,12 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
+import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.service.PdaService;
+import com.ruoyi.stock.stock.domain.BasStock;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 @Controller
 @RequestMapping("/pda")
 @Slf4j
@@ -24,23 +30,79 @@ public class PdaController extends BaseController {
 
     @Autowired
     private PdaService pdaService;
+    @Autowired
+    private IInStockinDetailService iInStockinDetailService;
+
+    /**
+     * 查询是否有半满托盘
+     */
+    @RequestMapping("/selectHasHalfTray")
+    @ResponseBody
+    public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
+        return pdaService.selectHasHalfTray(inStockinDetailId);
+    }
+
+    /**
+     * 通过单据码查询物料详情
+     */
+    @RequestMapping("/selectDetailById")
+    @ResponseBody
+    public AjaxResult selectDetailById(String inStockinDetailId) {
+        InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
+        return AjaxResult.success(inStockinDetail);
+    }
+
+    /**
+     * 半盘出库
+     */
+
+    @RequestMapping("/halfTrayOut")
+    @ResponseBody
+    public AjaxResult halfTrayOut(String trayCode) {
+        return pdaService.halfTrayOut(trayCode);
+    }
+
+
+    /**
+     * 通过托盘码查询作业或trayMsg
+     */
+    @RequestMapping("/selectMsgByTray")
+    @ResponseBody
+    public Object selectMsgByTray(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.selectMsgByTray(trayCodeMsg);
+    }
+
+    /**
+     * 绑盘
+     */
+    @RequestMapping("/bindTray")
+    @ResponseBody
+    public AjaxResult bindTray(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.bindTray(trayCodeMsg);
+    }
+
+    /**
+     * 确认入库
+     */
+    @RequestMapping("/confirmIn")
+    @ResponseBody
+    public AjaxResult confirmIn(String trayCode) {
+        return pdaService.confirmIn(trayCode);
+    }
 
 
 
-/**
- * 入库扫码生成作业
- */
+
+    /**
+     * 入库扫码生成作业
+     */
     @RequestMapping("/addInJob")
     @ResponseBody
     public AjaxResult addInJob(@RequestBody RequestEnter requestEnter) {
         return pdaService.addInJob(requestEnter);
     }
 
-    @RequestMapping("/selectDetailByTray")
-    @ResponseBody
-    public AjaxResult selectDetailByTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
-        return pdaService.selectDetailByTray(trayCodeMakeSure);
-    }
+
 
     @RequestMapping("/selectDetailByPDTray")
     @ResponseBody
@@ -64,9 +126,9 @@ public class PdaController extends BaseController {
     }
 
 
-
     /**
      * 盘点出库确认
+     *
      * @param trayCodeMakeSure 托盘信息
      * @return
      */