取货无货 作废作业自动分配

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java

@@ -19,6 +19,7 @@ import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
 import com.ruoyi.bas.warehouse.domain.BasWarehouse;
 import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
@@ -27,6 +28,9 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
 import com.ruoyi.log.domain.RequestLog;
 import com.ruoyi.log.service.IRequestLogService;
+import com.ruoyi.out.outStockout.service.IOutStockoutService;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
+import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
 import com.ruoyi.out.tagTask.domain.TagTask;
 import com.ruoyi.out.tagTask.service.ITagTaskService;
 import org.aspectj.weaver.loadtime.Aj;
@@ -59,6 +63,10 @@ public class ToWmsServiceImpl implements IToWmsService {
     private IBasTagService iBasTagService;
     @Autowired
     private IBasCargoSpaceService basCargoSpaceService;
+    @Autowired
+    private IOutStockoutDetailService outStockoutDetailService;
+    @Autowired
+    private IOutStockoutService outStockoutService;
 
 
 
@@ -183,17 +191,16 @@ public class ToWmsServiceImpl implements IToWmsService {
     }
 
     @Override
-    public AjaxResult reMaterial(MydoJob mydoJob) {
+    public AjaxResult reMaterial(MydoJob param) {
         //重新分配物料
-        //标记原货位为出库待盘点
-        BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(mydoJob.getCargoSpaceId());
-        basCargoSpace.setStatus("6");
-        basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
-        //减少单据分配数量
-
+        MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(param.getJobId());
+        MydoJobDetail mydoJobDetailParam = new MydoJobDetail();
+        mydoJobDetailParam.setJobId(mydoJob.getJobId());
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetailParam);
+        String stockOutId = mydoJobDetails.get(0).getInOrOutId();
         // 作废作业
-
+        mydoJobService.OuthandInvalidation(new String[]{mydoJob.getJobId()});
         //调用自动分配
-        return AjaxResult.success();
+        return outStockoutService.autoAllot(stockOutId);
     }
 }

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

@@ -245,7 +245,7 @@ public class PdaServiceImp implements PdaService {
 
         switch (billType) {
             case "1":
-                //销售单据
+                //拣选单据
                 return handleOutType1(trayCodeMakeSure,mydoJobDetailList,mydoJobList.get(0));
             case "2":
                 //退货单据 不绑定容器