root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ldj_willow
2022-07-07 16:44:07 +08:00
parent ea109227c8 fbebd05f23
commit ff63c99680
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
View File

@@ -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"));

8
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql
View File

@@ -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,

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartInServiceImpl.java
View File

@@ -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");
//根据系统参数判断是否需要使用部门进行数据权限过滤

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql
View File

@@ -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