2026.3.19 晚

缓存出库确认后台

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java

@@ -27,25 +27,23 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/check/stockCheck")
-public class CheckStockinController extends BaseController
+public class CheckStockinController extends BaseController {
-{
     @Autowired
     private ICheckStockinService checkStockinService;
     @Autowired
-    private ICheckStockinFinishService  checkStockinFinishService;
+    private ICheckStockinFinishService checkStockinFinishService;
 
     /**
      * 查询盘库单据主信息列表
      */
     @PreAuthorize("@ss.hasPermi('check:stockCheck:list')")
     @GetMapping("/list")
-    public TableDataInfo list(CheckStockin checkStockin)
+    public TableDataInfo list(CheckStockin checkStockin) {
-    {
         startPage();
         List<CheckStockin> list = new ArrayList<>();
-        if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus())<4){
+        if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus()) < 4) {
-            list =  checkStockinService.selectCheckStockinList(checkStockin);
+            list = checkStockinService.selectCheckStockinList(checkStockin);
-        }else {
+        } else {
             list = checkStockinFinishService.selectCheckStockinList(checkStockin);
         }
 
@@ -58,8 +56,7 @@ public class CheckStockinController extends BaseController
     @PreAuthorize("@ss.hasPermi('check:stockCheck:export')")
     @Log(title = "盘库单据主信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, CheckStockin checkStockin)
+    public void export(HttpServletResponse response, CheckStockin checkStockin) {
-    {
         List<CheckStockin> list = checkStockinService.selectCheckStockinList(checkStockin);
         ExcelUtil<CheckStockin> util = new ExcelUtil<CheckStockin>(CheckStockin.class);
         util.exportExcel(response, list, "盘库单据主信息数据");
@@ -70,8 +67,7 @@ public class CheckStockinController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('check:stockCheck:query')")
     @GetMapping(value = "/{stockGuid}")
-    public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid)
+    public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid) {
-    {
         return success(checkStockinService.selectCheckStockinByStockGuid(stockGuid));
     }
 
@@ -81,8 +77,7 @@ public class CheckStockinController extends BaseController
     @PreAuthorize("@ss.hasPermi('check:stockCheck:add')")
     @Log(title = "盘库单据主信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CheckStockin checkStockin)
+    public AjaxResult add(@RequestBody CheckStockin checkStockin) {
-    {
         return toAjax(checkStockinService.insertCheckStockin(checkStockin));
     }
 
@@ -92,8 +87,7 @@ public class CheckStockinController extends BaseController
     @PreAuthorize("@ss.hasPermi('check:stockCheck:edit')")
     @Log(title = "盘库单据主信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CheckStockin checkStockin)
+    public AjaxResult edit(@RequestBody CheckStockin checkStockin) {
-    {
         return checkStockinService.updateCheckStockin(checkStockin);
     }
 
@@ -102,9 +96,8 @@ public class CheckStockinController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('check:stockCheck:remove')")
     @Log(title = "盘库单据主信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockGuids}")
+    @DeleteMapping("/{stockGuids}")
-    public AjaxResult remove(@PathVariable String[] stockGuids)
+    public AjaxResult remove(@PathVariable String[] stockGuids) {
-    {
         return toAjax(checkStockinService.deleteCheckStockinByStockGuids(stockGuids));
     }
 
@@ -119,12 +112,15 @@ public class CheckStockinController extends BaseController
     @PreAuthorize("@ss.hasPermi('check:stockCheck:saveBill')")
     @ResponseBody
     public AjaxResult saveBill(@RequestBody CheckStockVo checkStockVo) {
-        String stockOutId = checkStockinService.saveBill(checkStockVo);
+        return   checkStockinService.saveBill(checkStockVo);
-        return AjaxResult.success(stockOutId);
+
+
+
     }
 
     /**
      * 盘点自动分配
+     *
      * @param checkStockin
      * @return
      */

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java

@@ -62,7 +62,7 @@ public interface ICheckStockinService
      */
     public int deleteCheckStockinByStockGuid(String stockGuid);
 
-    String saveBill(CheckStockVo outStockoutVo);
+    AjaxResult saveBill(CheckStockVo outStockoutVo);
 
     /**
      * 盘点自动分配

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java

@@ -162,9 +162,8 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String saveBill(CheckStockVo checkStockVo) {
+    public AjaxResult saveBill(CheckStockVo checkStockVo) {
         CheckStockin checkStockin = checkStockVo.getCheckStockin();
-
         List<CheckStockinDetail> detailList = checkStockVo.getDetailList();
         String stockCheckId = basJobIdService.getJobId("PDD");
         checkStockin.setStockCheckId(stockCheckId);
@@ -183,6 +182,9 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
                 checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
                 checkStockinDetail.setStockCheckId(stockCheckId);
                 BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId());
+                if (basProduct==null){
+                   throw  new RuntimeException(checkStockinDetail.getProductId()+",系统内无该物料，请检查！");
+                }
                 checkStockinDetail.setProductGuid(basProduct.getProductGuid());
                 checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid());
                 checkStockinDetail.setScanNum("0");
@@ -193,13 +195,6 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
         } else if ("2".equals(checkStockin.getCheckType())) {
             //货位盘点
             for (int i = 0; i < detailList.size(); i++) {
-//                BasStock param = new BasStock();
-//                param.setCargoSpaceId(detailList.get(i).getSpare1());
-//                List<BasStock> basStocks = basStockService.selectBasStockList(param);
-//                Integer quantity = 0;
-//                for (BasStock basStock : basStocks) {
-//                    quantity += Convert.toInt(basStock.getQuantity());
-//                }
                 CheckStockinDetail checkStockinDetail = detailList.get(i);
                 checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
                 checkStockinDetail.setStockCheckId(stockCheckId);
@@ -211,7 +206,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
         }
 
         checkStockinMapper.insertCheckStockin(checkStockin);
-        return stockCheckId;
+        return AjaxResult.success("单据创建成功",stockCheckId);
     }
 
     @Override

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

@@ -193,6 +193,16 @@ public class PdaController extends BaseController {
         return iToWcsService.insertAgvMoveJob(agvMoveParam);
     }
 
+    @RequestMapping("/hcoutMakesure")
+    @ResponseBody
+    @Log(title = "手持机缓存出库确认",businessType = BusinessType.OTHER)
+    public AjaxResult hcoutMakesure(String trayCode ){
+
+        return pdaService.hcoutMakesure(trayCode);
+    }
+
+
+
 
 }
 

ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java

@@ -38,4 +38,6 @@ public interface PdaMapper {
     void pkOut(HashMap<String, Object> map);
 
     void outMakeSureException(HashMap<String, Object> map);
+
+    void hcoutMakesure(HashMap<String, Object> map);
 }

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java

@@ -58,4 +58,5 @@ public interface PdaService {
 
     List<AgvPoint> selectAgvPointByType(String type);
 
+    AjaxResult hcoutMakesure(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -300,4 +300,18 @@ public class PdaServiceImp implements PdaService {
         agvPoint.setType(type);
         return agvPointService.selectAgvPointList(agvPoint);
     }
+
+    @Override
+    public AjaxResult hcoutMakesure(String trayCode) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCode);
+        pdaMapper.hcoutMakesure(map);
+        String result = map.get("v_result").toString();
+        if ("10".equals(result)) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error(map.get("v_resultmsg").toString());
+        }
+
+    }
 }

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -243,10 +243,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMydoJobByEntranceId" parameterType="MydoJob" resultMap="MydoJobResult">
         select top(1)* from mydo_job mj
-        where in_or_out&lt;20 and mj.entrance_id = #{entranceId}
+        where in_or_out&lt;20
-          and mj.status = #{status}
+          and mj.tray_code = #{trayCode}
-        <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
+<!--        <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>-->
-        <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
+<!--        <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>-->
         order by mj.create_time
     </select>
 

ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml

@@ -181,8 +181,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{status,mode=IN,jdbcType=VARCHAR},
                 #{newStatus,mode=IN,jdbcType=VARCHAR},
                 #{exitId,mode=IN,jdbcType=VARCHAR},
-                #{v_result,mode=OUT,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
-                #{v_resultString,mode=OUT,jdbcType=VARCHAR}
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
             )
         }
     </select>

ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml

@@ -144,4 +144,15 @@
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}
     </select>
+
+    <select id="hcoutMakesure" parameterType="java.util.Map" statementType="CALLABLE">
+
+        {call proc_hc_out_make_sure(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+            )}
+
+    </select>
+
 </mapper>

ruoyi-ui/src/views/check/create/index.vue

@@ -670,9 +670,15 @@ export default {
           console.log(data)
           // 这里需要调用保存接口
           saveCheckStock(data).then(response => {
+           if (response.code==200){
+             this.$modal.msgSuccess('保存成功：' + response.msg);
+             this.$tab.refreshPage(this.$route);
+           }
+           else {
+             this.$modal.msgError('建单失败：' + response.msg);
+           }
+
 
-            this.$modal.msgSuccess('保存成功：' + response.msg);
-            this.$tab.refreshPage(this.$route);
             // this.reset();
           });
         }