手持机部分

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

@@ -315,22 +315,19 @@ public class PdaController extends BaseController {
                     mydoJob.setWarehouseId(basWarehouse.getWarehouseId());
                     mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode());
                     mydoJob.setInOut(trayCodeMsg.getInOut());
-                    if("1".equals(trayCodeMsg.getInOut())){
-                        mydoJob.setStatus("1");
-                    }else{
-                        mydoJob.setStatus("3");
-                    }
-
-
                     List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
                     //将mydoJob添加进mydoJobArrayList
                     mydoJobArrayList.addAll(mydoJobs);
-
                 }
                 //ctu库
                 if("2".equals(basWarehouse.getWarehouseType()) && !"1".equals(trayCodeMsg.getInOut())){
                     MydoJob mydoJob = new MydoJob();
-                    mydoJob.setInOut("2");
+                    if("4".equals(trayCodeMsg.getInOut())){
+                        mydoJob.setInOut("4");
+                    }else{
+                        mydoJob.setInOut("2");
+                    }
+
                     mydoJob.setWarehouseId(basWarehouse.getWarehouseId());
                     mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode());
                     mydoJob.setStatus("3");
@@ -338,7 +335,6 @@ public class PdaController extends BaseController {
                     mydoJobArrayList.addAll(mydoJobs2);
                 }
 
-
             }
 
         }
@@ -433,5 +429,14 @@ public class PdaController extends BaseController {
     public AjaxResult getAisleStatisticsData(@RequestParam("warehouseId") String warehouseId){
         return success(pdaService.getAisleStatisticsData(warehouseId));
     }
+
+    /**
+     * 绑定料架
+     */
+    @RequestMapping("/bindShelf")
+    @ResponseBody
+    public AjaxResult bindShelf(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.bindShelf(trayCodeMakeSure);
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java

@@ -17,6 +17,10 @@ public class TrayCodeMakeSure {
     private String trayCode;
     //容器码
     private String containerCode;
+
+    private String warehouseId;
+
+    private String exitId;
     //拣选列表
     private List<MydoJobDetail> mydoJobDetailList;
 }

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

@@ -42,4 +42,6 @@ public interface PdaService {
     Map<String,Object> getAisleStatisticsData(String warehouseId);
 
     AjaxResult bindContainer(TrayCodeMakeSure trayCodeMakeSure);
+
+    AjaxResult bindShelf(TrayCodeMakeSure trayCodeMakeSure);
 }

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

@@ -227,17 +227,24 @@ public class PdaServiceImp implements PdaService {
         //判断任务是否存在
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());
+        mydoJobParam.setStatus("3");
         List<MydoJob> mydoJobList = mydoJobService.selectMydoJobList(mydoJobParam);
         if (CollUtil.isEmpty(mydoJobList)) {
             return AjaxResult.warn("任务不存在");
         }
 
+
+
         MydoJobDetail mydoJobDetailParam = new MydoJobDetail();
         mydoJobDetailParam.setJobId(mydoJobList.get(0).getJobId());
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetailParam);
         if (CollUtil.isEmpty(mydoJobDetails)) {
             return AjaxResult.warn("子任务不存在");
         }
+        //空托盘空料箱
+        if("21".equals(mydoJobList.get(0).getInOrOut()) || "22".equals(mydoJobList.get(0).getInOrOut())){
+            return handleOutType2(trayCodeMakeSure, mydoJobDetails, mydoJobList.get(0));
+        }
 
         //获取单据类型
         OutStockout outStockoutParam = new OutStockout();
@@ -339,7 +346,8 @@ public class PdaServiceImp implements PdaService {
             OutPickSubmit outPickSubmitParam = new OutPickSubmit();
             //outPickSubmitParam.setJobId(mydoJob.getJobId());
             //outPickSubmitParam.setJobDetailId(mydoJobDetail.getJobDetailId());
-            outPickSubmitParam.setTrayCode(trayCodeMakeSure.getTrayCode());
+            outPickSubmitParam.setWarehouseId(mydoJob.getWarehouseId());
+            outPickSubmitParam.setExitId(mydoJob.getExitId());
             List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
             if (outPickSubmits.isEmpty()) {
                 //存入中间表
@@ -349,6 +357,8 @@ public class PdaServiceImp implements PdaService {
                 outPickSubmit.setProductId(mydoJobDetail.getProductId());
                 outPickSubmit.setQuantit(mydoJobDetail.getOutQuantity());
                 outPickSubmit.setTrayCode(trayCodeMakeSure.getTrayCode());
+                outPickSubmit.setWarehouseId(mydoJob.getWarehouseId());
+                outPickSubmit.setExitId(mydoJob.getExitId());
                 outPickSubmitService.insertOutPickSubmit(outPickSubmit);
             } else {
                 OutPickSubmit oldOutPickSubmit = outPickSubmits.get(0);
@@ -677,4 +687,42 @@ public class PdaServiceImp implements PdaService {
         return AjaxResult.success("绑定成功");
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult bindShelf(TrayCodeMakeSure trayCodeMakeSure) {
+        BasContainerDetails basContainerDetails = new BasContainerDetails();
+        basContainerDetails.setContainerId(trayCodeMakeSure.getContainerCode());
+        for(MydoJobDetail mydoJobDetail:trayCodeMakeSure.getMydoJobDetailList()){
+            basContainerDetails.setProductId(mydoJobDetail.getProductId());
+            List<BasContainerDetails> basContainerDetailsList = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails);
+            if(basContainerDetailsList.size()==0){
+                basContainerDetails.setProductName(mydoJobDetail.getExtraField().getMaterialDesc());
+                basContainerDetails.setQuantity(Convert.toLong(mydoJobDetail.getPickBindQuantity()));
+                basContainerDetailsService.insertBasContainerDetails(basContainerDetails);
+            }else{
+                basContainerDetails.setId(basContainerDetailsList.get(0).getId());
+                basContainerDetails.setQuantity(basContainerDetailsList.get(0).getQuantity()+Convert.toLong(mydoJobDetail.getPickBindQuantity()));
+                basContainerDetailsService.updateBasContainerDetails(basContainerDetails);
+            }
+
+
+            OutPickSubmit outPickSubmitParam = new OutPickSubmit();
+            outPickSubmitParam.setWarehouseId(trayCodeMakeSure.getWarehouseId());
+            outPickSubmitParam.setExitId(trayCodeMakeSure.getExitId());
+            outPickSubmitParam.setProductId(mydoJobDetail.getProductId());
+            List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
+           if( Integer.parseInt(outPickSubmits.get(0).getQuantit())  > Integer.parseInt(mydoJobDetail.getPickBindQuantity())   ){
+               outPickSubmitParam.setQuantit( String.valueOf(Integer.parseInt(outPickSubmits.get(0).getQuantit()) - Integer.parseInt(mydoJobDetail.getPickBindQuantity())));
+               outPickSubmitParam.setId(outPickSubmits.get(0).getId());
+               outPickSubmitService.updateOutPickSubmit(outPickSubmitParam);
+           }else{
+               outPickSubmitService.deleteOutPickSubmitById(outPickSubmits.get(0).getId());
+           }
+        }
+
+
+
+
+        return AjaxResult.success("绑定成功！");
+    }
 }