2026.4.27

大更新
2026-04-27 16:02:27 +08:00
parent 52ce9135da
commit 6ce9f469e0
184 changed files with 16502 additions and 2016 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
@@ -1,10 +1,7 @@
 package com.ruoyi.pda.controller;

-import com.ruoyi.api.domain.AgvMoveParam;
 import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.domain.WcsPort;
-import com.ruoyi.api.service.IToWcsService;
-import com.ruoyi.bas.agvPoint.domain.AgvPoint;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -35,8 +32,6 @@ public class PdaController extends BaseController {
    private PdaService pdaService;
    @Autowired
    private IInStockinDetailService iInStockinDetailService;
-    @Autowired
-    private IToWcsService iToWcsService;

    /**
     * 查询是否有半满托盘
@@ -55,7 +50,7 @@ public class PdaController extends BaseController {
    @ResponseBody
    public AjaxResult selectDetailById(String inStockinDetailId) {
        InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        if(inStockinDetail != null) {
+        if (inStockinDetail != null) {
            inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
        }
        return AjaxResult.success(inStockinDetail);
@@ -110,12 +105,13 @@ public class PdaController extends BaseController {

    /**
     * 出库确认查询子作业信息
+     *
     * @param trayCodeMsg
     * @return
     */
    @RequestMapping("/selectJobDetailByTray")
    @ResponseBody
-    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){
+    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg) {
        return pdaService.selectJobDetailByTray(trayCodeMsg);
    }

@@ -144,19 +140,12 @@ public class PdaController extends BaseController {
    }


-
    @RequestMapping("/selectDetailByPDTray")
    @ResponseBody
    public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
        return pdaService.selectDetailByPDTray(trayCodeMakeSure);
    }

-    @RequestMapping("/selectHcTray")
-    @ResponseBody
-    public AjaxResult selectHcTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
-        return pdaService.selectHcTray(trayCodeMakeSure);
-    }
-

    /**
     * 盘点出库确认
@@ -184,31 +173,33 @@ public class PdaController extends BaseController {
        return pdaService.updateWcsPort(wcsPort);
    }

-    /**
-     * 根据类型查询AGV站点
-     */
-    @RequestMapping("/selectAgvPointByType")
-    @ResponseBody
-    public AjaxResult selectAgvPointByType(String type) {
-        List<AgvPoint> list = pdaService.selectAgvPointByType(type);
-        return AjaxResult.success(list);
-    }
-
-    @RequestMapping("/insertAgvJob")
-    @ResponseBody
-    public AjaxResult insertAgvJob(@RequestBody AgvMoveParam agvMoveParam) {
-        return iToWcsService.insertAgvMoveJob(agvMoveParam);
-    }
-
    @RequestMapping("/hcoutMakesure")
    @ResponseBody
-    @Log(title = "手持机缓存出库确认",businessType = BusinessType.OTHER)
-    public AjaxResult hcoutMakesure(String trayCode ){
+    @Log(title = "手持机缓存出库确认", businessType = BusinessType.OTHER)
+    public AjaxResult hcoutMakesure(String trayCode) {

        return pdaService.hcoutMakesure(trayCode);
    }


+    /**
+     * 平库入库
+     */
+    @RequestMapping("/inStockPk")
+    @ResponseBody
+    public AjaxResult inStockPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.completeInPk(trayCodeMakeSure);
+    }
+
+    /**
+     * 库存查询(平库扫码查询托盘入库信息)
+     */
+    @RequestMapping("/searchStock")
+    @ResponseBody
+    public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+
+        return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode()));
+    }


 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
@@ -22,10 +22,14 @@ public class TrayCodeMakeSure {

    private String exitId;
    private String isFull;
+    // 选中传1 没选中传0
+    private String isBoundByAccord;
    //拣选详情列表
    private List<MydoJobDetail> mydoJobDetailList;
    //盘点详情列表
    private List<MydoJobDetail> materials;
    //异常详情列表
    private List<MydoJobDetail> materialDetails;
+    private String quantity;
+    private String stockinDetailId;
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
@@ -40,4 +40,6 @@ public interface PdaMapper {
    void outMakeSureException(HashMap<String, Object> map);

    void hcoutMakesure(HashMap<String, Object> map);
+
+    void completeInPk(HashMap<String, Object> map);
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
@@ -2,7 +2,6 @@ package com.ruoyi.pda.service;

 import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.domain.WcsPort;
-import com.ruoyi.bas.agvPoint.domain.AgvPoint;
 import com.ruoyi.bas.container.domain.BasContainer;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
@@ -48,8 +47,6 @@ public interface PdaService {

    public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure);

-    public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure);
-
    AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure);

    AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure);
@@ -58,7 +55,10 @@ public interface PdaService {

    AjaxResult updateWcsPort(WcsPort wcsport);

-    List<AgvPoint> selectAgvPointByType(String type);

    AjaxResult hcoutMakesure(String trayCode);
+
+    AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure);
+
+    AjaxResult selectBasStockHc(String trayCode);
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -6,8 +6,6 @@ import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.domain.WcsPort;
 import com.ruoyi.api.service.IToWcsService;
 import com.ruoyi.api.service.IToWmsService;
-import com.ruoyi.bas.agvPoint.domain.AgvPoint;
-import com.ruoyi.bas.agvPoint.service.IAgvPointService;
 import com.ruoyi.check.commit.domain.CheckCommitRecord;
 import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,8 +25,6 @@ import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.trayMsg.domain.TrayMsg;
 import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
-import com.ruoyi.stock.hcstock.domain.BasStockHc;
-import com.ruoyi.stock.hcstock.service.IBasStockHcService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.mapper.BasStockMapper;
 import com.ruoyi.system.service.ISysRoleService;
@@ -64,17 +60,13 @@ public class PdaServiceImp implements PdaService {
    private BasStockMapper basStockMapper;
    @Autowired
    private IInStockinService inStockinService;
-    @Autowired
-    private IAgvPointService agvPointService;
-    @Autowired
-    private IBasStockHcService basStockHcService;


    @Override
    public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
        InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
-        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
+//        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
+//        inStockinDetail.setSpare4(inStockinDetail.getSpare4());
        List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
        return hasHalfTray;
    }
@@ -83,8 +75,8 @@ public class PdaServiceImp implements PdaService {
    @Override
    public AjaxResult halfTrayOut(TrayCodeMsg trayCodeMsg) {
        InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(trayCodeMsg.getStockinDetailId());
-        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
-        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
+//        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
+//        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
        List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
        HashMap<String, Object> map = new HashMap<>();
        map.put("v_tray_code", hasHalfTray.get(0).getTrayCode());
@@ -126,6 +118,7 @@ public class PdaServiceImp implements PdaService {
            HashMap<String, Object> map = new HashMap<>();
            map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
            map.put("v_stockin_detail_id", mydoJobDetail.getStockinDetailId());
+            map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
            map.put("v_quantity", Integer.valueOf(mydoJobDetail.getInQuantity()));
            pdaMapper.bindTray(map);
            if (!"10".equals(map.get("v_result").toString())) {
@@ -207,23 +200,13 @@ public class PdaServiceImp implements PdaService {
    @Override
    public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
        MydoJob mydoJob = new MydoJob();
-        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
+        mydoJob.setExitId(trayCodeMakeSure.getExitId());
        mydoJob.setStatus("3");
        mydoJob.setInOrOut("28");
        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
        return AjaxResult.success(mydoJobDetails);
    }

-    @Override
-    public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure) {
-        BasStockHc basStockHc = new BasStockHc();
-        basStockHc.setTrayCode(trayCodeMakeSure.getTrayCode());
-        List<BasStockHc> basStockHcs = basStockHcService.selectBasStockHcList(basStockHc);
-        return AjaxResult.success(basStockHcs);
-
-
-    }
-
    @Override
    public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
        String trayCode = trayCodeMakeSure.getTrayCode();
@@ -257,9 +240,9 @@ public class PdaServiceImp implements PdaService {
    public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {

        MydoJob mydoJob = new MydoJob();
-        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
+        mydoJob.setExitId(trayCodeMakeSure.getExitId());
        mydoJob.setStatus("3");
-        mydoJob.setInOrOut("28");
+        mydoJob.setInOrOut("26");
        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
        if (mydoJobDetails.isEmpty()) {
            return AjaxResult.error("该物料没有盘点出库作业，请检查");
@@ -269,7 +252,7 @@ public class PdaServiceImp implements PdaService {
        if (CollUtil.isNotEmpty(mydoJobDetailList)) {
            boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
            if (flag) {
-                return AjaxResult.warn(MessageUtils.message("数量不可为0"));
+                return AjaxResult.warn(MessageUtils.message("warn.message8"));
            }
            for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
                //插入盘点提交表
@@ -279,7 +262,7 @@ public class PdaServiceImp implements PdaService {
                checkCommitRecord.setStockId(mydoJobDetail.getStockId());
                checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId());
                checkCommitRecord.setSpare2(mydoJobDetail.getProductId());
-//                checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity());
+                checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity());
                checkCommitRecordService.insertCheckCommitRecord(checkCommitRecord);

            }
@@ -308,13 +291,6 @@ public class PdaServiceImp implements PdaService {
        return ajaxResult;
    }

-    @Override
-    public List<AgvPoint> selectAgvPointByType(String type) {
-        AgvPoint agvPoint = new AgvPoint();
-        agvPoint.setType(type);
-        return agvPointService.selectAgvPointList(agvPoint);
-    }
-
    @Override
    public AjaxResult hcoutMakesure(String trayCode) {
        HashMap<String, Object> map = new HashMap<>();
@@ -326,6 +302,28 @@ public class PdaServiceImp implements PdaService {
        } else {
            return AjaxResult.error(map.get("v_resultmsg").toString());
        }
+    }

+    @Override
+    public AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_in_stockin_detail_id", trayCodeMakeSure.getStockinDetailId());
+        map.put("v_quantity", trayCodeMakeSure.getQuantity());
+        pdaMapper.completeInPk(map);
+        String result = map.get("v_result").toString();
+        if ("10".equals(result)) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error(map.get("v_resultmsg").toString());
+        }
+    }
+
+    @Override
+    public AjaxResult selectBasStockHc(String trayCode) {
+        BasStock basStock = new BasStock();
+        basStock.setTrayCode(trayCode);
+        List<BasStock> stocks=basStockMapper.selectBasStockListHc(basStock);
+        return AjaxResult.success(stocks);
    }
 }