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

no message

Browse Source
This commit is contained in:
张江玮
2022-08-31 17:26:36 +08:00
parent a2e96583c3
commit 6cc74bac06
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,22 +93,22 @@ public class StructFindUtil {
public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) { public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) {
String area_type = jsonObject.getString("area_type"); String area_type = jsonObject.getString("area_type");
String vehicle_type = jsonObject.getString("vehicle_type"); String vehicle_type = jsonObject.getString("vehicle_type");
<<<<<<< HEAD
String point_code = jsonObject.getString("point_code"); String point_code = jsonObject.getString("point_code");
//如果是堆叠位5 需要更新 设备状态 //如果是堆叠位5 需要更新 设备状态
if(StrUtil.equals(point_code,"KGTDDW05")){ if(StrUtil.equals(point_code,"KGTDDW05")){
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0); JSONArray pointarr = WQL.getWO("ACSTOMES_001")
.addParam("area_type", AreaEnum.KGTDDQ.getCode())
.addParam("point_code","KGTDDW05")
.addParam("flag", "2").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr); PointUpdateUtil.updatePoint(pointarr);
} }
=======
String point_code = jsonObject.getString("point_code");
>>>>>>> e8128dc341c4130669bc99381c16f30bb0e5ddef
if (StrUtil.isEmpty(area_type)) { if (StrUtil.isEmpty(area_type)) {
throw new BadRequestException("区域不能为空！"); throw new BadRequestException("区域不能为空！");
} }
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
//如果是堆叠位5 需要更新 设备状态 //如果是堆叠位5 需要更新 设备状态
if (StrUtil.equals(point_code, "KGTPDDW05")) { if (StrUtil.equals(point_code, "KGTDDW05")) {
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0); JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr); PointUpdateUtil.updatePoint(pointarr);
result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "6") result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "6")