混碾机送料代码更新

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

@@ -549,7 +549,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             throw new BadRequestException("托盘类型不能为空！");
         }
         WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
-        JSONObject pointObj = point_table.query("vehicle_type='" + vehicle_type + "' and region_code = 'FMQ'").uniqueResult(0);
+        JSONObject pointObj = point_table.query("vehicle_type='" + vehicle_type + "' and region_code = 'RGCPQ'").uniqueResult(0);
         if (ObjectUtil.isEmpty(pointObj)) {
             throw new BadRequestException("为找到类型为'" + vehicle_type + "' 的设备点位");
         }

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java

@@ -242,9 +242,9 @@ public class HnSendMaterialTask extends AbstractAcsTask {
             param1.put("region_code", "KLHJ");
             param1.put("vehicle_type", "%" + vehicle_type + "%");
             //1、查找困料货架是否有响应的载具类型和对应的物料
-            JSONObject endPoint = WQL.getWO("QSCH_hnCallEmptyVehicle_01").addParamMap(param1).process().uniqueResult(0);
+            JSONObject endPoint = WQL.getWO("QSCH_hnSendMaterial_01").addParamMap(param1).process().uniqueResult(0);
             if (ObjectUtil.isEmpty(endPoint)) {
-                taskObj.put("remark", "困料货架无可用货位!");
+                taskObj.put("remark", "困料货架无可用货位");
                 taskObj.put("update_time", DateUtil.now());
                 taskTab.update(taskObj);
             } else {

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hnSendMaterial_01.wql

@@ -59,7 +59,7 @@ IF 输入.flag = "1"
                 OPTION 输入.region_code <> ""
                      p.region_code = 输入.region_code
                 ENDOPTION
-               ORDER BY col_num,row_num,layer_num
+               ORDER BY p.point_code
     		ENDSELECT
     	ENDQUERY
     ENDIF

lms/nladmin-ui/src/views/login.vue

@@ -9,7 +9,7 @@
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="new-password" placeholder="密码" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>