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

更新

Browse Source
This commit is contained in:
loujf
2022-10-15 21:48:13 +08:00
parent 105c9dc6aa
commit 42e7c9b536
5 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -308,11 +308,11 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
//执行单任务下的业务逻辑 //执行单任务下的业务逻辑
//给后工位下发空盘放货信号 //给后工位下发空盘放货信号
//判断条件 前工位无任务、无货 后工位有任务取货完成 //判断条件 前工位无任务、无货 后工位有任务取货完成
if(mode == 3 && action_2 == 2 && move_2 != 0 && move_1 == 0 && ObjectUtil.isNotEmpty(inst2) && ObjectUtil.isEmpty(inst1) ){ if (mode == 3 && action_2 == 2 && move_2 != 0 && move_1 == 0 && task2 > 0 && task1 == 0) {
writing("to_command2", "2"); writing("to_command2", "2");
} }
//给前工位取满托下发放货信号 //给前工位取满托下发放货信号
if(mode == 3 && action_1 == 2 && move_1 != 0 && move_2 == 0 && task1>0 && ObjectUtil.isNotEmpty(inst1) && ObjectUtil.isEmpty(inst2) ){ if (mode == 3 && action_1 == 2 && move_1 != 0 && move_2 == 0 && task1 > 0 && task2 == 0) {
writing("to_command1", "2"); writing("to_command1", "2");
} }
@@ -350,7 +350,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
if (mode == 2 && move_2 == 0 && action_2 == 0 && !requireSucess2) { if (mode == 2 && move_2 == 0 && action_2 == 0 && !requireSucess2) {
instruction_require2(); instruction_require2();
} }
if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && ObjectUtil.isEmpty(inst2) && !requireSucess1){ //前工位申请任务
if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && task2 == 0 && !requireSucess1) {
instruction_require(); instruction_require();
} }
break; break;

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java
View File

@@ -22,7 +22,7 @@ public class SortingUtil {
//木托盘对应刚托盘记录明细【st_buss_vehicleRelaRecordtl】 //木托盘对应刚托盘记录明细【st_buss_vehicleRelaRecordtl】
WQLObject ehicleRelaRecordmstdtl = WQLObject.getWQLObject("st_buss_vehicleRelaRecordtl"); WQLObject ehicleRelaRecordmstdtl = WQLObject.getWQLObject("st_buss_vehicleRelaRecordtl");
//st_buss_vehiclegroup //st_buss_vehiclegroup
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehicleRelaRecordtl"); WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject mstObj = ehicleRelaRecordmst.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0); JSONObject mstObj = ehicleRelaRecordmst.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
String record_id = IdUtil.getSnowflake(1, 1).nextIdStr(); String record_id = IdUtil.getSnowflake(1, 1).nextIdStr();

5
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
View File

@@ -306,7 +306,10 @@ IF 输入.flag = "9"
material.material_type = 输入.material_type material.material_type = 输入.material_type
ENDOPTION ENDOPTION
OPTION 输入.material_id <> "" OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id material.material_id = 输入.material_id
ENDOPTION
OPTION 输入.material_code <> ""
material.material_code = 输入.material_code
ENDOPTION ENDOPTION
order by ruledis.out_seq_no order by ruledis.out_seq_no
ENDSELECT ENDSELECT

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -323,7 +323,8 @@ public class CallMaterialTask extends AbstractAcsTask {
WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl(); WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl();
//更新分拣机械手 上下料位置的点位状态 //更新分拣机械手 上下料位置的点位状态
JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0); JSONArray parr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.FJQY.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
//JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0);
PointUpdateUtil.updatePoint(parr); PointUpdateUtil.updatePoint(parr);
if (StrUtil.equals(next_point_code, "FJJXSSLW101") || StrUtil.equals(next_point_code, "FJJXSSLW102")) { if (StrUtil.equals(next_point_code, "FJJXSSLW101") || StrUtil.equals(next_point_code, "FJJXSSLW102")) {
String point_status01 = point_table.query("point_code ='FJJXSSLW101'").uniqueResult(0).getString("point_status"); String point_status01 = point_table.query("point_code ='FJJXSSLW101'").uniqueResult(0).getString("point_status");

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/SectattrServiceImpl.java
View File

@@ -205,7 +205,7 @@ public class SectattrServiceImpl implements SectattrService {
JSONArray sect_ja = new JSONArray(); JSONArray sect_ja = new JSONArray();
for (int j = 0; j < sect_arr.size(); j++) { for (int j = 0; j < sect_arr.size(); j++) {
JSONObject sect_jo = sect_arr.getJSONObject(j); JSONObject sect_jo = sect_arr.getJSONObject(j);
net.sf.json.JSONObject sect_cas = new net.sf.json.JSONObject(); JSONObject sect_cas = new JSONObject();
sect_cas.put("value", sect_jo.getString("sect_id")); sect_cas.put("value", sect_jo.getString("sect_id"));
sect_cas.put("label", sect_jo.getString("sect_name")); sect_cas.put("label", sect_jo.getString("sect_name"));
sect_ja.add(sect_cas); sect_ja.add(sect_cas);