入库部分和接口

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

@@ -1,7 +1,10 @@
 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;
@@ -32,6 +35,8 @@ public class PdaController extends BaseController {
     private PdaService pdaService;
     @Autowired
     private IInStockinDetailService iInStockinDetailService;
+    @Autowired
+    private IToWcsService iToWcsService;
 
     /**
      * 查询是否有半满托盘
@@ -129,9 +134,6 @@ public class PdaController extends BaseController {
     }
 
 
-
-
-
     /**
      * 入库扫码生成作业
      */
@@ -149,10 +151,6 @@ public class PdaController extends BaseController {
         return pdaService.selectDetailByPDTray(trayCodeMakeSure);
     }
 
-
-
-
-
     /**
      * 盘点出库确认
      *
@@ -179,6 +177,22 @@ 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);
+    }
+
 
 }
 

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

@@ -2,6 +2,7 @@ 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;
@@ -55,5 +56,6 @@ public interface PdaService {
 
     AjaxResult updateWcsPort(WcsPort wcsport);
 
+    List<AgvPoint> selectAgvPointByType(String type);
 
 }

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

@@ -6,6 +6,8 @@ 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;
@@ -60,6 +62,8 @@ public class PdaServiceImp implements PdaService {
     private BasStockMapper basStockMapper;
     @Autowired
     private IInStockinService inStockinService;
+    @Autowired
+    private IAgvPointService agvPointService;
 
 
     @Override
@@ -199,9 +203,9 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         mydoJob.setStatus("3");
-        mydoJob.setInOrOut("26");
+        mydoJob.setInOrOut("28");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         return AjaxResult.success(mydoJobDetails);
     }
@@ -239,9 +243,9 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
 
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         mydoJob.setStatus("3");
-        mydoJob.setInOrOut("26");
+        mydoJob.setInOrOut("28");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         if (mydoJobDetails.isEmpty()) {
             return AjaxResult.error("该物料没有盘点出库作业，请检查");
@@ -251,7 +255,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("warn.message8"));
+                return AjaxResult.warn(MessageUtils.message("数量不可为0"));
             }
             for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
                 //插入盘点提交表
@@ -261,7 +265,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);
 
             }
@@ -289,4 +293,11 @@ public class PdaServiceImp implements PdaService {
         AjaxResult ajaxResult = toWcsService.updateWcsPort(wcsport);
         return ajaxResult;
     }
+
+    @Override
+    public List<AgvPoint> selectAgvPointByType(String type) {
+        AgvPoint agvPoint = new AgvPoint();
+        agvPoint.setType(type);
+        return agvPointService.selectAgvPointList(agvPoint);
+    }
 }