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

修改问题

Browse Source
This commit is contained in:
zds
2022-07-04 09:32:55 +08:00
parent 5f9bf824a9
commit 3f56bd478e
13 changed files with 88 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
View File

@@ -214,7 +214,7 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
public JSONArray queryAll1(Map whereJson) {
String devicerecord_id = (String) whereJson.get("devicerecord_id");
WQLObject EM_BI_DeviceLifeCycle = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 工艺路线主表
JSONArray ja = EM_BI_DeviceLifeCycle.query("devicerecord_id='"+devicerecord_id+"'").getResultJSONArray(0);
JSONArray ja = EM_BI_DeviceLifeCycle.query("devicerecord_id='"+devicerecord_id+"'"," create_time ").getResultJSONArray(0);
return ja;
}

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

@@ -47,6 +47,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");
@@ -71,6 +75,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
View File

@@ -40,6 +40,10 @@ public class WorkTaskServiceImpl implements WorkTaskService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
View File

@@ -25,6 +25,7 @@
输入.product_series_id TYPEAS s_string
输入.workprocedure_id TYPEAS s_string
输入.device_id TYPEAS s_string
输入.pcsn TYPEAS s_string
[临时表]
@@ -69,6 +70,9 @@
OPTION 输入.workorder_code <> ""
WorkOrder.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.pcsn <> ""
WorkOrder.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.status <> ""
WorkOrder.status = 输入.status
ENDOPTION
@@ -127,6 +131,9 @@
OPTION 输入.status <> ""
WorkOrder.status = 输入.status
ENDOPTION
OPTION 输入.pcsn <> ""
WorkOrder.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.workorder_type <> ""
WorkOrder.workorder_type = 输入.workorder_type
ENDOPTION

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql
View File

@@ -72,6 +72,9 @@
OPTION 输入.workorder_code <> ""
WorkTask.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.pcsn <> ""
WorkTask.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.worktask_code <> ""
WorkTask.worktask_code like 输入.worktask_code
ENDOPTION

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -66,6 +66,10 @@ public class FormulaServiceImpl implements FormulaService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_FORMULA01.wql
View File

@@ -21,6 +21,7 @@
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.formula_id TYPEAS s_string
输入.pcsn TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -68,6 +69,9 @@
OPTION 输入.workorder_code <> ""
Formula.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.pcsn <> ""
Formula.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.status <> ""
Formula.status = 输入.status
ENDOPTION