From 3b5f98eca7dca89c0b1f004858bb8b019d367e0e Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 3 May 2023 10:19:54 +0800 Subject: [PATCH] =?UTF-8?q?add:PDA=E9=85=8D=E7=B2=89=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4=EF=BC=8CPDA=E7=90=83?= =?UTF-8?q?=E7=A3=A8=E5=B7=A5=E5=BA=8F=E4=B8=8A=E6=96=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=9E=8B=E6=9D=90?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E6=89=8B=E6=8C=81=E5=96=B7=E9=9B=BE?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE=E2=80=98?= =?UTF-8?q?=E5=85=A5=E5=8E=9F=E6=9D=90=E6=96=99=E5=BA=93=E2=80=99=EF=BC=8C?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8F=91=E8=B4=A7=E5=A2=9E=E5=8A=A0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8CPDA=E5=A2=9E=E5=8A=A0=E5=86=85=E9=83=A8?= =?UTF-8?q?=E8=BD=AF=E5=BA=9F=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/pdm/rest/PdmWorkTaskController.java | 8 + .../pda/pdm/service/PdmWorkTaskService.java | 3 + .../service/impl/PdmWorkTaskServiceImpl.java | 196 +++++++++++++++++- .../org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql | 20 ++ .../st/in/rest/HandNewMaterialController.java | 15 ++ .../st/in/service/HandNewMaterialService.java | 17 ++ .../impl/HandNewMaterialServiceImpl.java | 66 ++++++ .../service/impl/HandXCOutIvtServiceImpl.java | 14 +- .../st/core/wql/QST_IVT_RAWASSISTISTOR.wql | 41 ++++ 9 files changed, 377 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java index 85ecb940..82139e7e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java @@ -2,6 +2,7 @@ package org.nl.pda.pdm.rest; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -183,6 +184,13 @@ public class PdmWorkTaskController { return new ResponseEntity<>(workTaskService.confirm(whereJson),HttpStatus.OK); } + @PostMapping("/inRaw") + @Log("喷雾工序入原材料库") + @ApiOperation("喷雾工序入原材料库") + public ResponseEntity inRaw(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(workTaskService.inRaw(whereJson),HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/PdmWorkTaskService.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/PdmWorkTaskService.java index 4f62f4b0..a3b7d68f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/PdmWorkTaskService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/PdmWorkTaskService.java @@ -1,5 +1,6 @@ package org.nl.pda.pdm.service; +import com.alibaba.fastjson.JSONObject; import org.nl.wql.core.content.HttpContext; import java.util.Map; @@ -55,4 +56,6 @@ public interface PdmWorkTaskService { Map confirm(Map jsonObject); + Map inRaw(JSONObject whereJson); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java index b1463687..92e4e59d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -159,6 +160,22 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { JSONObject item = (JSONObject)o; String vehicle_code = item.getString("storagevehicle_code"); if (!runVehicles.contains(vehicle_code)){ + + /* + 判断此配粉槽是否是所属系列产线指定的配粉槽 + @param: + workprocedure_id - 工序标识 ， product_series_id - 系列标识 ， device_id - 设备标识 + 根据以上参数查询 MPS_BD_CapacityTemplateWorkDevice 表是否存在此设备的工序设备 + */ + // 根据物料系列找到排产产能模板系列 + String device_id = item.getString("device_id"); + + JSONObject jsonTemple= WQL.getWO("QPDM_WORK_TASK").addParam("workprocedure_id", workprocedure_id) + .addParam("product_series_id", product_series_id).addParam("flag", "11") + .addParam("device_id", device_id).process().uniqueResult(0); + + if (ObjectUtil.isEmpty(jsonTemple)) continue; + vehicle = item; break; } @@ -613,12 +630,69 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { if (ObjectUtil.isEmpty(jsonObject)) { throw new PdaRequestException("传入参数不能为空！"); } + + String device_code = MapUtil.getStr(jsonObject, "device_code"); + if (ObjectUtil.isEmpty(device_code)) throw new BadRequestException("设备不能为空!"); + JSONObject jo = JSONObject.parseObject(JSON.toJSONString(jsonObject)); String is_second = jo.getString("is_second"); JSONArray rows = WQL.getWO("QPDM_WORK_TASK").addParam("flag", "6").addParam("is_second", is_second).process().getResultJSONArray(0); + + /* + * 1.根据输入参数 device_code(球磨机) 查询排产模板中对应的物料系列， + * 2.根据物料系列查询配粉工序中设备是否包含此设备 + */ + JSONObject jsonDevice = WQLObject.getWQLObject("em_bi_deviceinfo") + .query("device_code = '" + device_code + "' and is_delete = '0' and is_active = '1'") + .uniqueResult(0); + + if (ObjectUtil.isEmpty(jsonDevice)) throw new BadRequestException("设备不存在!"); + + // 获取喷雾 + JSONObject jsonProced = WQLObject.getWQLObject("pdm_bi_workprocedure") + .query("workprocedure_code = 'GX001'") + .uniqueResult(0); + + // 获取此球磨机物料系列 + JSONArray resultJSONArray = WQLObject.getWQLObject("MPS_BD_CapacityTemplateWorkDevice") + .query("device_id = '" + jsonDevice.getString("device_id") + "'") + .getResultJSONArray(0); + + if (ObjectUtil.isEmpty(resultJSONArray)) throw new BadRequestException("此设备没有配置模板系列!"); + + JSONArray array = new JSONArray(); + HashSet setMap = new HashSet<>(); + for (int j = 0; j < resultJSONArray.size(); j++) { + JSONObject templeDevice = resultJSONArray.getJSONObject(j); + + // 根据物料系列查询配粉工序中是否包含此设备 + for (int i = 0; i < rows.size(); i++) { + JSONObject json = rows.getJSONObject(i); + + JSONObject jsonPfDevice = WQLObject.getWQLObject("em_bi_deviceinfo") + .query("device_code = '" + json.getString("storagevehicle_code") + "'") + .uniqueResult(0); + + JSONObject jsonWorkDevice = WQLObject.getWQLObject("MPS_BD_CapacityTemplateWorkDevice") + .query("product_series_id = '" + templeDevice.getString("product_series_id") + + "' and workprocedure_id = '" + jsonProced.getString("workprocedure_id") + + "' and device_id = '" + jsonPfDevice.getString("device_id") + "'") + .uniqueResult(0); + + // 判断是否存在 存在则返回 + if (ObjectUtil.isNotEmpty(jsonWorkDevice)) { + setMap.add(json); + } + } + } + + for (JSONObject json : setMap) { + array.add(json); + } + JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); - returnjo.put("content", rows); + returnjo.put("content", array); returnjo.put("desc", "查询成功！"); return returnjo; } @@ -959,9 +1033,64 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { @Override public Map PWload(Map jsonObject) { JSONArray rows = WQL.getWO("QPDM_WORK_TASK").addParam("flag", "8").process().getResultJSONArray(0); + + /* + * 1.根据输入参数 device_code(喷雾塔) 查询排产模板中对应的物料系列， + * 2.根据物料系列查询球磨工序中设备是否包含此设备 + */ + String device_code = MapUtil.getStr(jsonObject, "device_code"); + + JSONObject jsonDevice = WQLObject.getWQLObject("em_bi_deviceinfo") + .query("device_code = '" + device_code + "' and is_delete = '0' and is_active = '1'") + .uniqueResult(0); + + if (ObjectUtil.isEmpty(jsonDevice)) throw new BadRequestException("设备不存在!"); + + // 获取球磨工序 + JSONObject jsonProced = WQLObject.getWQLObject("pdm_bi_workprocedure") + .query("workprocedure_code = 'GX002'") + .uniqueResult(0); + + // 获取此喷雾塔物料系列 + JSONArray resultJSONArray = WQLObject.getWQLObject("MPS_BD_CapacityTemplateWorkDevice") + .query("device_id = '" + jsonDevice.getString("device_id") + "'") + .getResultJSONArray(0); + + if (ObjectUtil.isEmpty(resultJSONArray)) throw new BadRequestException("此设备没有配置模板系列!"); + + JSONArray array = new JSONArray(); + HashSet setMap = new HashSet<>(); + for (int j = 0; j < resultJSONArray.size(); j++) { + JSONObject templeDevice = resultJSONArray.getJSONObject(j); + + // 根据物料系列查询球磨工序中是否包含此设备 + for (int i = 0; i < rows.size(); i++) { + JSONObject json = rows.getJSONObject(i); + + JSONObject jsonPfDevice = WQLObject.getWQLObject("em_bi_deviceinfo") + .query("device_code = '" + json.getString("device_code") + "'") + .uniqueResult(0); + + JSONObject jsonWorkDevice = WQLObject.getWQLObject("MPS_BD_CapacityTemplateWorkDevice") + .query("product_series_id = '" + templeDevice.getString("product_series_id") + + "' and workprocedure_id = '" + jsonProced.getString("workprocedure_id") + + "' and device_id = '" + jsonPfDevice.getString("device_id") + "'") + .uniqueResult(0); + + // 判断是否存在 存在则返回 + if (ObjectUtil.isNotEmpty(jsonWorkDevice)) { + setMap.add(json); + } + } + } + + for (JSONObject json : setMap) { + array.add(json); + } + JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); - returnjo.put("content", rows); + returnjo.put("content", array); returnjo.put("desc", "查询成功！"); return returnjo; } @@ -1585,6 +1714,69 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { return returnjo; } + @Override + @Transactional(rollbackFor = Exception.class) + public Map inRaw(JSONObject whereJson) { + /* + 只生成搬运任务 + */ + + WQLObject workorderTab = WQLObject.getWQLObject("pdm_bi_workorder"); + WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); + + String vehicle_code = whereJson.getString("vehicle_code"); + String point_code = whereJson.getString("point_code"); + + if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("托盘不能为空！"); + if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("起点不能为空！"); + + JSONObject form = whereJson.getJSONObject("row"); + + // 判断是否是外协工令 + JSONObject jsonWork = workorderTab.query("workorder_code = '" + form.getString("workorder_code") + "'").uniqueResult(0); + if (!StrUtil.equals(jsonWork.getString("is_out"), "1")) { + throw new PdaRequestException("此工令不是外协工令！"); + } + + // 判断托盘是否被占用 + JSONObject jsonVehicle = pointTab.query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonVehicle)) throw new BadRequestException("此托盘已被占用!"); + + // 找一个型材区的点位 + JSONObject jsonNextPoint = pointTab.query("area_type = '09' and lock_type = '00' and is_used = '1' and is_delete = '0' and point_status = '00' order by point_code") + .uniqueResult(0); + + if (ObjectUtil.isEmpty(jsonNextPoint)) throw new PdaRequestException("没有可用点位！"); + + // 生成任务并下发 + JSONObject task_jo = new JSONObject(); + task_jo.put("start_point_code", point_code); + task_jo.put("next_point_code",jsonNextPoint.getString("point_code")); + task_jo.put("vehicle_code", vehicle_code); + task_jo.put("task_type", "16"); + task_jo.put("taskdtl_type", "15"); + AbstractAcsTask task = new ProductTask(); + String taskdtl_id = task.createTask(task_jo); + + AbstractAcsTask intask = new InTask(); + //调用ACS接受任务接口 + JSONObject result = intask.notifyAcs(taskdtl_id); + if (ObjectUtil.isNotEmpty(result)) { + String status = result.getString("status"); + if ("200".equals(status)) { + HashMap mapnow = new HashMap<>(); + mapnow.put("task_status", "02"); + WQLObject.getWQLObject("SCH_BASE_Task").update(mapnow, "taskdtl_id = '" + taskdtl_id + "'"); + } else { + throw new BadRequestException("任务下发失败:" + result.getString("message")); + } + } + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "操作成功！"); + return returnjo; + } + @Override @Transactional(rollbackFor = Exception.class) public Map confirmGZLoad(Map jsonObject) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql index 58cba310..d3ea4025 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql @@ -23,6 +23,7 @@ 输入.is_second TYPEAS s_string 输入.product_series_id TYPEAS s_string 输入.workprocedure_id TYPEAS s_string + 输入.device_id TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -413,3 +414,22 @@ ENDQUERY ENDIF + IF 输入.flag = "11" + QUERY + SELECT + device.* + FROM + MPS_BD_CapacityTemplateWorkDevice device + LEFT JOIN MPS_BD_CapacityTemplateMst mst ON mst.captemplate_id = device.captemplate_id + + WHERE + device.product_series_id = 输入.product_series_id + AND device.workprocedure_id = 输入.workprocedure_id + AND device.device_id = 输入.device_id + AND mst.is_used = '1' + AND mst.is_delete = '0' + + ENDSELECT + ENDQUERY + ENDIF + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java index 308d4a9d..21fd0a9e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java @@ -2,6 +2,7 @@ package org.nl.pda.st.in.rest; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -113,4 +114,18 @@ public class HandNewMaterialController { return new ResponseEntity<>(handNewMaterialService.getRecBillDtl(whereJson,ctx),HttpStatus.OK); } + @PostMapping("/insideIn") + @Log("内部软废入库查询组盘信息") + @ApiOperation("内部软废入库查询组盘信息") + public ResponseEntity insideIn(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(handNewMaterialService.insideIn(whereJson),HttpStatus.OK); + } + + @PostMapping("/insideInConfirm") + @Log("内部软废入库确认") + @ApiOperation("内部软废入库确认") + public ResponseEntity insideInConfirm(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(handNewMaterialService.insideInConfirm(whereJson),HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java index c5f9259f..0cf2f171 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java @@ -1,5 +1,6 @@ package org.nl.pda.st.in.service; +import com.alibaba.fastjson.JSONObject; import org.nl.wql.core.content.HttpContext; import java.util.Map; @@ -92,4 +93,20 @@ public interface HandNewMaterialService { * @return Map */ Map askVehicle(Map jsonObject); + + /** + * 内部软废入库查询组盘信息 + * + * @param whereJson 条件 + * @return Map + */ + Map insideIn(JSONObject whereJson); + + /** + * 内部软废入库确认 + * + * @param whereJson 条件 + * @return Map + */ + Map insideInConfirm(JSONObject whereJson); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java index 45842fd0..ec2696fd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java @@ -960,6 +960,72 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { return returnjo; } + @Override + public Map insideIn(JSONObject whereJson) { + + String vehicle_code = whereJson.getString("vehicle_code"); + if (ObjectUtil.isEmpty(vehicle_code)) throw new PdaRequestException("载具号不能为空"); + + JSONArray resultJSONArray = WQL.getWO("QST_IVT_RAWASSISTISTOR") + .addParam("flag", "12").addParam("storagevehicle_code", vehicle_code) + .process().getResultJSONArray(0); + + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功！"); + returnjo.put("content", resultJSONArray); + return returnjo; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Map insideInConfirm(JSONObject whereJson) { + + String vehicle_code = whereJson.getString("vehicle_code"); + String point_code = whereJson.getString("point_code"); + + if (ObjectUtil.isEmpty(vehicle_code)) throw new PdaRequestException("载具号不能为空!"); + if (ObjectUtil.isEmpty(point_code)) throw new PdaRequestException("站点不能为空！"); + + /* + * 1.根据托盘号找到生成状态的分配明细 + * 2.调用接口自动分配并下发任务 + */ + // 根据托盘找到分配明细 + JSONArray disArr = WQL.getWO("QST_IVT_RAWASSISTISTOR") + .addParam("storagevehicle_code", vehicle_code).addParam("flag", "13") + .process().getResultJSONArray(0); + + // 调用入库分配接口并下发任务 + ArrayList> list = new ArrayList<>(); + for (int i = 0; i < disArr.size(); i++) { + JSONObject jo = disArr.getJSONObject(i); + HashMap row = new HashMap<>(); + row.put("point_code", point_code); + row.put("storagevehicle_id", jo.getString("storagevehicle_id")); + row.put("storagevehicle_code", jo.getString("storagevehicle_code")); + row.put("storagevehicle_type", jo.getString("storagevehicle_type")); + row.put("material_id", jo.getString("material_id")); + row.put("iostorinv_id", jo.getString("iostorinv_id")); + JSONObject mater_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_id = '" + jo.getString("material_id") + "'").uniqueResult(0); + row.put("material_code", mater_jo.getString("material_code")); + list.add(row); + } + whereJson.put("tableMater", list); + whereJson.put("checked", true); + whereJson.put("auto_issue", true); + try { + rawAssistIStorService.divStruct(whereJson); + } catch (Exception e) { + throw new PdaRequestException(e.getMessage()); + } + + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "入库成功！"); + return returnjo; + } + @Transactional(rollbackFor = Exception.class) public void insertBucket(HashMap row) { WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java index 7b4c9d3e..78425ee6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java @@ -172,11 +172,23 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { String allBucketunique = "(\""+bucketuniques.stream().collect(Collectors.joining("\",\""))+"\")"; bucket.update(updateParam, "bucketunique in " + allBucketunique); } + + // 解锁点位托盘：根据托盘找到点位并解锁 + JSONObject jsonPoint = WQLObject.getWQLObject("sch_base_point") + .query("vehicle_code = '" + storagevehicle_code + "'") + .uniqueResult(0); + + if (ObjectUtil.isNotEmpty(jsonPoint)) { + jsonPoint.put("vehicle_code",""); + jsonPoint.put("point_status","00"); + jsonPoint.put("lock_type","00"); + WQLObject.getWQLObject("sch_base_point").update(jsonPoint); + } + JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); returnjo.put("desc", "操作成功！"); return returnjo; } - } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql index d8d92471..1ab6a8f2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql @@ -449,6 +449,47 @@ ENDQUERY ENDIF + IF 输入.flag = "12" + QUERY + SELECT + buck.bucketunique, + mater.material_code, + buck.pcsn, + buck.storage_qty + FROM + md_pb_bucketrecord buck + LEFT JOIN md_me_materialbase mater ON buck.material_id = mater.material_id + WHERE + buck.status = '02' + + OPTION 输入.storagevehicle_code <> "" + buck.storagevehicle_code = 输入.storagevehicle_code + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "13" + QUERY + SELECT + dis.*, + mst.iostorinv_id + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + WHERE + mst.is_delete = '0' + AND dis.work_status = '00' + + OPTION 输入.storagevehicle_code <> "" + dis.storagevehicle_code = 输入.storagevehicle_code + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF +