From a07df96854e4e3bd812921e6582f9ba99f94359e Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Fri, 10 May 2024 14:19:13 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProductOutTwoServiceImpl.java | 6 +-- .../impl/StIvtIostorinvOutServiceImpl.java | 32 ++++++------ .../impl/StIvtIostorinvServiceImpl.java | 4 +- .../util/impl/InBoxManageServiceImpl.java | 4 +- .../util/impl/InVehicleManageServiceImpl.java | 4 +- .../util/impl/OutBoxManageServiceImpl.java | 8 +-- .../impl/OutVehicleManageServiceImpl.java | 8 +-- .../mnt/service/impl/AutoRiKuServiceImpl.java | 6 +-- .../impl/StoragevehicleinfoServiceImpl.java | 4 +- .../wms/basedata/st/StoreIvtServiceImpl.java | 10 ++-- .../service/impl/StructattrServiceImpl.java | 10 ++-- .../acs/service/impl/AcsToWmsServiceImpl.java | 4 +- .../mes/service/impl/LmsToMesServiceImpl.java | 2 - .../mes/service/impl/MesToLmsServiceImpl.java | 1 - .../org/nl/wms/pda/AppUpdateController.java | 3 ++ .../wms/pda/mps/rest/FeedingController.java | 2 +- .../wms/pda/mps/rest/RawFoilController.java | 2 +- .../mps/service/impl/BakingServiceImpl.java | 19 ++++++- .../service/impl/HandleBakingServiceImpl.java | 34 ++++++------- .../mps/service/impl/RawFoilServiceImpl.java | 32 ++++++------ .../impl/ProductionOutServiceImpl.java | 10 ++-- .../impl/RawfoilworkorderServiceImpl.java | 8 +-- .../wms/sch/service/impl/TaskServiceImpl.java | 2 +- .../org/nl/wms/sch/tasks/InCoolIvtTask.java | 1 - .../service/impl/InchargeServiceImpl.java | 16 +++--- .../service/impl/OutChargeServiceImpl.java | 4 +- .../nl/wms/st/instor/task/EmpMoveTask.java | 6 +-- .../service/impl/CheckOutBillServiceImpl.java | 50 +++++++++---------- .../impl/InEmptyvehiclerecordServiceImpl.java | 16 +++--- .../OutEmptyvehiclerecordServiceImpl.java | 16 +++--- lms/nladmin-ui/public/config.js | 4 +- 31 files changed, 172 insertions(+), 156 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java index 8912047c2..a63b11d3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java @@ -46,7 +46,7 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { @Transactional(rollbackFor = Exception.class) public JSONObject outConfirm(JSONObject whereJson) { // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String box_no = whereJson.getString("box_no"); if (ObjectUtil.isEmpty(box_no)) { @@ -73,7 +73,7 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { .map(BstIvtBoxlashbound::getBox_no) .collect(Collectors.joining("','")); - JSONObject jsonPoint = pointTab.query("vehicle_code IN ('" + box_in + "') and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); + JSONObject jsonPoint = schBasePointService.query("vehicle_code IN ('" + box_in + "') and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("请输入正确的木箱或查看点位是否存在"); @@ -83,7 +83,7 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { jsonPoint.put("point_status", "1"); jsonPoint.put("lock_type", "1"); jsonPoint.put("vehicle_code", ""); - pointTab.update(jsonPoint); + schBasePointService.update(jsonPoint); // 删除木箱绑定关系 iBstIvtBoxlashboundService.removeByIds(boundDaoList); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 1a5b45147..b0a715a10 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -364,7 +364,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl arr = taskTab.query("handle_class = '" + TwoOutTask.class.getName() + "' and task_status = '" + TaskStatusEnum.EXECUTING.getCode() + "' and is_delete ='0'") + List arr = taskService.query("handle_class = '" + TwoOutTask.class.getName() + "' and task_status = '" + TaskStatusEnum.EXECUTING.getCode() + "' and is_delete ='0'") .getResultJSONArray(0).toJavaList(JSONObject.class); if (ObjectUtil.isNotEmpty(arr)) { @@ -574,7 +574,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl taskMangeList,List disLikeList, String point_code) { // 任务表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 载具扩展属性表 WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); @@ -1154,7 +1154,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl row.getString("task_code")) .distinct().collect(Collectors.joining("','")); - List taskList = taskTab.query("task_id IN ('" + TaskCodeIn + "') and is_delete = '0'") + List taskList = taskService.query("task_id IN ('" + TaskCodeIn + "') and is_delete = '0'") .getResultJSONArray(0).toJavaList(JSONObject.class); // 任务组标识 @@ -1200,7 +1200,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl { row.setWork_status(IOSEnum.WORK_STATUS.code("生成")); @@ -1252,7 +1252,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl row.getString("task_code")) .distinct().collect(Collectors.joining("','")); - List taskList = taskTab.query("task_id IN ('" + taskCodeIn + "')") + List taskList = taskService.query("task_id IN ('" + taskCodeIn + "')") .getResultJSONArray(0).toJavaList(JSONObject.class); // 更新异常货位 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index 1648810d3..e0497d650 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -736,7 +736,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl '"+TaskStatusEnum.FINISHED.getCode()+"'"); + taskService.update(jsonTaskParam,"task_id IN ('"+String.join("','", needUpdateTaskList)+"') AND task_status <> '"+TaskStatusEnum.FINISHED.getCode()+"'"); // 更新子卷包装关系 String pcsn_in = disDaoList.stream() diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 114442cb8..bceda36d7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -69,7 +69,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { * 2.插入木箱对象载具表 */ // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); @@ -83,7 +83,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { * 找一个木箱区的一个仓位,生成任务并下发 */ /* // 判断起点点位是否存在 - JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + + JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "'") .uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java index ed524dc42..f66ff27e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java @@ -54,12 +54,12 @@ public class InVehicleManageServiceImpl implements InVehicleManageService { @Transactional public void inVehicle(JSONObject whereJson) { // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); // 判断起点点位是否存在 - JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + + JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "'") .uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java index d799d59b1..a26149342 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java @@ -68,7 +68,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { * 1.找到符合条件的空木箱 */ // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); @@ -76,7 +76,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { whereJson.put("sect_id", RegionTypeEnum.TWO_MX01.getId()); /* // 判断起点点位是否存在 - JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + + JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "'") .uniqueResult(0); @@ -167,11 +167,11 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { @Transactional public String taskExceptionalOut(JSONObject jsonObject) { // 任务表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr"); - JSONObject jsonTask = taskTab.query("task_code = '" + jsonObject.getString("task_code") + "'").uniqueResult(0); + JSONObject jsonTask = taskService.query("task_code = '" + jsonObject.getString("task_code") + "'").uniqueResult(0); // 找出对应的浅货位 JSONObject jsonAttrOrder = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java index 2300279ac..11dfa8ebe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java @@ -61,7 +61,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService { * 3.确定仓位 */ // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); @@ -70,7 +70,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService { whereJson.put("storagevehicle_type", whereJson.getString("vehicle_type")); /* // 判断起点点位是否存在 - JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + + JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "'") .uniqueResult(0); @@ -153,11 +153,11 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService { @Transactional public String taskExceptionalOut(JSONObject jsonObject) { // 任务表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr"); - JSONObject jsonTask = taskTab.query("task_code = '" + jsonObject.getString("task_code") + "'").uniqueResult(0); + JSONObject jsonTask = taskService.query("task_code = '" + jsonObject.getString("task_code") + "'").uniqueResult(0); // 找出对应的浅货位 JSONObject jsonAttrOrder = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java index 45a31a7cb..6b9da34f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/AutoRiKuServiceImpl.java @@ -209,15 +209,15 @@ public class AutoRiKuServiceImpl implements AutoRiKuService { @Override public JSONObject queryNum(JSONObject whereJson) { - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String layer_num = whereJson.getString("layer_num"); // 有货个数 - JSONArray haveMoney = pointTab.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')<>'' and is_delete = '0' and is_used = '1'").getResultJSONArray(0); + JSONArray haveMoney = schBasePointService.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')<>'' and is_delete = '0' and is_used = '1'").getResultJSONArray(0); // 无货个数 - JSONArray unMoney = pointTab.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')='' and is_delete = '0' and is_used = '1'").getResultJSONArray(0); + JSONArray unMoney = schBasePointService.query("layer_num = '" + layer_num + "' and point_type = '9' and IFNULL(vehicle_code,'')='' and is_delete = '0' and is_used = '1'").getResultJSONArray(0); JSONObject result = new JSONObject(); result.put("haveMoney", haveMoney.size()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index 8753b12cf..2de67c2ec 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -44,7 +44,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService @Override public Map queryAll(Map whereJson, Pageable page) { - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); HashMap map = new HashMap(); String storagevehicle_code_begin = (String) whereJson.get("storagevehicle_code_begin"); @@ -63,7 +63,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService /*JSONArray content = json.getJSONArray("content"); for (int i = 0; i < content.size(); i++) { JSONObject jsonObject = content.getJSONObject(i); - JSONObject jsonTask = taskTab.query("vehicle_code = '" + jsonObject.getString("storagevehicle_code") + "' and task_status <> '99' and is_delete = '0'").uniqueResult(0); + JSONObject jsonTask = taskService.query("vehicle_code = '" + jsonObject.getString("storagevehicle_code") + "' and task_status <> '99' and is_delete = '0'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonTask)) { jsonObject.put("start_point_code", jsonTask.getString("start_point_code")); jsonObject.put("next_point_code", jsonTask.getString("next_point_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java index 30d0d4b49..80ca66474 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java @@ -81,7 +81,7 @@ public class StoreIvtServiceImpl { * @created 2020年5月12日 上午8:52:44 */ private void changeInventory(JSONObject param, IvtChangeTypeEnum changeType) { - WQLObject stackIvtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + WQLObject stackstIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); String struct_id = param.getString("struct_id"); String vehicle_code = param.getString("vehicle_code"); String stewing_time = param.getString("stewing_time"); @@ -95,7 +95,7 @@ public class StoreIvtServiceImpl { String material_id = param.getString("material_id"); // 拼接查询条件参数 String whereArgs = "struct_id = '" + struct_id + "' and material_id = '" + material_id + "'"; - JSONObject stackIvtObj = stackIvtTab.query(whereArgs).uniqueResult(0); + JSONObject stackIvtObj = stackstIvtCoolpointivtService.query(whereArgs).uniqueResult(0); // 需变动的数量 String change_qty = param.getString("change_qty"); @@ -166,7 +166,7 @@ public class StoreIvtServiceImpl { } json.put("is_full", is_full); - stackIvtTab.insert(json); + stackstIvtCoolpointivtService.insert(json); } // 对应的货位上有物料，需判断数量重量相关字段是否符合实际逻辑，符合时更新相应记录 if (stackIvtObj != null) { @@ -284,11 +284,11 @@ public class StoreIvtServiceImpl { JSONObject structObj = new JSONObject(); structObj.put("storagevehicle_code", ""); structObj.put("struct_id", stackIvtObj.getString("struct_id")); - stackIvtTab.delete(whereArgs); + stackstIvtCoolpointivtService.delete(whereArgs); } else {//更新 stackIvtObj.put("vehicle_code", vehicle_code); - stackIvtTab.update(stackIvtObj, whereArgs); + stackstIvtCoolpointivtService.update(stackIvtObj, whereArgs); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index 1f0446d24..e185a2736 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -471,10 +471,10 @@ public class StructattrServiceImpl implements StructattrService { @Override @Transactional(rollbackFor = Exception.class) public JSONObject unLockPoint(JSONObject whereJson) { - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String point_code = whereJson.getString("point_code"); - JSONObject jsonPoint = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); + JSONObject jsonPoint = schBasePointService.query("point_code = '" + point_code + "'").uniqueResult(0); /* 判断点位是第几层 @@ -491,7 +491,7 @@ public class StructattrServiceImpl implements StructattrService { } } if (StrUtil.equals(jsonPoint.getString("layer_num"), "1")) { - JSONObject jsonPoint2 = pointTab.query("device_code = '" + jsonPoint.getString("device_code") + "' and layer_num = '2'").uniqueResult(0); + JSONObject jsonPoint2 = schBasePointService.query("device_code = '" + jsonPoint.getString("device_code") + "' and layer_num = '2'").uniqueResult(0); //查询对应的包装关系，如果为需要解绑删除的则删除包装关系 JSONArray sub_rows2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + jsonPoint2.getString("vehicle_code") + "'").getResultJSONArray(0); for (int i = 0; i < sub_rows2.size(); i++) { @@ -503,13 +503,13 @@ public class StructattrServiceImpl implements StructattrService { jsonPoint2.put("point_status", "1"); jsonPoint2.put("lock_type", "1"); jsonPoint2.put("vehicle_code", ""); - pointTab.update(jsonPoint2); + schBasePointService.update(jsonPoint2); } jsonPoint.put("point_status", "1"); jsonPoint.put("lock_type", "1"); jsonPoint.put("vehicle_code", ""); - pointTab.update(jsonPoint); + schBasePointService.update(jsonPoint); return null; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index c29b3fce6..bf32c89f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -220,8 +220,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public String againApply(String task_id) { log.info("输入参数：" + task_id); - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + WQLObject taskService = WQLObject.getWQLObject("SCH_BASE_Task"); + JSONObject jsonTask = taskService.query("task_id = '" + task_id + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonTask)) { throw new BadRequestException("任务已删除或已完成！"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 10fc513b3..4d9624bf3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -186,8 +186,6 @@ public class LmsToMesServiceImpl implements LmsToMesService { if ("E".equals(RTYPE)) { throw new BadRequestException(result.getString("RTMSG")); } - - } catch (Exception e) { throw new BadRequestException("MES提示错误：" + e.getMessage()); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 82235652c..a50d4371e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -1421,7 +1421,6 @@ public class MesToLmsServiceImpl implements MesToLmsService { } @Override - @Transactional(rollbackFor = Exception.class) public JSONObject sendAuditResult(JSONObject param) { log.info("sendAuditResult接口输入参数为：-------------------" + param.toString()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java index 8139b75e4..f81f04afa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java @@ -44,5 +44,8 @@ public class AppUpdateController { obj.put("url", app_rul); obj.put("versionName", app_version); return new ResponseEntity<>(obj, HttpStatus.OK); + + + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java index 531800c81..e41816631 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor - +//010302 @RequestMapping("api/pda/feeding") @Slf4j public class FeedingController { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java index a3f7d0c47..8756465bd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor - +//010101 010103 @RequestMapping("api/pda/raw") @Slf4j public class RawFoilController { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index eaf17e735..0e581d16e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -123,7 +123,24 @@ public class BakingServiceImpl implements BakingService { * 暂存区入烘箱 */ // 1.查询烘箱对应的空位 - JSONObject jsonHotIvt = getJsonObject(jsonPointZc.getString("product_area"), jsonPointZc, temperature); + JSONObject jsonMap = new JSONObject(); + jsonMap.put("flag", "1"); + jsonMap.put("product_area", jsonPointZc.getString("product_area")); + //获取温度幅度 + jsonMap.put("point_location", jsonPointZc.getString("point_location")); + JSONArray hot_rows = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().getResultJSONArray(0); + JSONObject jsonHotIvt = new JSONObject(); + for (int i = 0; i < hot_rows.size(); i++) { + JSONObject hot_row = hot_rows.getJSONObject(i); + String point_code = hot_row.getString("point_code"); + String point_temperature = (String) redisUtils.hget(point_code, "temperature"); + if (!ObjectUtil.isEmpty(point_temperature)) { + if (point_temperature.equals(temperature)) { + jsonHotIvt = hot_row; + break; + } + } + } if (ObjectUtil.isEmpty(jsonHotIvt)) { throw new BadRequestException("烘烤区没有合适温度的空位！"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java index bd4e250b0..753017a5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java @@ -44,10 +44,10 @@ public class HandleBakingServiceImpl implements HandleBakingService { String option = whereJson.getString("option"); // 1-入箱 2-出箱 - WQLObject coolIvtTab = WQLObject.getWQLObject("ST_IVT_CoolPointIvt"); // 冷却区点位库存表 - WQLObject hosIvtTab = WQLObject.getWQLObject("ST_IVT_HotPointIvt"); // 烤箱区点位库存表 - WQLObject coolTab = WQLObject.getWQLObject("ST_IVT_CoolRegionIO"); // 冷却区出入表 - WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 + WQLObject coolstIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_CoolPointIvt"); // 冷却区点位库存表 + WQLObject hosstIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_HotPointIvt"); // 烤箱区点位库存表 + WQLObject stIvtCoolRegionIoService = WQLObject.getWQLObject("ST_IVT_CoolRegionIO"); // 冷却区出入表 + WQLObject pdmBiRawfoilworkorderService = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表 // 入箱 @@ -60,7 +60,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); - JSONObject jsonRaw = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); + JSONObject jsonRaw = pdmBiRawfoilworkorderService.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonMater)) { throw new BadRequestException("物料基础信息中无此物料"); @@ -111,10 +111,10 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonCool.put("confirm_optid", currentUserId); jsonCool.put("confirm_optname", nickName); jsonCool.put("confirm_time", DateUtil.now()); - coolTab.insert(jsonCool); + stIvtCoolRegionIoService.insert(jsonCool); // 更新冷却区库存状态 - JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "'").uniqueResult(0); + JSONObject jsonCoolIvt = coolstIvtCoolpointivtService.query("full_point_code = '" + point_code1 + "'").uniqueResult(0); jsonCoolIvt.put("full_point_status", "01"); jsonCoolIvt.put("cool_ivt_status", "01"); @@ -125,7 +125,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonCoolIvt.put("update_optid", currentUserId); jsonCoolIvt.put("update_optname", nickName); jsonCoolIvt.put("update_time", DateUtil.now()); - coolIvtTab.update(jsonCoolIvt); + coolstIvtCoolpointivtService.update(jsonCoolIvt); //生成烘箱出入库表 @@ -143,7 +143,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { this.createHotIoMst(hotParam); // 更新烘箱区库存状态 - JSONObject jsonHotIvt = hosIvtTab.query("point_code = '" + next_point_code + "'").uniqueResult(0); + JSONObject jsonHotIvt = hosstIvtCoolpointivtService.query("point_code = '" + next_point_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonHotIvt)) { throw new BadRequestException("终点请扫描正确的烘箱点位！"); } @@ -158,7 +158,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonHotIvt.put("update_optid", currentUserId); jsonHotIvt.put("update_optname", nickName); jsonHotIvt.put("update_time", DateUtil.now()); - hosIvtTab.update(jsonHotIvt); + hosstIvtCoolpointivtService.update(jsonHotIvt); // 将入烘箱信息发送给mes JSONObject param = new JSONObject(); @@ -203,7 +203,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { this.createHotIoMst(hotParam); //维护烘箱库存信息 - JSONObject jsonHotIvt = hosIvtTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); + JSONObject jsonHotIvt = hosstIvtCoolpointivtService.query("point_code = '" + point_code1 + "'").uniqueResult(0); // 更新烘箱区库存状态 jsonHotIvt.put("point_status", "01"); jsonHotIvt.put("container_name", ""); @@ -213,7 +213,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonHotIvt.put("update_optid", currentUserId); jsonHotIvt.put("update_optname", nickName); jsonHotIvt.put("update_time", DateUtil.now()); - hosIvtTab.update(jsonHotIvt); + hosstIvtCoolpointivtService.update(jsonHotIvt); //生成冷却区入库记录 JSONObject jsonCool = new JSONObject(); @@ -237,10 +237,10 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonCool.put("confirm_optid", currentUserId); jsonCool.put("confirm_optname", nickName); jsonCool.put("confirm_time", DateUtil.now()); - coolTab.insert(jsonCool); + stIvtCoolRegionIoService.insert(jsonCool); //更新冷却区库存 - JSONObject jsonIvt = coolIvtTab.query("full_point_code ='" + next_point_code + "'").uniqueResult(0); + JSONObject jsonIvt = coolstIvtCoolpointivtService.query("full_point_code ='" + next_point_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonIvt)) { throw new BadRequestException("终点请扫描正确的冷却区点位！"); } @@ -259,7 +259,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonIvt.put("container_name", jsonRaw.getString("container_name")); jsonIvt.put("workorder_id", jsonRaw.getString("workorder_id")); jsonIvt.put("ivt_qty", jsonRaw.getString("productin_qty")); - coolIvtTab.update(jsonIvt); + coolstIvtCoolpointivtService.update(jsonIvt); //查询该母卷对应最近的一条入烘箱记录 JSONObject last_hot_mst = WQLObject.getWQLObject("ST_IVT_HotRegionIOMst").query("container_name = '" + container_name + "' AND io_type = '0' order by confirm_time desc").uniqueResult(0); @@ -339,7 +339,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); - WQLObject hotMstTab = WQLObject.getWQLObject("ST_IVT_HotRegionIOMst"); // 烘箱区出入主表 + WQLObject stIvtHotregioniomstService = WQLObject.getWQLObject("ST_IVT_HotRegionIOMst"); // 烘箱区出入主表 JSONObject jsonHotMst = new JSONObject(); jsonHotMst.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId()); @@ -364,7 +364,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { jsonHotMst.put("confirm_optid", currentUserId); jsonHotMst.put("confirm_optname", nickName); jsonHotMst.put("confirm_time", DateUtil.now()); - hotMstTab.insert(jsonHotMst); + stIvtHotregioniomstService.insert(jsonHotMst); return jsonHotMst.getString("iostorinv_id"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 17008a9f3..423bafd5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -143,16 +143,16 @@ public class RawFoilServiceImpl implements RawFoilService { @Transactional(rollbackFor = Exception.class) public JSONObject needEmptyAxis(JSONObject whereJson) { - WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 - WQLObject sbTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); // 生箔点位库存表 + WQLObject pdmBiRawfoilworkorderService = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 + WQLObject stIvtSbpointivtService = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); // 生箔点位库存表 JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); - JSONObject jsonRaw = rawTab.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); + JSONObject jsonRaw = pdmBiRawfoilworkorderService.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); if (!StrUtil.equals(jsonRaw.getString("status"), "01")) { throw new BadRequestException("工单状态不为开始"); } - JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); + JSONObject jsonSb = stIvtSbpointivtService.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSb)) { throw new BadRequestException("点位：" + jsonRaw.getString("resource_name") + "生箔设备不存在"); } @@ -196,7 +196,7 @@ public class RawFoilServiceImpl implements RawFoilService { // 更新工单状态 jsonRaw.put("status", "02"); - rawTab.update(jsonRaw); + pdmBiRawfoilworkorderService.update(jsonRaw); JSONObject jo = new JSONObject(); jo.put("message", "操作成功!"); @@ -336,11 +336,11 @@ public class RawFoilServiceImpl implements RawFoilService { @Override public JSONObject confirmBlanking(JSONObject whereJson) { - WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单 - WQLObject sbTab = WQLObject.getWQLObject("st_ivt_sbpointivt"); // 生箔点位库存表 + WQLObject pdmBiRawfoilworkorderService = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单 + WQLObject stIvtSbpointivtService = WQLObject.getWQLObject("st_ivt_sbpointivt"); // 生箔点位库存表 JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); - JSONObject jsonRaw = rawTab.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); + JSONObject jsonRaw = pdmBiRawfoilworkorderService.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); if (!StrUtil.equals(jsonRaw.getString("status"), "02")) { throw new BadRequestException("工单状态不为空轴搬出"); @@ -351,7 +351,7 @@ public class RawFoilServiceImpl implements RawFoilService { JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + container_name + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0); // 查询生箔点位库存表 - JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); + JSONObject jsonSb = stIvtSbpointivtService.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSb)) { throw new BadRequestException("点位不存在"); } @@ -374,7 +374,7 @@ public class RawFoilServiceImpl implements RawFoilService { // 更新工单状态为确认下卷 jsonRaw.put("status", "03"); - rawTab.update(jsonRaw); + pdmBiRawfoilworkorderService.update(jsonRaw); JSONObject jo = new JSONObject(); jo.put("message", "操作成功!"); @@ -385,9 +385,9 @@ public class RawFoilServiceImpl implements RawFoilService { public JSONObject finishBlanking(JSONObject whereJson) { JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); - WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 + WQLObject pdmBiRawfoilworkorderService = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 - JSONObject jsonRaw = rawTab.query("container_name = '" + raw_jo.getString("container_name") + "'").uniqueResult(0); + JSONObject jsonRaw = pdmBiRawfoilworkorderService.query("container_name = '" + raw_jo.getString("container_name") + "'").uniqueResult(0); if (!StrUtil.equals(jsonRaw.getString("status"), "03")) { throw new BadRequestException("工单不为确认下卷"); } @@ -419,7 +419,7 @@ public class RawFoilServiceImpl implements RawFoilService { // 更新工单状态为下卷完成 jsonRaw.put("status", "04"); - rawTab.update(jsonRaw); + pdmBiRawfoilworkorderService.update(jsonRaw); JSONObject jo = new JSONObject(); jo.put("message", "操作成功!"); @@ -428,11 +428,11 @@ public class RawFoilServiceImpl implements RawFoilService { @Override public JSONObject finish(JSONObject whereJson) { - WQLObject coolTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 + WQLObject stIvtCoolRegionIoService = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); - JSONObject jsonCool = coolTab.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); + JSONObject jsonCool = stIvtCoolRegionIoService.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); //查询该生箔工单是否存在未完成的任务 String container_name = raw_jo.getString("container_name"); @@ -445,7 +445,7 @@ public class RawFoilServiceImpl implements RawFoilService { jsonCool.put("status", "09"); jsonCool.put("realend_time", DateUtil.now()); jsonCool.put("finish_type", "02"); - coolTab.update(jsonCool); + stIvtCoolRegionIoService.update(jsonCool); JSONObject jo = new JSONObject(); jo.put("message", "操作成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java index a8ae49622..d7f83f196 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java @@ -51,14 +51,14 @@ public class ProductionOutServiceImpl implements ProductionOutService { @Transactional(rollbackFor = Exception.class) public JSONObject outConfirm(JSONObject whereJson) { - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 点位表 String box_no = whereJson.getString("box_no"); if (ObjectUtil.isEmpty(box_no)) { throw new BadRequestException("木箱不能为空"); } - JSONObject jsonPoint = pointTab.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); + JSONObject jsonPoint = schBasePointService.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("请输入正确的木箱或查看点位是否存在"); @@ -80,7 +80,7 @@ public class ProductionOutServiceImpl implements ProductionOutService { } if (StrUtil.equals(jsonPoint.getString("layer_num"), "1")) { - JSONObject jsonPoint2 = pointTab.query("device_code = '" + jsonPoint.getString("device_code") + "' and layer_num = '2'").uniqueResult(0); + JSONObject jsonPoint2 = schBasePointService.query("device_code = '" + jsonPoint.getString("device_code") + "' and layer_num = '2'").uniqueResult(0); //查询对应的包装关系，如果为需要解绑删除的则删除包装关系 JSONArray sub_rows2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + jsonPoint2.getString("vehicle_code") + "'").getResultJSONArray(0); for (int i = 0; i < sub_rows2.size(); i++) { @@ -92,13 +92,13 @@ public class ProductionOutServiceImpl implements ProductionOutService { jsonPoint2.put("point_status", "1"); jsonPoint2.put("lock_type", "1"); jsonPoint2.put("vehicle_code", ""); - pointTab.update(jsonPoint2); + schBasePointService.update(jsonPoint2); } jsonPoint.put("point_status", "1"); jsonPoint.put("lock_type", "1"); jsonPoint.put("vehicle_code", ""); - pointTab.update(jsonPoint); + schBasePointService.update(jsonPoint); JSONObject jo = new JSONObject(); jo.put("message", "出库成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java index 7801b71ae..668db5517 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java @@ -101,7 +101,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { @Override @Transactional(rollbackFor = Exception.class) public void create(RawfoilworkorderDto dto) { - WQLObject pointTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); + WQLObject schBasePointService = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); WQLObject wo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); @@ -115,7 +115,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - JSONObject jsonPoint = pointTab.query("ext_code ='" + dto.getResource_name() + "'").uniqueResult(0); + JSONObject jsonPoint = schBasePointService.query("ext_code ='" + dto.getResource_name() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("点位设备不存在"); } @@ -150,7 +150,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { throw new BadRequestException("被删除或无权限，操作失败!"); } - WQLObject pointTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); + WQLObject schBasePointService = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); WQLObject wo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder"); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); @@ -160,7 +160,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - JSONObject jsonPoint = pointTab.query("ext_code ='" + dto.getResource_name() + "'").uniqueResult(0); + JSONObject jsonPoint = schBasePointService.query("ext_code ='" + dto.getResource_name() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("点位设备不存在"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index b702db515..b2daf1aae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -107,7 +107,7 @@ public class TaskServiceImpl implements TaskService { JSONArray res = new JSONArray(); //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); + WQLObject schBasePointService = WQLObject.getWQLObject("SCH_BASE_Point"); for (int i = 0; i < content.size(); i++) { JSONObject taskObj = content.getJSONObject(i); res.add(taskObj); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index ed406b4f2..eadda5aa4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -110,7 +110,6 @@ public class InCoolIvtTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(startDto)) { throw new BadRequestException("起点未找到可用点位:" + point_code1); } - // 校验终点是否存在 JSONObject jsonIvt = ivtTab.query("full_point_code ='" + point_code2 + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonIvt)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index 46fe92277..065f07f8f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -109,7 +109,7 @@ public class InchargeServiceImpl implements InchargeService { @Override @Transactional(rollbackFor = Exception.class) public void create(EmptyvehiclerecordDto dto) { - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -122,9 +122,9 @@ public class InchargeServiceImpl implements InchargeService { throw new BadRequestException("起点不能为空"); } // 根据点位编码找到对应的所属区域 - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); dto.setEnd_region_id(end_region_id); } @@ -153,7 +153,7 @@ public class InchargeServiceImpl implements InchargeService { throw new BadRequestException("被删除或无权限，操作失败!"); } - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); @@ -162,9 +162,9 @@ public class InchargeServiceImpl implements InchargeService { throw new BadRequestException("起点不能为空"); } // 根据点位编码找到对应的所属区域 - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); dto.setEnd_region_id(end_region_id); } @@ -207,7 +207,7 @@ public class InchargeServiceImpl implements InchargeService { WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表 WQLObject dtlTab = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); // 出入库明细表 WQLObject disTab = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); // 出入库分配表 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); // 仓位库存表 + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); // 仓位库存表 WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr"); // 仓位表 WQLObject wo_sect = WQLObject.getWQLObject("st_ivt_sectattr"); // 库区表 @@ -308,7 +308,7 @@ public class InchargeServiceImpl implements InchargeService { disTab.insert(jsonOutDis); //更新库存 - JSONObject jsonIvt = ivtTab.query("pcsn = '" + jsonOutDis.getString("pcsn") + "' and canuse_qty = '" + json2.getDoubleValue("real_qty") + "'").uniqueResult(0); + JSONObject jsonIvt = stIvtCoolpointivtService.query("pcsn = '" + jsonOutDis.getString("pcsn") + "' and canuse_qty = '" + json2.getDoubleValue("real_qty") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonIvt)) { throw new BadRequestException("库存不存在或库存数量不正确"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java index 3403303e3..cec8ec850 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java @@ -106,7 +106,7 @@ public class OutChargeServiceImpl implements OutChargeService { WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); WQLObject mst_wql = WQLObject.getWQLObject("ST_IVT_IOStorInv"); WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); - WQLObject ivtTab = WQLObject.getWQLObject("st_ivt_structivt"); + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("st_ivt_structivt"); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -165,7 +165,7 @@ public class OutChargeServiceImpl implements OutChargeService { JSONObject dis_row = dis_rows.getJSONObject(i); // 校验是否存在库存 - JSONObject jsonIvt = ivtTab.query("pcsn = '" + dis_row.getString("pcsn") + "'").uniqueResult(0); + JSONObject jsonIvt = stIvtCoolpointivtService.query("pcsn = '" + dis_row.getString("pcsn") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonIvt)) { ivtList.add(jsonIvt.getString("pcsn")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java index 8e5f13234..9fa6e0714 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/EmpMoveTask.java @@ -69,7 +69,7 @@ public class EmpMoveTask extends AbstractAcsTask { WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); //任务表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); // 点位表 String task_id = taskObj.getString("task_id"); @@ -109,11 +109,11 @@ public class EmpMoveTask extends AbstractAcsTask { param2.put("lock_type", "1"); param2.put("vehicle_code", ""); param2.put("point_status", "1"); - pointTab.update(param2, "point_code = '" + jsonTask.getString("point_code1") + "'"); + schBasePointService.update(param2, "point_code = '" + jsonTask.getString("point_code1") + "'"); param2.put("vehicle_code", jsonTask.getString("vehicle_code")); param2.put("point_status", "3"); - pointTab.update(param2, "point_code = '" + jsonTask.getString("point_code2") + "'"); + schBasePointService.update(param2, "point_code = '" + jsonTask.getString("point_code2") + "'"); // 更新任务为完成 jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index ff41f2101..6da8d85db 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -284,7 +284,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { @Override @Transactional(rollbackFor = Exception.class) public String insertDtl(JSONObject map) { - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); //明细另一种写法 JSONArray array = map.getJSONArray("tableData"); JSONArray rows = new JSONArray(); @@ -392,7 +392,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { throw new BadRequestException("未查询到该批次所在货位！"); } String struct_code = struct_jo.getString("struct_code"); - JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); + JSONObject json = stIvtCoolpointivtService.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { continue; } @@ -444,7 +444,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { @Override @Transactional(rollbackFor = Exception.class) public String insertDtl2(JSONObject map) { - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); //明细另一种写法 JSONArray rows = map.getJSONArray("tableData"); @@ -534,7 +534,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { throw new BadRequestException("未查询到该批次所在货位！"); } String struct_code = struct_jo.getString("struct_code"); - JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); + JSONObject json = stIvtCoolpointivtService.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { continue; } @@ -672,10 +672,10 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { @Transactional(rollbackFor = Exception.class) public void cancelTask(JSONObject whereJson) { WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 分配表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表 + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 任务表 String task_id = whereJson.getString("task_id"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); + JSONObject jsonTask = taskService.query("task_id = '" + task_id + "'").uniqueResult(0); // 任务为下发之后就不允许取消 if (jsonTask.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) { @@ -692,7 +692,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // 删除此任务 JSONObject paramMap2 = new JSONObject(); paramMap2.put("is_delete", "1"); - taskTab.update(paramMap2, "task_id = '" + task_id + "'"); + taskService.update(paramMap2, "task_id = '" + task_id + "'"); } @Override @@ -864,7 +864,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { WQLObject wo = WQLObject.getWQLObject("ST_IVT_IOStorInv"); WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); wo.update(whereJson); //先删除该单据下的所有明细 @@ -933,7 +933,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { throw new BadRequestException("未查询到该批次所在货位！"); } String struct_code = struct_jo.getString("struct_code"); - JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); + JSONObject json = stIvtCoolpointivtService.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { continue; } @@ -1772,7 +1772,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { //仓位表 WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr"); // 库存表 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); String struct_id = whereJson.getString("struct_id"); String point_code = whereJson.getString("point_code"); // 终点 @@ -2781,7 +2781,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { //仓位表 WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr"); // 库存表 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); + WQLObject stIvtCoolpointivtService = WQLObject.getWQLObject("ST_IVT_StructIvt"); String point_code = whereJson.getString("point_code"); // 终点 String iostorinv_id = whereJson.getString("iostorinv_id"); @@ -3878,7 +3878,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { * @return */ /* public JSONArray isNum(JSONArray arr) { - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表 + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 任务表 JSONArray result = new JSONArray(); @@ -3886,7 +3886,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject json = arr.getJSONObject(i); String struct_code = json.getString("struct_code"); - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06')").uniqueResult(0); + JSONObject jsonTask1 = taskService.query("point_code1 = '" + struct_code + "' and task_status in ('05','06')").uniqueResult(0); if (ObjectUtil.isEmpty(jsonTask1)) { result.add(json); @@ -3934,7 +3934,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { * 2）锁住：判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错 */ WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表 + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 任务表 if (ObjectUtil.isEmpty(json)) { // 如果为空说明未堵住 @@ -3969,8 +3969,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { param = true; } else { // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错 - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask1 = taskService.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask2 = taskService.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) { // 未生成任务 @@ -3995,8 +3995,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { param = true; } else { // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错 - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask1 = taskService.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask2 = taskService.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) { // 未生成任务 @@ -4025,8 +4025,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { param = false; } else { // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错 - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask1 = taskService.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask2 = taskService.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) { // 未生成任务 @@ -4043,8 +4043,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { param = true; } else { // 锁住:判断是否生成任务，生成：则不用生成移库单 = false；未生成则报错 - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask1 = taskService.query("point_code1 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + JSONObject jsonTask2 = taskService.query("point_code2 = '" + struct_code + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonTask1) && ObjectUtil.isEmpty(jsonTask2)) { // 未生成任务 @@ -4311,7 +4311,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // 物料表 WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 任务表 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); // 库区表 WQLObject sectTab = WQLObject.getWQLObject("st_ivt_sectattr"); // 子卷包装关系表 @@ -4438,10 +4438,10 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { wo_dis.update(jsonDis); // 更新对应任务为完成 - JSONObject jsonTask = taskTab.query("task_id = '" + jsonDis.getString("task_id") + "' and task_status < '07'").uniqueResult(0); + JSONObject jsonTask = taskService.query("task_id = '" + jsonDis.getString("task_id") + "' and task_status < '07'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonTask)) { jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskTab.update(jsonTask); + taskService.update(jsonTask); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java index 20e9bfc18..60a7e6fc5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java @@ -86,7 +86,7 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ @Override @Transactional(rollbackFor = Exception.class) public void create(EmptyvehiclerecordDto dto) { - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -99,9 +99,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ throw new BadRequestException("起点不能为空"); } // 根据点位编码找到对应的所属区域 - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); dto.setEnd_region_id(end_region_id); } @@ -130,7 +130,7 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ throw new BadRequestException("被删除或无权限，操作失败!"); } - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); @@ -139,9 +139,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ throw new BadRequestException("起点不能为空"); } // 根据点位编码找到对应的所属区域 - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); dto.setEnd_region_id(end_region_id); } @@ -182,7 +182,7 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ @Transactional(rollbackFor = Exception.class) public void createTask(JSONObject whereJson) { WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); JSONObject jsonEmp = empTab.query("record_uuid = '" + whereJson.getString("record_uuid") + "'").uniqueResult(0); // 准备参数 调用空载具处理类中的 创建任务的方法 @@ -195,7 +195,7 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ // String task_id = new SendEmpVehicleTask().createTask(param); // 更新空载具表中的任务id和单据状态 PointService pointDto = SpringContextHolder.getBean(PointService.class); -// JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); +// JSONObject jsonTask = taskService.query("task_id = '" + task_id + "'").uniqueResult(0); // jsonEmp.put("task_uuid", Long.valueOf(task_id)); jsonEmp.put("bill_status", "20"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java index 058c8fc25..6ef9c49ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java @@ -86,7 +86,7 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe @Override @Transactional(rollbackFor = Exception.class) public void create(EmptyvehiclerecordDto dto) { - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -99,9 +99,9 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe throw new BadRequestException("终点不能为空"); } // 根据点位编码找到对应的所属区域 - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(start_point_code)) { - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); dto.setStart_region_id(start_region_id); } @@ -130,7 +130,7 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe throw new BadRequestException("被删除或无权限，操作失败!"); } - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); @@ -139,9 +139,9 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe throw new BadRequestException("终点不能为空"); } // 根据点位编码找到对应的所属区域 - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(start_point_code)) { - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); + Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); dto.setStart_region_id(start_region_id); } @@ -182,7 +182,7 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe @Transactional(rollbackFor = Exception.class) public void createTask(JSONObject whereJson) { WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); JSONObject jsonEmp = empTab.query("record_uuid = '" + whereJson.getString("record_uuid") + "'").uniqueResult(0); // 准备参数 调用空载具处理类中的 创建任务的方法 @@ -195,7 +195,7 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe // String task_id = new CallEmpVehicleTask().createTask(param); // 更新空载具表中的任务id和单据状态 PointService pointDto = SpringContextHolder.getBean(PointService.class); -// JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); +// JSONObject jsonTask = taskService.query("task_id = '" + task_id + "'").uniqueResult(0); // jsonEmp.put("task_uuid", Long.valueOf(task_id)); jsonEmp.put("bill_status", "20"); diff --git a/lms/nladmin-ui/public/config.js b/lms/nladmin-ui/public/config.js index c4d32ea74..5fc1438c5 100644 --- a/lms/nladmin-ui/public/config.js +++ b/lms/nladmin-ui/public/config.js @@ -1,9 +1,9 @@ window.g = { dev: { - VUE_APP_BASE_API: 'http://127.0.0.1:8010' + VUE_APP_BASE_API: 'http://localhost:8020' }, prod: { - VUE_APP_BASE_API: 'http://127.0.0.1:8010' + VUE_APP_BASE_API: 'http://localhost:8020' }