代码更新

lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java

@@ -151,14 +151,15 @@ public class RegionIoServiceImpl implements RegionIoService {
         for (int i = 0; i < dto.size(); i++) {
             JSONObject dtoJSONObject = dto.getJSONObject(i);
             JSONObject iostorinv = regionIoTab.query("iostorinv_id = '" + dtoJSONObject.getString("iostorinv_id") + "'").uniqueResult(0);
-            if (ObjectUtil.equal(iostorinv.getString("bill_status"), "3")) continue; // 已完成的单据不在继续
+            if (ObjectUtil.equal(iostorinv.getString("bill_status"), "3"))
+                throw new BadRequestException("没有单据或者已出库");
             JSONObject param = new JSONObject();
             param.put("point_code1", dtoJSONObject.getString("start_point_code"));
             param.put("vehicle_code", dtoJSONObject.getString("vehicle_code"));
 //            param.put("vehicle_type", vehicle_type);
             param.put("iostorinv_id", dtoJSONObject.getString("iostorinv_id"));
             CpOutTask taskBean = SpringContextHolder.getBean(CpOutTask.class);
-//            String task_id = taskBean.createTask(param);
+            String task_id = taskBean.createTask(param);
         }
 
     }

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -117,12 +117,20 @@
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
-        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
+          <template slot-scope="scope">
+            {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
         <el-table-column prop="point_code1" label="点位1" width="100" />
         <el-table-column prop="point1_region_name" label="区域1" width="100" />
@@ -197,7 +205,7 @@ import crudClassstandard from '@/api/wms/basedata/classstandard'
 
 export default {
   name: 'Task',
-  dicts: [],
+  dicts: ['acs_task_type', 'vehicle_type'],
   components: {
     pagination, crudOperation, rrOperation, Treeselect, udOperation
   },