From e5a1fc8c1839c12dc65f32f95e59fdddb514bbe5 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 9 Sep 2022 15:33:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CallMaterialServiceImpl.java | 8 ++++---- .../rest/CallVehicleController.java | 2 +- .../service/impl/CallVehicleServiceImpl.java | 19 +++++++++++++------ .../service/impl/SendMaterialServiceImpl.java | 17 ++++++++++++----- .../rest/SendVehicleController.java | 2 +- .../service/impl/SendVehicleServiceImpl.java | 19 +++++++++++++------ 6 files changed, 44 insertions(+), 23 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java index 0b12878..5f17db7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java @@ -29,8 +29,8 @@ public class CallMaterialServiceImpl implements CallMaterialService { JSONArray pointArr = WQL.getWO("PDA_CALLMATERIAL_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); jsonRegion.put("pointArr", pointArr); } - resultJson.put("result", regionArr); - result.put("srb", resultJson); + resultJson.put("regionja", regionArr); + result.put("result", resultJson); result.put("code", "1"); result.put("desc", "查询成功"); return result; @@ -47,11 +47,11 @@ public class CallMaterialServiceImpl implements CallMaterialService { // 2、调用接口 JSONObject json = acsToWmsService.apply(param); if (StrUtil.equals(json.getString("status"), "200")) { - result.put("srb", ""); + result.put("result", ""); result.put("code", "1"); result.put("desc", "操作成功"); } else { - result.put("srb", ""); + result.put("result", ""); result.put("code", "0"); result.put("desc", "操作失败："+json.getString("message")); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java index d677063..f94232a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor @Api(tags = "手持呼叫空托盘") -@RequestMapping("api/pda/callVehicle") +@RequestMapping("api/pda/callEmpty") @Slf4j public class CallVehicleController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java index ae3f46d..ebb0fb4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.pda.callvehicle.service.CallVehicleService; import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,8 +31,8 @@ public class CallVehicleServiceImpl implements CallVehicleService { JSONArray pointArr = WQL.getWO("PDA_CALLVEHICLE_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); jsonRegion.put("pointArr", pointArr); } - resultJson.put("result", regionArr); - result.put("srb", resultJson); + resultJson.put("regionja", regionArr); + result.put("result", resultJson); result.put("code", "1"); result.put("desc", "查询成功"); return result; @@ -43,17 +44,23 @@ public class CallVehicleServiceImpl implements CallVehicleService { JSONObject result = new JSONObject(); // 1、准备参数：point_code、type：1为共挤区域，3为油漆区域 JSONObject param = new JSONObject(); - param.put("type",whereJson.getString("type")); + + String region_id = whereJson.getString("region_id"); + JSONObject jsonObject = WQLObject.getWQLObject("sch_base_region").query("region_id ='" + region_id + "'").uniqueResult(0); + String region_code = jsonObject.getString("region_code"); + if (StrUtil.equals(region_code, "GJQY01")) param.put("type","1"); + if (StrUtil.equals(region_code, "YQQY01")) param.put("type","3"); + param.put("point_code",whereJson.getString("point_code")); - param.put("qty",whereJson.getString("qty")); + param.put("vehicle_num",whereJson.getString("qty")); // 2、调用接口 JSONObject json = acsToWmsService.apply(param); if (StrUtil.equals(json.getString("status"), "200")) { - result.put("srb", ""); + result.put("result", ""); result.put("code", "1"); result.put("desc", "操作成功"); } else { - result.put("srb", ""); + result.put("result", ""); result.put("code", "0"); result.put("desc", "操作失败："+json.getString("message")); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java index 19d533d..ecc44bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.pda.sendmaterial.service.SendMaterialService; import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,8 +31,8 @@ public class SendMaterialServiceImpl implements SendMaterialService { JSONArray pointArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); jsonRegion.put("pointArr", pointArr); } - resultJson.put("result", regionArr); - result.put("srb", resultJson); + resultJson.put("regionja", regionArr); + result.put("result", resultJson); result.put("code", "1"); result.put("desc", "查询成功"); return result; @@ -43,17 +44,23 @@ public class SendMaterialServiceImpl implements SendMaterialService { JSONObject result = new JSONObject(); // 1、准备参数：point_code、type：2为共挤区域，8为豪凯区域 JSONObject param = new JSONObject(); - param.put("type",whereJson.getString("type")); + + String region_id = whereJson.getString("region_id"); + JSONObject jsonObject = WQLObject.getWQLObject("sch_base_region").query("region_id ='" + region_id + "'").uniqueResult(0); + String region_code = jsonObject.getString("region_code"); + if (StrUtil.equals(region_code, "GJQY01")) param.put("type","2"); + if (StrUtil.equals(region_code, "HKQY01")) param.put("type","8"); + param.put("point_code",whereJson.getString("point_code")); param.put("qty",whereJson.getString("qty")); // 2、调用接口 JSONObject json = acsToWmsService.apply(param); if (StrUtil.equals(json.getString("status"), "200")) { - result.put("srb", ""); + result.put("result", ""); result.put("code", "1"); result.put("desc", "操作成功"); } else { - result.put("srb", ""); + result.put("result", ""); result.put("code", "0"); result.put("desc", "操作失败："+json.getString("message")); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java index 7d31a5b..894c99f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor @Api(tags = "手持送空托盘") -@RequestMapping("api/pda/sendVehicle") +@RequestMapping("api/pda/sendEmpty") @Slf4j public class SendVehicleController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java index 857fed9..bba5b77 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java @@ -10,6 +10,7 @@ import org.nl.wms.pda.callvehicle.service.CallVehicleService; import org.nl.wms.pda.sendvehicle.service.SendVehicleService; import org.nl.wms.sch.tasks.RegionTypeEnum; import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,8 +38,8 @@ public class SendVehicleServiceImpl implements SendVehicleService { jsonRegion.put("pointArr", pointArr); } } - resultJson.put("result", regionArr); - result.put("srb", resultJson); + resultJson.put("regionja", regionArr); + result.put("result", resultJson); result.put("code", "1"); result.put("desc", "查询成功"); return result; @@ -50,18 +51,24 @@ public class SendVehicleServiceImpl implements SendVehicleService { JSONObject result = new JSONObject(); // 1、准备参数：point_code、type：6为输送线区域，5为油漆区域 JSONObject param = new JSONObject(); - param.put("type",whereJson.getString("type")); + + String region_id = whereJson.getString("region_id"); + JSONObject jsonObject = WQLObject.getWQLObject("sch_base_region").query("region_id ='" + region_id + "'").uniqueResult(0); + String region_code = jsonObject.getString("region_code"); + if (StrUtil.equals(region_code, "SSX01")) param.put("type","6"); + if (StrUtil.equals(region_code, "YQQY01")) param.put("type","5"); + param.put("point_code",whereJson.getString("point_code")); param.put("vehicle_code",whereJson.getString("vehicle_code")); - param.put("qty",whereJson.getString("qty")); + param.put("vehicle_num",whereJson.getString("qty")); // 2、调用接口 JSONObject json = acsToWmsService.apply(param); if (StrUtil.equals(json.getString("status"), "200")) { - result.put("srb", ""); + result.put("result", ""); result.put("code", "1"); result.put("desc", "操作成功"); } else { - result.put("srb", ""); + result.put("result", ""); result.put("code", "0"); result.put("desc", "操作失败："+json.getString("message")); }