From 6cc74bac060ebbae10a35517df3e2cbd62d8c78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Wed, 31 Aug 2022 17:26:36 +0800 Subject: [PATCH] no message --- .../main/java/org/nl/wms/common/StructFindUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index 892b3d5..b8771fa 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -93,22 +93,22 @@ public class StructFindUtil { public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) { String area_type = jsonObject.getString("area_type"); String vehicle_type = jsonObject.getString("vehicle_type"); -<<<<<<< HEAD String point_code = jsonObject.getString("point_code"); //如果是堆叠位5 需要更新 设备状态 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); } -======= - String point_code = jsonObject.getString("point_code"); ->>>>>>> e8128dc341c4130669bc99381c16f30bb0e5ddef + if (StrUtil.isEmpty(area_type)) { throw new BadRequestException("区域不能为空！"); } JSONObject result = new JSONObject(); //如果是堆叠位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); PointUpdateUtil.updatePoint(pointarr); result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "6")