root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

混碾机送料代码更新

Browse Source
This commit is contained in:
lyd
2022-11-18 18:04:54 +08:00
parent d1d22ce030
commit 5479f535cd
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,7 +549,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
throw new BadRequestException("托盘类型不能为空！"); throw new BadRequestException("托盘类型不能为空！");
} }
WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); 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)) { if (ObjectUtil.isEmpty(pointObj)) {
throw new BadRequestException("为找到类型为'" + vehicle_type + "' 的设备点位"); throw new BadRequestException("为找到类型为'" + vehicle_type + "' 的设备点位");
} }

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

@@ -242,9 +242,9 @@ public class HnSendMaterialTask extends AbstractAcsTask {
param1.put("region_code", "KLHJ"); param1.put("region_code", "KLHJ");
param1.put("vehicle_type", "%" + vehicle_type + "%"); param1.put("vehicle_type", "%" + vehicle_type + "%");
//1、查找困料货架是否有响应的载具类型和对应的物料 //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)) { if (ObjectUtil.isEmpty(endPoint)) {
taskObj.put("remark", "困料货架无可用货位!"); taskObj.put("remark", "困料货架无可用货位");
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj); taskTab.update(taskObj);
} else { } else {

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

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

2
lms/nladmin-ui/src/views/login.vue
View File

@@ -9,7 +9,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <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" /> <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input> </el-input>
</el-form-item> </el-form-item>