From f55e0839dca37c07cb1b58b1b924cb5c045c8089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Tue, 9 May 2023 10:51:13 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E6=B7=B7=E6=96=99=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8bom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaterialbaseServiceImpl.java | 20 +- .../basedata/wql/QMD_ME_MATERIAL_DETAIL.wql | 8 +- .../wms/ext/acs/rest/AcsToWmsController.java | 8 + .../wms/ext/acs/service/AcsToWmsService.java | 2 + .../acs/service/impl/AcsToWmsServiceImpl.java | 25 + .../org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql | 15 + .../pdm/service/impl/DeviceServiceImpl.java | 1 + .../service/impl/WorkorderServiceImpl.java | 10 +- .../org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql | 7 + .../org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql | 4 + .../src/main/java/org/nl/wms/wms.xls | Bin 314368 -> 282624 bytes .../wms/basedata/material/detail/index.vue | 51 +-- .../views/wms/pdm/workerorder/hl/index.vue | 429 ++++++++++++++++++ .../src/views/wms/pdm/workerorder/index.vue | 26 +- .../src/views/wms/pub/DeviceDialog.vue | 14 +- .../src/views/wms/sch/point/index.vue | 2 +- 16 files changed, 536 insertions(+), 86 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java index c30058b..8b1f79f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java @@ -119,24 +119,24 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { if (ObjectUtil.isEmpty(furnace_name)) { throw new BadRequestException("物料编码解析错误：未知炉型！"); } - material_detail.put("furnace", furnace_code); + material_detail.put("furnace", furnace_name.getString("label")); String material_brick_code = material_code.substring(2, 5); JSONObject material_brick_type = dict_detail_table.query("name = 'material_brick_type' AND value = '" + material_brick_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(material_brick_type)) { throw new BadRequestException("物料编码解析错误：未知物料砖类型！"); } - material_detail.put("material_brick_type", material_brick_code); + material_detail.put("material_brick_type", material_brick_type.getString("label")); String bom_code = material_code.substring(5, 11); - JSONObject bom = new JSONObject(); - bom.put("material_id", IdUtil.getSnowflake(1, 1).nextId()); - bom.put("material_code", bom_code); - bom.put("material_type", "2"); - bom.put("create_id", currentUserId); - bom.put("create_name", nickName); - bom.put("create_time", now); JSONObject old_bom = wo.query("material_code = '" + bom_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(old_bom)) { + JSONObject bom = new JSONObject(); + bom.put("material_id", IdUtil.getSnowflake(1, 1).nextId()); + bom.put("material_code", bom_code); + bom.put("material_type", "2"); + bom.put("create_id", currentUserId); + bom.put("create_name", nickName); + bom.put("create_time", now); wo.insert(bom); } @@ -148,7 +148,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { if (ObjectUtil.isEmpty(product_grade)) { throw new BadRequestException("物料编码解析错误：未知牌号！"); } - material_detail.put("product_grade", product_grade_code); + material_detail.put("product_grade", product_grade.getString("label")); material_detail.put("brick_type", material_code.substring(23)); material_detail.put("create_id", currentUserId); material_detail.put("create_name", nickName); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL_DETAIL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL_DETAIL.wql index f19d666..95d4dc3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL_DETAIL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL_DETAIL.wql @@ -40,15 +40,9 @@ IF 输入.flag = "1" PAGEQUERY SELECT - md.*, - d1.label AS 'furnace_name', - d2.label AS 'material_brick_type_name', - d3.label AS 'product_grade_name' + md.* FROM md_me_material_detail md - LEFT JOIN sys_dict_detail d1 ON d1.`value` = md.furnace AND d1.`name` = 'furnace' - LEFT JOIN sys_dict_detail d2 ON d2.`value` = md.material_brick_type AND d2.`name` = 'material_brick_type' - LEFT JOIN sys_dict_detail d3 ON d3.`value` = md.product_grade AND d3.`name` = 'product_grade' WHERE md.is_delete = '0' ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 7839f30..1501907 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -194,4 +194,12 @@ public class AcsToWmsController { public ResponseEntity getVehicleInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(acsToWmsService.getVehicleInfo(whereJson), HttpStatus.OK); } + + @PostMapping("/outKiln") + @Log("出窑分配") + @ApiOperation("出窑分配") + @SaIgnore + public ResponseEntity outKiln(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(acsToWmsService.outKiln(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 529a6b0..f995719 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -106,4 +106,6 @@ public interface AcsToWmsService { JSONObject feedbackVehicleType(JSONObject param); JSONObject getVehicleInfo(JSONObject whereJson); + + JSONObject outKiln(JSONObject whereJson); } 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 aa78061..c795c91 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 @@ -864,4 +864,29 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("data", data); return result; } + + @Override + public JSONObject outKiln(JSONObject whereJson) { + String vehicle_code = TaskUtils.formatVehicleCode(whereJson.getString("vehicle_code")); + if ("0000".equals(vehicle_code)) { + throw new BadRequestException("载具编码不能为空！"); + } + + boolean to_package = false; + JSONObject workorder = WQL + .getWO("ACS_TO_WMS") + .addParam("flag", "2") + .addParam("vehicle_code", vehicle_code) + .process() + .uniqueResult(0); + if (ObjectUtil.isNotEmpty(workorder)) { + to_package = TrueOrFalse.trueOrFalse("is_pri"); + } + + JSONObject result = new JSONObject(); + result.put("status", HttpStatus.OK.value()); + result.put("message", "分配完成！"); + result.put("data", to_package); + return result; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql index c041723..f46c526 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACS_TO_WMS.wql @@ -58,3 +58,18 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + workorder.* + FROM + st_ivt_vehicle_detail vd + LEFT JOIN pdm_bd_workorder workorder ON vd.workorder_id = workorder.workorder_id + WHERE + vd.is_delete = '0' + AND vd.vehicle_type = '2' + AND vd.vehicle_code = 输入.vehicle_code + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java index a49143f..fca055b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java @@ -46,6 +46,7 @@ public class DeviceServiceImpl implements DeviceService { if (!StrUtil.isEmpty(search)) { map.put("search", "%" + search + "%"); } + map.put("region_str", MapUtil.getStr(whereJson, "region_str")); JSONObject json = WQL.getWO("PDM_BI_DEVICE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "device.device_model ASC, device.device_code ASC"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java index 5ffa76b..e31f214 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java @@ -58,6 +58,7 @@ public class WorkorderServiceImpl implements WorkordeService { map.put("flag", "1"); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("region_code", MapUtil.getStr(whereJson, "region_code")); if (StrUtil.isNotEmpty(order_status)) { order_status = order_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); } @@ -408,12 +409,19 @@ public class WorkorderServiceImpl implements WorkordeService { public void finish(JSONObject param) { String workorder_id = param.getString("workorder_id"); WQLObject workorder_table = WQLObject.getWQLObject("pdm_bd_workorder"); - JSONObject workorder = workorder_table.query("workorder_id = " + workorder_id).uniqueResult(0); + JSONObject workorder = workorder_table.query("is_delete = '0' AND workorder_id = " + workorder_id).uniqueResult(0); + if (ObjectUtil.isEmpty(workorder)) { + throw new BadRequestException("工单不存在或已删除！"); + } if (workorder.getIntValue("order_status") < 5) { workorder.put("order_status", WorkOrderEnum.ORDER_STATUS_FINISH.value()); String qty = param.getString("qty"); if (StrUtil.isBlank(qty)) { + JSONObject device = WQLObject.getWQLObject("pdm_bi_device").query("device_id = " + workorder.getString("device_id")).uniqueResult(0); + if (Region.HL.value().equals(device.getString("region_code"))) { + throw new BadRequestException("重量不能为空！"); + } throw new BadRequestException("数量不能为空！"); } workorder.put("real_qty", qty); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql index 82daba6..44d0927 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql @@ -26,6 +26,7 @@ 输入.material TYPEAS s_string 输入.workprocedure_ids TYPEAS f_string 输入.unFinish TYPEAS s_string + 输入.region_code TYPEAS s_string [临时表] @@ -82,6 +83,12 @@ material.material_code like 输入.material ) ENDOPTION + OPTION 输入.region_code <> "" + device.region_code = 'HL' + ENDOPTION + OPTION 输入.region_code = "" + device.region_code IN ('YZ', 'FJ') + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql index 5fd0b67..b2de6a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.search TYPEAS s_string + 输入.region_str TYPEAS f_string [临时表] @@ -54,6 +55,9 @@ (device.device_code like 输入.search or device.device_name like 输入.search) ENDOPTION + OPTION 输入.region_str <> "" + device.region_code IN 输入.region_str + ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 2cbb58c5fbffa95647b512c062ded9259b06049b..7d9da0f51155823c94e2c13483111afe6d845115 100644 GIT binary patch delta 15249 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 BYU=<1 delta 44421 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 - - - + - - - + @@ -61,20 +35,7 @@ - - - + @@ -104,12 +65,12 @@ :min-width="flexWidth('material_name',crud.data,'物料名称')" /> @@ -129,7 +90,7 @@ :min-width="flexWidth('customer_code',crud.data,'客户编码')" /> diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue new file mode 100644 index 0000000..be2dacc --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue @@ -0,0 +1,429 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 68681a9..8d77062 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -107,14 +107,14 @@ style="width: 300px" clearable @focus="deviceShow=true" - @clear="form.device_code=''; form.device_id=''; form.device_name=''" + @clear="form.device_code=''; form.device_id=''; form.device_name=''; form.region_code = ''" /> - + - - - - - - - - + @@ -244,8 +230,7 @@ - - + - +