手持机部分

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -16,6 +16,8 @@ import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
+import com.ruoyi.bas.warehouse.domain.BasWarehouse;
+import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
 import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
 import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
 import com.ruoyi.common.annotation.DataScope;
@@ -71,6 +73,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
     private IOutExceptionRecordService outExceptionRecordService;
     @Autowired
     private PdaService pdaService;
+    @Autowired
+    private IBasWarehouseService basWarehouseService;
 
 
     /**
@@ -221,8 +225,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
         if (job == null) {
             return AjaxResult.warn("任务不存在");
         }
-        if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) {
+        BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
-            return AjaxResult.warn("任务未开始");
+        if("1".equals(basWarehouse.getWarehouseType())) {
+            if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) {
+                return AjaxResult.warn("任务未开始");
+            }
         }
         if ("1".equals(job.getInOrOut()) || "4".equals(job.getInOrOut())) {
             //空料箱入库 托盘垛入库
@@ -405,6 +412,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
     public AjaxResult OuthandFinish(String[] jobIds) {
         for (String jobId : jobIds) {
             MydoJob job = selectMydoJobByJobId(jobId);
+            BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
+
+            if("1".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){
+                return AjaxResult.error("只能完成正执行的作业");
+            }
             TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
             trayCodeMakeSure.setTrayCode(job.getTrayCode());
            pdaService.outMakeSure(trayCodeMakeSure);

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

@@ -308,13 +308,15 @@ public class PdaController extends BaseController {
         if(!basWarehouses.isEmpty()){
 
             for(BasWarehouse basWarehouse : basWarehouses){
-
                 //高架库
                 if("1".equals(basWarehouse.getWarehouseType())){
                     MydoJob mydoJob = new MydoJob();
                     mydoJob.setWarehouseId(basWarehouse.getWarehouseId());
                     mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode());
                     mydoJob.setInOut(trayCodeMsg.getInOut());
+//                    if("1".equals(trayCodeMsg.getInOut())){
+                        mydoJob.setStatus("1");
+//                    }
                     List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
                     //将mydoJob添加进mydoJobArrayList
                     mydoJobArrayList.addAll(mydoJobs);
@@ -324,19 +326,19 @@ public class PdaController extends BaseController {
                     MydoJob mydoJob = new MydoJob();
                     if("4".equals(trayCodeMsg.getInOut())){
                         mydoJob.setInOut("4");
-                    }else{
+                    }else if("2".equals(trayCodeMsg.getInOut())){
                         mydoJob.setInOut("2");
+                    }else{
+                        List<String> list = new ArrayList<>(Arrays.asList("21", "22", "23","24","25","26"));
+                        mydoJob.setInOutIds(list);
                     }
-
                     mydoJob.setWarehouseId(basWarehouse.getWarehouseId());
                     mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode());
                     mydoJob.setStatus("3");
                     List<MydoJob> mydoJobs2 = mydoJobService.selectMydoJobList(mydoJob);
                     mydoJobArrayList.addAll(mydoJobs2);
                 }
-
             }
-
         }
         return AjaxResult.success(mydoJobArrayList);
     }

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

@@ -231,7 +231,7 @@ public class PdaServiceImp implements PdaService {
         //判断任务是否存在
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());
-        mydoJobParam.setStatus("3");
+//        mydoJobParam.setStatus("3");
         List<MydoJob> mydoJobList = mydoJobService.selectMydoJobList(mydoJobParam);
         if (CollUtil.isEmpty(mydoJobList)) {
             return AjaxResult.warn("任务不存在");

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

@@ -94,8 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-
-
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>

ruoyi-ui/src/lang/en.js

@@ -354,6 +354,7 @@ export default {
 
     // Material Information
     materialCode: 'Material Code',
+    materialDesc: 'Material Desc',
     stockId: 'Stock ID',
     lotNo: 'Lot No.',
     outQuantity: 'Out Quantity',

ruoyi-ui/src/views/job/outJobManagement.vue

@@ -155,6 +155,7 @@
       <el-table-column :label="$t('outJobManagement.stockId')" align="left" prop="stockId" /> <!-- 库存ID -->
       <el-table-column :label="$t('outJobManagement.subDocumentId')" align="left" prop="inOrOutDId" /> <!-- 子单据ID -->
       <el-table-column :label="$t('outJobManagement.materialCode')" align="left" prop="productId" /> <!-- 物料编码 -->
+      <el-table-column :label="$t('outJobManagement.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料编码 -->
       <el-table-column :label="$t('outJobManagement.outQuantity')" align="right" prop="outQuantity" /> <!-- 出库数量 -->
     </el-table>
 
@@ -370,6 +371,14 @@ export default {
         this.$modal.msgError("请选择需要手动完成的任务");
         return;
       }
+      // // 检查选中任务的状态是否为3(执行中)
+      // const invalidTasks = this.mydoJobList.filter(item =>
+      //   this.ids.includes(item.jobId) && item.status !== '3'
+      // );
+      // if (invalidTasks.length > 0) {
+      //   this.$modal.msgError("只能手动完成状态为[执行中]的作业");
+      //   return;
+      // }
       this.$modal.confirm('是否确认手动完成选中的任务？').then(() => {
         return handFinish(this.ids.join(','));
       }).then(() => {
@@ -383,6 +392,14 @@ export default {
         this.$modal.msgError("请选择需要手动作废的任务");
         return;
       }
+      // 检查选中任务的状态是否小于3(未执行)
+      const invalidTasks = this.mydoJobList.filter(item =>
+        this.ids.includes(item.jobId) && item.status >= '3'
+      );
+      if (invalidTasks.length > 0) {
+        this.$modal.msgError("只能手动作废状态为[未执行]的作业");
+        return;
+      }
       this.$modal.confirm('是否确认手动作废选中的任务？').then(() => {
         return hangInvalidJob(this.ids.join(','));
       }).then(() => {
@@ -390,6 +407,7 @@ export default {
         this.getList();
       }).catch(() => {});
     }
+
   }
 }
 </script>