From 7a30f2ccf3e89183bf35520494f7cdb14bac6ca5 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Tue, 6 Sep 2022 18:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 12 +++- .../acs/service/impl/WmsToAcsServiceImpl.java | 1 - .../service/impl/SendMaterialServiceImpl.java | 9 +-- .../wms/pda/sendMaterial/wql/QPADSERVICE.wql | 55 +++++++++++++++++- .../src/main/java/org/nl/wms/wms.xls | Bin 375296 -> 425472 bytes .../main/resources/config/application-dev.yml | 8 +-- 6 files changed, 74 insertions(+), 11 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index fa80ce7..7db5358 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -178,12 +178,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String material_id = (String) produceInfoByCode.get("material_id"); String cust_id = (String) produceInfoByCode.get("cust_id"); String producetask_id = (String) produceInfoByCode.get("producetask_id"); + WQLObject.getWQLObject("st_buss_vehiclegroup").delete("vehicle_code ='"+vehicle_code+"'"); + //如果上报不了,则去点位上取(木托盘情况) + if (StrUtil.equals("0", vehicle_code)) { + vehicle_code = produceInfoByCode.getString("vehicle_code"); + } JSONObject materialObj = WQLObject .getWQLObject("MD_ME_Material") .query("material_id='" + material_id + "'") .uniqueResult(0); JSONObject groubObj = new JSONObject(); groubObj.put("group_id", IdUtil.getSnowflake(1, 1).nextId()); + groubObj.put("vehicle_code", vehicle_code); groubObj.put("material_uuid", material_id); groubObj.put("material_code", materialObj.getString("material_code")); @@ -352,7 +358,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } JSONObject vehicleObj = WQLObject.getWQLObject("st_buss_vehiclegroup").query("vehicle_code='" + vehicle_code + "' AND is_delete='0'").uniqueResult(0); if (ObjectUtil.isEmpty(vehicleObj)) { - throw new BadRequestException("未找到托盘号为'" + vehicle_code + "'的托盘信息!"); + //去找对应排产单物料的垛型参数 + WQLObject infoTable = WQLObject.getWQLObject("MD_ME_CribbingInfo"); + JSONObject produceInfoByCodeObj = this.getProduceInfoByCode(device_code); + String material_id = produceInfoByCodeObj.getString("material_id"); + vehicleObj = infoTable.query("material_id='" + material_id + "'").uniqueResult(0); } JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 74ef986..de85b93 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -44,7 +44,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { public JSONObject queryPointStatus(JSONArray arr) { String api = "api/wms/querydevice"; return AcsUtil.notifyAcs(api, arr); - } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java index 05f03b3..a55362c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java @@ -11,6 +11,7 @@ import org.nl.exception.BadRequestException; import org.nl.wms.pda.exception.PdaRequestException; import org.nl.wms.pda.sendMaterial.service.SendMaterialService; import org.nl.wms.sch.manage.buss.SendMaterialTask; +import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,19 +29,19 @@ public class SendMaterialServiceImpl implements SendMaterialService { public Map queryDevice(Map jsonObject) { JSONObject returnjo = new JSONObject(); //查询工序 - JSONArray workprocedureArr = WQLObject.getWQLObject("pdm_base_workprocedure").query("1=1").getResultJSONArray(0); + JSONArray workprocedureArr = WQL.getWO("QPADSERVICE").addParam("flag", "16").process().getResultJSONArray(0); //根据工序查询设备 - JSONArray deviceja = new JSONArray(); JSONArray workprocedureja = new JSONArray(); for (int i = 0; i < workprocedureArr.size(); i++) { JSONObject workprocedureObj = workprocedureArr.getJSONObject(i); String workprocedure_id = workprocedureObj.getString("workprocedure_id"); - JSONArray deviceArr = WQLObject.getWQLObject("pdm_base_device").query("workprocedure_id='" + workprocedure_id + "'").getResultJSONArray(0); + JSONArray deviceArr = WQL.getWO("QPADSERVICE").addParam("flag", "17").addParam("workprocedure_id", workprocedure_id).process().getResultJSONArray(0); + JSONArray deviceja = new JSONArray(); for (int j = 0; j < deviceArr.size(); j++) { JSONObject deviceObj = deviceArr.getJSONObject(j); //根据设备查询点位 String device_id = deviceObj.getString("device_id"); - JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("device_id='" + device_id + "'").getResultJSONArray(0); + JSONArray pointArr = WQL.getWO("QPADSERVICE").addParam("flag", "18").addParam("device_id", device_id).process().getResultJSONArray(0); deviceObj.put("pointArr", pointArr); deviceja.add(deviceObj); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql index ce130b1..b561c46 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql @@ -28,6 +28,8 @@ 输入.search_bar TYPEAS s_string 输入.buss_area_type TYPEAS s_string 输入.height TYPEAS s_string + 输入.workprocedure_id TYPEAS s_string + 输入.device_id TYPEAS s_string [临时表] @@ -386,4 +388,55 @@ IF 输入.flag = "13" md_me_material material ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF + +IF 输入.flag = "16" + PAGEQUERY + SELECT + workpro.workprocedure_id, + workpro.workprocedure_code, + workpro.workprocedure_name + FROM + pdm_base_workprocedure workpro + WHERE + workprocedure_code < '05' + ORDER BY + seq_no + ENDSELECT + ENDPAGEQUERY +ENDIF + +IF 输入.flag = "17" + PAGEQUERY + SELECT + device.device_id, + device.device_code, + device.device_name + FROM + pdm_base_device device + WHERE + 1 = 1 + OPTION 输入.workprocedure_id <> "" + device.workprocedure_id = 输入.workprocedure_id + ENDOPTION + ENDSELECT + ENDPAGEQUERY +ENDIF + +IF 输入.flag = "18" + PAGEQUERY + SELECT + point.point_id, + point.point_code, + point.point_name + FROM + sch_base_point point + WHERE + 1 = 1 + OPTION 输入.device_id <> "" + point.device_id = 输入.device_id + ENDOPTION + + ENDSELECT + ENDPAGEQUERY +ENDIF \ No newline at end of file diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index 37930638e57b24da71ee60f32d233168070519ac..908e4ababfa8eb714c20ba3660eb6706debd36c0 100644 GIT binary patch delta 56036 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 HHN^i5CqTsl delta 14936 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 diff --git a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml index a37d777..0a3d6de 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,12 +8,12 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:llsh_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + #url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:llsh_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} #password: ${DB_PWD:P@ssw0rd} -# password: ${DB_PWD:Root.123456} - password: ${DB_PWD:zjw123} + password: ${DB_PWD:Root.123456} + #password: ${DB_PWD:zjw123} # 初始连接数 initial-size: 5 # 最小连接数