From 916072ebb8faf8a3825c2cb0527c288e19346f41 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 7 Jul 2022 16:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java | 8 ++++++-- .../src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql | 8 ++++---- .../wms/sb/core/service/impl/SparePartInServiceImpl.java | 4 ++++ .../main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql | 4 ++++ 4 files changed, 18 insertions(+), 6 deletions(-) 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 6ee97400..3f9db426 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 @@ -435,6 +435,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { throw new PdaRequestException("配粉槽不能为空！"); } + //查询配方 + JSONObject form_mst = WQLObject.getWQLObject("PDM_BI_Formula").query("formula_code = '"+formula_code+"'").uniqueResult(0); + if (!form_mst.getString("status").equals("99")){ + throw new PdaRequestException("该配方未完成,不允许搬出！"); + } + JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "'").uniqueResult(0); JSONObject device_point = WQLObject.getWQLObject("SCH_BASE_DevicePointPara") .query("device_uuid = '" + device.getString("device_id") + "' AND is_used = '1' AND is_delete = '0' AND point_type = '02'").uniqueResult(0); @@ -499,8 +505,6 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0); //查询工令表 JSONObject work_order = WQLObject.getWQLObject("PDM_BI_WorkOrder").query("workorder_code = '" + work_task.getString("workorder_code") + "'").uniqueResult(0); - //查询配方 - JSONObject form_mst = WQLObject.getWQLObject("PDM_BI_Formula").query("formula_code = '"+formula_code+"'").uniqueResult(0); jo.put("material_id", work_task.getString("material_id")); jo.put("pcsn", work_task.getString("pcsn")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql index a7c379ee..3c4339d1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql @@ -140,11 +140,11 @@ SELECT mb.material_code, task.pcsn, - round( task.total_qty, 4 ) AS workorder_qty, + round( task.masterbucket_qty, 4 ) AS workorder_qty, round( IFNULL( task.put_qty, 0 ), 4 ) AS product_qty, mu.unit_name, task.start_time, - (case when task.start_time is null then '9999-99-99 99:99:99' else task.start_time end) AS order_time, + (case WHEN ifnull(task.start_time, '') = '' then '9999-99-99 99:99:99' else task.start_time end) AS order_time, task.end_time, ( CASE WHEN task.STATUS = '99' THEN '1' WHEN task.STATUS = '30' THEN '2' ELSE '3' END ) AS color_flag, wt.planstart_time, @@ -168,11 +168,11 @@ SELECT mb.material_code, task.pcsn, - round( task.total_qty, 4 ) AS workorder_qty, + round( task.masterbucket_qty, 4 ) AS workorder_qty, round( IFNULL( task.put_qty, 0 ), 4 ) AS product_qty, mu.unit_name, task.start_time, - (case when task.start_time is null then '9999-99-99 99:99:99' else task.start_time end) AS order_time, + (case WHEN ifnull(task.start_time, '') = '' then '9999-99-99 99:99:99' else task.start_time end) AS order_time, task.end_time, ( CASE WHEN task.STATUS = '99' THEN '1' WHEN task.STATUS = '30' THEN '2' ELSE '3' END ) AS color_flag, wt.planstart_time, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartInServiceImpl.java index dbb73443..e8442fb6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartInServiceImpl.java @@ -55,9 +55,13 @@ public class SparePartInServiceImpl implements SparePartInService { map.put("create_mode", (String) whereJson.get("create_mode")); map.put("bill_status", (String) whereJson.get("bill_status")); String bill_code = MapUtil.getStr(whereJson, "bill_code"); + String bizperson = MapUtil.getStr(whereJson, "bizperson"); if (!ObjectUtil.isEmpty(bill_code)) { map.put("bill_code", "%" + bill_code + "%"); } + if (!ObjectUtil.isEmpty(bizperson)) { + map.put("bizperson", "%" + bizperson + "%"); + } String begin_time = (String) whereJson.get("begin_time"); //根据系统参数判断是否需要使用部门进行数据权限过滤 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql index ff715902..0722d4ae 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql @@ -38,6 +38,7 @@ 输入.iostorinvdtl_id TYPEAS s_string 输入.storagevehicle_code TYPEAS s_string 输入.iostorinv_id TYPEAS s_string + 输入.bizperson TYPEAS s_string [临时表] @@ -75,6 +76,9 @@ OPTION 输入.bill_code <> "" ios.bill_code like 输入.bill_code ENDOPTION + OPTION 输入.bizperson <> "" + ios.bizperson like 输入.bizperson + ENDOPTION OPTION 输入.deptIds <> "" ios.sysdeptid in 输入.deptIds ENDOPTION