入库部分和接口

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

@@ -38,8 +38,9 @@ public class PdaController extends BaseController {
      */
     @RequestMapping("/selectHasHalfTray")
     @ResponseBody
-    public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
-        return pdaService.selectHasHalfTray(inStockinDetailId);
+    public AjaxResult selectHasHalfTray(String inStockinDetailId) {
+        List<BasStock> basStocks = pdaService.selectHasHalfTray(inStockinDetailId);
+        return AjaxResult.success(basStocks);
     }
 
     /**
@@ -49,6 +50,9 @@ public class PdaController extends BaseController {
     @ResponseBody
     public AjaxResult selectDetailById(String inStockinDetailId) {
         InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
+        if(inStockinDetail != null) {
+            inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
+        }
         return AjaxResult.success(inStockinDetail);
     }
 
@@ -58,8 +62,8 @@ public class PdaController extends BaseController {
 
     @RequestMapping("/halfTrayOut")
     @ResponseBody
-    public AjaxResult halfTrayOut(String trayCode) {
-        return pdaService.halfTrayOut(trayCode);
+    public AjaxResult halfTrayOut(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.halfTrayOut(trayCodeMsg);
     }
 
 
@@ -77,19 +81,54 @@ public class PdaController extends BaseController {
      */
     @RequestMapping("/bindTray")
     @ResponseBody
-    public AjaxResult bindTray(@RequestBody TrayCodeMsg trayCodeMsg) {
-        return pdaService.bindTray(trayCodeMsg);
+    public AjaxResult bindTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.bindTray(trayCodeMakeSure);
     }
 
     /**
-     * 确认入库
+     * 空托盘入库
      */
-    @RequestMapping("/confirmIn")
+    @RequestMapping("/tpIn")
     @ResponseBody
-    public AjaxResult confirmIn(String trayCode) {
-        return pdaService.confirmIn(trayCode);
+    public AjaxResult tpIn(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.tpIn(trayCodeMsg.getTrayCode());
     }
 
+    /**
+     * 空托盘出库
+     */
+    @RequestMapping("/tpOut")
+    @ResponseBody
+    public AjaxResult tpOut(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.tpOut(trayCodeMsg);
+    }
+
+    /**
+     * 出库确认查询子作业信息
+     * @param trayCodeMsg
+     * @return
+     */
+    @RequestMapping("/selectJobDetailByTray")
+    @ResponseBody
+    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){
+        return pdaService.selectJobDetailByTray(trayCodeMsg);
+    }
+
+    /**
+     * 出库确认
+     *
+     * @param trayCodeMakeSure 托盘信息
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('pda:out:outMakeSure')")
+    @PostMapping("/outMakeSure")
+    @Log(title = "手持机出库确认", businessType = BusinessType.INSERT)
+    @ResponseBody
+    public AjaxResult outMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.outMakeSure(trayCodeMakeSure);
+    }
+
+
 
 
 
@@ -111,19 +150,7 @@ public class PdaController extends BaseController {
     }
 
 
-    /**
-     * 出库确认
-     *
-     * @param trayCodeMakeSure 托盘信息
-     * @return
-     */
-    @PreAuthorize("@ss.hasPermi('pda:out:outMakeSure')")
-    @PostMapping("/outMakeSure")
-    @Log(title = "手持机出库确认", businessType = BusinessType.INSERT)
-    @ResponseBody
-    public AjaxResult outMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
-        return pdaService.outMakeSure(trayCodeMakeSure);
-    }
+
 
 
     /**