fix 所有任务

lms/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java

@@ -18,6 +18,8 @@ import org.nl.modules.security.service.dto.AuthUserDto;
 import org.nl.modules.system.service.RoleService;
 import org.nl.modules.system.service.UserService;
 import org.nl.modules.system.service.dto.UserDto;
+import org.nl.wms.pda.anno.PdaAnnotation;
+import org.nl.wms.pda.util.PdaUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,14 +50,15 @@ public class MobileAuthorizationController {
     @ApiOperation("登录授权")
     @PostMapping(value = "/login")
     @SaIgnore
-    public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
+    @PdaAnnotation
+    public JSONObject login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
         // 密码解密 - 前端的加密规则: encrypt（根据实际更改）
         String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword());
         // 校验数据库
         // 根据用户名查询，在比对密码
         UserDto userDto = userService.findByName(authUser.getUsername()); // 拿不到已经抛出异常
         if (!userDto.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密
-            throw new BadRequestException("账号或密码错误");
+            throw new BadRequestException("账号或密码错误！");
         }
         // 获取权限列表 - 登录查找权限
         List<String> permissionList = roleService.getPermissionList(userDto);
@@ -77,11 +80,11 @@ public class MobileAuthorizationController {
         // 返回 token 与 用户信息
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("user", userDto);
-        Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
+        JSONObject authInfo = new JSONObject(2) {{
             put("token", "Bearer " + StpUtil.getTokenValue());
             put("user", jsonObject);
         }};
 
-        return ResponseEntity.ok(authInfo);
+        return PdaUtils.buildSuccessResultJSON(authInfo);
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -63,11 +63,7 @@ public class AcsToWmsController {
     @ApiOperation("ACS机械手给WMS发送任务")
     @SaIgnore
     public ResponseEntity<Object> manipulatorApply(@RequestBody JSONObject whereJson) {
-        acsToWmsService.manipulatorApply(whereJson);
-        JSONObject result = new JSONObject();
-        result.put("status", HttpStatus.OK.value());
-        result.put("message", "发送任务成功");
-        return new ResponseEntity<>(result, HttpStatus.OK);
+        return new ResponseEntity<>(acsToWmsService.manipulatorApply(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/reverseGroup")

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java

@@ -54,9 +54,11 @@ public interface AcsToWmsService {
     /**
      * ACS机械手给WMS发送任务
      * 组盘
+     *
      * @param whereJson
+     * @return
      */
-    void manipulatorApply(JSONObject whereJson);
+    JSONObject manipulatorApply(JSONObject whereJson);
 
     /**
      * ACS给WMS请求是否优先包装

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -192,6 +192,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
         RLock lock = redissonClient.getFairLock("acs_to_wms:" + point_code);
         boolean try_lock = false;
+        String task_code = null;
         try {
             try_lock = lock.tryLock(5, TimeUnit.SECONDS);
             if (try_lock) {
@@ -230,12 +231,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
                         switch (region) {
                             case HL:
-                                hlSendMaterialTask.createTask(method_param);
+                                task_code = hlSendMaterialTask.createTask(method_param);
                                 break;
                             case YZ:
                                 method_param.put("workorder", param.getJSONObject("workorder"));
                                 method_param.put("vd", param.getJSONObject("vd"));
-                                yzSendMaterialTask.createTask(method_param);
+                                task_code = yzSendMaterialTask.createTask(method_param);
                                 break;
                             case SZ:
                                 WQLObject vd_table = WQLObject.getWQLObject("st_ivt_vehicle_detail");
@@ -250,7 +251,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                                 vd_table.update(vd);
                                 method_param.put("vd", vd);
 
-                                szSendMaterialTask.createTask(method_param);
+                                task_code = szSendMaterialTask.createTask(method_param);
                                 break;
                             default:
                                 throw new BadRequestException("[" + region.label() + "] 不能发起送料任务！");
@@ -260,7 +261,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         // 叫料
                         switch (region) {
                             case FJ:
-                                fjCallMaterialTask.createTask(method_param);
+                                task_code = fjCallMaterialTask.createTask(method_param);
                                 break;
                             default:
                                 throw new BadRequestException("[" + region.label() + "] 不能发起叫料任务！");
@@ -270,7 +271,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         // 送空
                         switch (region) {
                             case FJ:
-                                fjSendEmptyTask.createTask(method_param);
+                                task_code = fjSendEmptyTask.createTask(method_param);
                                 break;
                             default:
                                 throw new BadRequestException("[" + region.label() + "] 不能发起送空任务！");
@@ -280,10 +281,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         // 叫空
                         switch (region) {
                             case HL:
-                                hlCallEmptyTask.createTask(method_param);
+                                task_code = hlCallEmptyTask.createTask(method_param);
                                 break;
                             case YZ:
-                                yzCallEmptyTask.createTask(method_param);
+                                task_code = yzCallEmptyTask.createTask(method_param);
                                 break;
                             case GTK:
                                 break;
@@ -304,7 +305,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
 
         JSONObject result = new JSONObject();
-        result.put("message", "申请任务成功！");
+        result.put("message", "申请任务成功，任务编码 [" + task_code + "]");
         result.put("status", HttpStatus.OK.value());
         return result;
     }
@@ -314,10 +315,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      * 组盘
      *
      * @param jsonObject
+     * @return
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void manipulatorApply(JSONObject jsonObject) {
+    public JSONObject manipulatorApply(JSONObject jsonObject) {
         String point_code = jsonObject.getString("device_code"); // 对接位
         if (StrUtil.isBlank(point_code)) {
             throw new BadRequestException("点位不能为空！");
@@ -337,7 +339,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
         String is_full = jsonObject.getString("is_full");
         if (StrUtil.isBlank(is_full)) {
-            throw new BadRequestException("是否满拖不能为空！");
+            throw new BadRequestException("是否满垛不能为空！");
         }
 
         JSONObject point = WQLObject
@@ -350,7 +352,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         TaskUtils.isLocked(point);
 
         JSONObject work_order = TaskUtils.hasWorkOrder(point);
-        String device_code = work_order.getString("device_code");
         String vehicle_type = work_order.getString("vehicle_type");
         WQLObject vd_table = WQLObject.getWQLObject("st_ivt_vehicle_detail");
         JSONObject vd_update = new JSONObject();
@@ -445,7 +446,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         param.put("vehicle_code", vehicle_code);
         param.put("type", "1");
         param.put("request_param", jsonObject.toJSONString());
-        this.apply(param);
+        return this.apply(param);
     }
 
     /**

lms/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaController.java

@@ -120,7 +120,7 @@ public class PdaController {
         }
         String is_full = param.getString("is_full");
         if (StrUtil.isBlank(is_full)) {
-            throw new BadRequestException("是否满拖不能为空！");
+            throw new BadRequestException("是否满垛不能为空！");
         }
 
         pdaService.sendMaterial(point_code, vehicle_code, qty, weight, is_full, param.toJSONString());

lms/nladmin-system/src/main/java/org/nl/wms/pda/service/PdaService.java

@@ -46,7 +46,7 @@ public interface PdaService {
      * @param vehicle_code 载具编码
      * @param qty 数量
      * @param weight 重量
-     * @param is_full 是否满拖
+     * @param is_full 是否满垛
      */
     void sendMaterial(String point_code, String vehicle_code, String qty, String weight, String is_full, String request_param);
 }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java

@@ -114,7 +114,7 @@ public class WorkorderServiceImpl implements WorkordeService {
         String device_code = dto.getDevice_code();
         String vehicle_type = dto.getVehicle_type();
         if (!device_code.startsWith("FJ")) {
-            if (device_code.startsWith("YZ")) {
+            if (device_code.startsWith("YJ")) {
                 vehicle_type = VehicleType.STEEL_TRAY.value();
             } else if (device_code.startsWith("HL")) {
                 vehicle_type = VehicleType.CUP.value();

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java

@@ -87,37 +87,10 @@ public class TaskServiceImpl implements TaskService {
         if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) {
             map.put("end_time", whereJson.getString("end_time"));
         }
-        JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
-        JSONArray content = json.getJSONArray("content");
-        JSONArray res = new JSONArray();
-
-        //点位基础表【SCH_BASE_Point】
-        WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
-        for (int i = 0; i < content.size(); i++) {
-            JSONObject taskObj = content.getJSONObject(i);
-            String point_code1 = taskObj.getString("point_code1");
-            if (ObjectUtil.isNotEmpty(point_code1)) {
-                JSONObject point1 = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-                if (ObjectUtil.isNotEmpty(point1))
-                    taskObj.put("point1_region_name", point1.getString("region_name"));
-            }
-
-            String point_code2 = taskObj.getString("point_code2");
-            if (ObjectUtil.isNotEmpty(point_code2)) {
-                JSONObject point2 = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
-                if (ObjectUtil.isNotEmpty(point2))
-                    taskObj.put("point2_region_name", point2.getString("region_name"));
-            }
-            String point_code3 = taskObj.getString("point_code3");
-            if (ObjectUtil.isNotEmpty(point_code3)) {
-                JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0);
-                if (ObjectUtil.isNotEmpty(point3))
-                    taskObj.put("point3_region_name", point3.getString("region_name"));
-            }
-            res.add(taskObj);
+        if (StrUtil.isNotEmpty(whereJson.getString("point_code"))) {
+            map.put("point_code", "%" + whereJson.getString("point_code") + "%");
         }
-        json.put("content", res);
-        return json;
+        return WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
     }
 
     @Override

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/HLCallEmptyTask.java

@@ -64,7 +64,7 @@ public class HLCallEmptyTask extends AbstractAcsTask {
         );
         WQLObject.getWQLObject("sch_base_task").insert(task);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
     

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/YZCallEmptyTask.java

@@ -70,7 +70,7 @@ public class YZCallEmptyTask extends AbstractAcsTask {
         point.put("task_code", task.getString("task_code"));
         WQLObject.getWQLObject("sch_base_point").update(point);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
    

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/FJCallMaterialTask.java

@@ -64,7 +64,7 @@ public class FJCallMaterialTask  extends AbstractAcsTask {
         point.put("task_code", task.getString("task_code"));
         WQLObject.getWQLObject("sch_base_point").update(point);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
     

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/SZCallMaterialTask.java

@@ -80,7 +80,7 @@ public class SZCallMaterialTask extends AbstractAcsTask {
         point.put("task_code", task.getString("task_code"));
         WQLObject.getWQLObject("sch_base_point").update(point);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
     

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/empty/FJSendEmptyTask.java

@@ -63,7 +63,7 @@ public class FJSendEmptyTask  extends AbstractAcsTask {
         point.put("task_code", task.getString("task_code"));
         WQLObject.getWQLObject("sch_base_point").update(point);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
     

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java

@@ -70,7 +70,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
         );
         WQLObject.getWQLObject("sch_base_task").insert(task);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
     

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java

@@ -48,7 +48,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
                 point.getString("point_code"),
                 null,
                 vd.getString("material_id"),
-                VehicleType.STEEL_TRAY.value(),
+                vd.getString("vehicle_type"),
                 vd.getString("vehicle_code"),
                 "1",
                 SZSendMaterialTask.class.getName(),
@@ -63,7 +63,7 @@ public class SZSendMaterialTask extends AbstractAcsTask {
         point.put("task_code", task.getString("task_code"));
         WQLObject.getWQLObject("sch_base_point").update(point);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
     

lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/YZSendMaterialTask.java

@@ -65,7 +65,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
         point.put("task_code", task.getString("task_code"));
         WQLObject.getWQLObject("sch_base_point").update(point);
 
-        return task.getString("task_id");
+        return task.getString("task_code");
     }
 
    

lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql

@@ -49,9 +49,12 @@
 	IF 输入.flag = "1"
 		PAGEQUERY
 			SELECT
-                    point.*
+                    point.*,
+                    material.material_code
                 FROM
                     sch_base_point point
+                    LEFT JOIN st_ivt_vehicle_detail vd ON point.vehicle_code = vd.vehicle_code AND vd.is_delete = '0'
+                    LEFT JOIN md_me_materialbase material ON vd.material_id = material.material_id
                 WHERE
                     1 = 1
                     OPTION 输入.region_id <> ""

lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql

@@ -17,13 +17,14 @@
 	输入.task_status					             TYPEAS s_string
 	输入.finished_type					         TYPEAS s_string
 	输入.task_type					             TYPEAS s_string
-	输入.point_code1					     TYPEAS s_string
-	输入.point_code2					         TYPEAS s_string
+	输入.point_code1					             TYPEAS s_string
+	输入.point_code2					             TYPEAS s_string
 	输入.task_code					             TYPEAS s_string
 	输入.vehicle_code					         TYPEAS s_string
 	输入.begin_time					             TYPEAS s_string
 	输入.end_time					             TYPEAS s_string
 	输入.unFinish					             TYPEAS s_string
+	输入.point_code					             TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -51,26 +52,18 @@
 		PAGEQUERY
                 SELECT
                     task.*,
-                    md.class_name task_type_name,
-                    dict.label task_status_name
+                    point1.point_name AS point1_name,
+                    point1.region_name AS point1_region_name,
+                    point2.point_name AS point2_name,
+                    point2.region_name AS point2_region_name,
+                    material.material_code
                 FROM
                     sch_base_task task
-                    LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
-                    LEFT JOIN sys_dict_detail dict ON dict.`value` = task.task_status AND dict.`name` = 'task_status'
+                    LEFT JOIN sch_base_point point1 ON task.point_code1 = point1.point_code
+                    LEFT JOIN sch_base_point point2 ON task.point_code2 = point2.point_code
+                    LEFT JOIN md_me_materialbase material ON task.material_id = material.material_id
                 WHERE
                     task.is_delete = '0'
-                    OPTION 输入.task_type <> ""
-                            task.task_type = 输入.task_type
-                    ENDOPTION
-                    OPTION 输入.finished_type <> ""
-                            task.finished_type = 输入.finished_type
-                    ENDOPTION
-                    OPTION 输入.begin_time <> ""
-                            task.create_time >= 输入.begin_time
-                    ENDOPTION
-                    OPTION 输入.end_time <> ""
-                            task.create_time <= 输入.end_time
-                    ENDOPTION
                     OPTION 输入.unFinish <> ""
                             task.task_status <> '7' AND task_status <> '8'
                     ENDOPTION
@@ -84,7 +77,7 @@
                          (task.task_code like 输入.task_code)
                     ENDOPTION
                     OPTION 输入.point_code <> ""
-                         (task.point_code1 like 输入.point_code1)
+                         ((point1.point_name like 输入.point_code) OR (point2.point_name LIKE 输入.point_code))
                     ENDOPTION
                     OPTION 输入.begin_time <> ""
                        task.create_time >= 输入.begin_time

lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -131,6 +131,8 @@
         <el-table-column prop="b" label="短边长度" width="75" />
         <el-table-column prop="h" label="梯形高度" width="75" />
         <el-table-column prop="w" label="砖块厚度" width="75" />
+        <el-table-column prop="create_name" label="创建人" width="75" />
+        <el-table-column prop="create_time" label="创建时间" width="135" />
         <el-table-column prop="update_optname" label="修改人" width="75" />
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column

lms/nladmin-ui/src/views/wms/pdm/device/index.vue

@@ -40,6 +40,22 @@
           <el-form-item label="设备名称" prop="device_name">
             <el-input v-model="form.device_name" style="width: 300px" />
           </el-form-item>
+          <el-form-item label="所属区域" prop="region_code">
+            <el-select
+              v-model="form.region_code"
+              placeholder="所属区域"
+              class="filter-item"
+              style="width: 300px"
+              clearable
+            >
+              <el-option
+                v-for="item in regionList"
+                :key="item.region_code"
+                :label="item.region_name"
+                :value="item.region_code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="设备类型" prop="device_model">
             <el-select
               v-model="form.device_model"
@@ -59,23 +75,6 @@
           <el-form-item label="设备产能">
             <el-input v-model="form.productivity" type="number" style="width: 300px" />
           </el-form-item>
-          <el-form-item label="所属区域">
-            <el-select
-              v-model="form.region_code"
-              clearable
-              filterable
-              size="mini"
-              placeholder="所属区域"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in regionList"
-                :key="item.region_code"
-                :label="item.region_name"
-                :value="item.region_code"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="外部编码">
             <el-input v-model="form.extend_code" style="width: 300px" />
           </el-form-item>
@@ -100,13 +99,13 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="device_code" label="设备编码" />
         <el-table-column prop="device_name" label="设备名称" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="device_model" label="设备型号" min-width="100" show-overflow-tooltip>
+        <el-table-column prop="region_name" label="所属区域" />
+        <el-table-column prop="device_model" label="设备类型" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.pdm_device_type[scope.row.device_model] }}
           </template>
         </el-table-column>
         <el-table-column prop="productivity" label="设备产能" />
-        <el-table-column prop="region_name" label="所属区域" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -178,6 +177,9 @@ export default {
         ],
         device_model: [
           { required: true, message: '设备类型不能为空', trigger: 'blur' }
+        ],
+        region_code: [
+          { required: true, message: '所属区域不能为空', trigger: 'blur' }
         ]
       },
       regionList: []

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -15,30 +15,27 @@
             <el-input
               v-model="query.produceorder_code"
               clearable
-              size="small"
-              placeholder="请输入工单编号"
+              placeholder="工单编号"
               style="width: 200px;"
-              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="物料搜索">
+          <el-form-item label="物料编码">
             <el-input
               v-model="query.material"
               clearable
-              size="small"
-              placeholder="物料编码名称"
+              placeholder="物料编码"
               style="width: 200px;"
-              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label=" 工单状态">
+          <el-form-item label="工单状态">
             <el-select
               v-model="order_status"
               style="width: 200px"
               clearable
               multiple
               placeholder="请选择"
-              class="filter-item"
               @change="handTaskStatus"
             >
               <el-option
@@ -123,7 +120,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="计划数量" prop="plan_qty">
+              <el-form-item label="计划数量/重量" prop="plan_qty">
                 <el-input v-model="form.plan_qty" type="number" style="width: 300px" />
               </el-form-item>
             </el-col>
@@ -143,7 +140,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item v-show="typeof (form.device_code) === 'string' && form.device_code.startsWith('FJ')" label="木托盘类型" prop="vehicle_type">
+              <el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type">
                 <el-select v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择">
                   <el-option
                     v-for="item in dict.wood_vehicle_type"
@@ -298,7 +295,8 @@ const defaultForm = {
   is_pri: '0',
   ext_code: null,
   qualified_qty: '0',
-  unqualified_qty: '0'
+  unqualified_qty: '0',
+  region_code: null
 }
 export default {
   name: 'Produceshiftorder',
@@ -399,6 +397,7 @@ export default {
       this.form.device_code = row.device_code
       this.form.device_id = row.device_id
       this.form.device_name = row.device_name
+      this.form.region_code = row.region_code
     },
     // 下发
     submits(row) {

lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue

@@ -53,6 +53,7 @@
           {{ dict.label.pdm_device_type[scope.row.device_model] }}
         </template>
       </el-table-column>
+      <el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
       <el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip />
     </el-table>
     <!--分页组件-->

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

@@ -8,7 +8,7 @@
           class="demo-form-inline"
           label-position="right"
           label-width="90px"
-          label-suffix=":"
+          label-suffix="："
         >
           <el-form-item label="编码名称">
             <el-input
@@ -313,12 +313,13 @@
             {{ dict.label.true_or_false[scope.row.is_used] }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
+        <el-table-column prop="vehicle_type" label="载具类型" min-width="80">
           <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="120" />
+        <el-table-column prop="vehicle_code" label="载具编码" min-width="80" />
+        <el-table-column prop="material_code" label="物料编码" min-width="260" />
         <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
         <el-table-column prop="update_optname" label="修改人" />
         <el-table-column prop="update_time" label="修改时间" width="150" />

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

@@ -7,66 +7,36 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
-          label-suffix=":"
+          label-width="90px"
+          label-suffix="："
         >
-          <el-form-item label="任务号">
-            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
+          <el-form-item label="任务编码">
             <el-input
               v-model="query.task_code"
               clearable
               style="width: 180px"
-              placeholder="任务号"
+              placeholder="任务编码"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="载具号">
-            <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
+          <el-form-item label="载具编码">
             <el-input
               v-model="query.vehicle_code"
               clearable
               style="width: 180px"
-              placeholder="载具号"
+              placeholder="载具编码"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="点位编码">
+          <el-form-item label="起点终点">
             <el-input
               v-model="query.point_code"
               clearable
               style="width: 180px"
-              placeholder="起点"
+              placeholder="起点终点"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="任务类型">
-            <treeselect
-              v-model="query.task_type"
-              :load-options="loadChildNodes"
-              :options="classes1"
-              style="width: 180px"
-              placeholder="请选择"
-            />
-          </el-form-item>
-          <el-form-item label="完成方式">
-            <el-select
-              v-model="query.finished_type"
-              style="width: 180px"
-              placeholder="完成方式"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in finishTypeList"
-                :key="item.code"
-                clearable
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="query.createTime"
@@ -117,25 +87,26 @@
         <el-table-column v-if="false" 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 v-if="false" 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 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="point1_name" label="起点" width="150" />
+        <el-table-column prop="point1_region_name" label="起点区域" width="80" />
+        <el-table-column prop="point2_name" label="终点" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="point2_region_name" label="终点区域" min-width="80" show-overflow-tooltip />
+        <el-table-column prop="vehicle_type" label="载具类型" min-width="80" 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="120" />
-        <el-table-column prop="point1_region_name" label="区域1" width="120" />
-        <el-table-column prop="point_code2" label="点位2" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="material_code" label="物料编码" min-width="260" show-overflow-tooltip />
         <!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
         <el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
         <!--<el-table-column prop="point_code3" label="点位3" width="85" />
@@ -218,7 +189,7 @@ export default {
       sort: 'task_id,desc',
       crudMethod: { ...crudTask },
       query: {
-        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
+        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ['-1']
       },
       optShow: {
         add: false,
@@ -254,7 +225,6 @@ export default {
     crudTask.getFinishType().then(data => {
       this.finishTypeList = data
     })
-    this.crud.query.task_status = ['-1']
     this.crud.toQuery()
   },
   methods: {