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

rev:代码更新

Browse Source
This commit is contained in:
ludj
2023-12-25 12:48:16 +08:00
parent 45e68235c2
commit f4887a5f4c
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
View File

@@ -99,7 +99,8 @@ public class StructFindUtil {
// 单口空铁托盘区--->堆叠铁托盘区 查找单口空铁托盘区 // 单口空铁托盘区--->堆叠铁托盘区 查找单口空铁托盘区
if (StrUtil.equals("03", area_type) || StrUtil.equals("04", area_type)) { if (StrUtil.equals("03", area_type) || StrUtil.equals("04", area_type)) {
result = WQL.getWO("QSTRUCT_RUL01").addParam("flag", "1") result = WQL.getWO("QSTRUCT_RUL01").addParam("flag", "1")
.addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).addParam("point_code", point_code).process().uniqueResult(0); // .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).addParam("point_code", point_code).process().uniqueResult(0);
.addParam("area_type", area_type).addParam("point_code", point_code).process().uniqueResult(0);
} else { } else {
result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5") result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5")
.addParam("area_type", area_type).addParam("vehicle_type", vehicle_type) .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type)

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

@@ -221,9 +221,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
} }
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
// 如果托盘类型不是02，则需要加上托盘类型(木托盘) // 如果托盘类型不是02，则需要加上托盘类型(木托盘)
if (!StrUtil.equals(vehicle_type, "02")) { param.put("vehicle_type", vehicle_type);
param.put("vehicle_type", vehicle_type);
}
param.put("area_type", start_area); param.put("area_type", start_area);
param.put("point_code", start_point_code); param.put("point_code", start_point_code);

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

@@ -72,11 +72,14 @@ public class ToPackIngTask extends AbstractAcsTask {
JSONObject nextPointCode2Obj = pointTab.query("point_code='" + nextPointCode2 + "'").uniqueResult(0); JSONObject nextPointCode2Obj = pointTab.query("point_code='" + nextPointCode2 + "'").uniqueResult(0);
//覆膜或者半托 //覆膜或者半托
if (ObjectUtil.isNotEmpty(startPointCode2Obj)) { if (ObjectUtil.isNotEmpty(startPointCode2Obj)) {
//非半托缓存，覆膜区不清理载具等相关信息
if (!startPointCode2.contains("FMJ")){
startPointCode2Obj.put("point_status", "00");
startPointCode2Obj.put("vehicle_code", "");
startPointCode2Obj.put("vehicle_type", "");
startPointCode2Obj.put("material_id", "");
}
startPointCode2Obj.put("lock_type", "00"); startPointCode2Obj.put("lock_type", "00");
startPointCode2Obj.put("point_status", "00");
startPointCode2Obj.put("vehicle_code", "");
startPointCode2Obj.put("vehicle_type", "");
startPointCode2Obj.put("material_id", "");
startPointCode2Obj.put("update_time", DateUtil.now()); startPointCode2Obj.put("update_time", DateUtil.now());
pointTab.update(startPointCode2Obj); pointTab.update(startPointCode2Obj);
} }
@@ -218,8 +221,9 @@ public class ToPackIngTask extends AbstractAcsTask {
.process().getResultJSONArray(0); .process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr2); PointUpdateUtil.updatePoint(pointarr2);
vehicle_type = produceObj.getString("vehicle_type");
start_Point2 = pointTable.query("area_type='05' and vehicle_type = '"+produceObj.getString("vehicle_type")+"'").uniqueResult(0); vehicle_type= WQLObject.getWQLObject("md_me_material").query("material_id = '"+produceObj.getString("material_id")+"'").uniqueResult(0).getString("vehicle_type");
start_Point2 = pointTable.query("area_type='05' and vehicle_type = '"+vehicle_type+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(start_Point2)) { if (ObjectUtil.isEmpty(start_Point2)) {
throw new BadRequestException("覆膜区未找到合适的木托盘类型"); throw new BadRequestException("覆膜区未找到合适的木托盘类型");
} }