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

代码修改

Browse Source
This commit is contained in:
liyongde
2023-03-20 17:25:12 +08:00
parent 792213bccb
commit 19737d8d8e
5 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
View File

@@ -15,8 +15,8 @@
#################################################
输入.flag TYPEAS s_string
输入.jockey_id TYPEAS s_string
输入.sale_id TYPEAS s_string
输入.produceorder_id TYPEAS s_string
输入.sale_id TYPEAS s_string
输入.produceorder_id TYPEAS s_string
输入.workprocedure_code TYPEAS s_string
输入.order_status TYPEAS s_string
输入.shift_type_scode TYPEAS s_string
@@ -75,7 +75,7 @@
ShiftOrder.workorder_status <> '5'
ENDOPTION
OPTION 输入.order_status <> ""
find_in_set( ShiftOrder.workorder_status, 输入.order_status)
find_in_set(ShiftOrder.workorder_status, 输入.order_status)
ENDOPTION
OPTION 输入.shift_type_scode <> ""
ShiftOrder.shift_type_scode = 输入.shift_type_scode
@@ -87,10 +87,10 @@
material.product_series in 输入.product_series
ENDOPTION
OPTION 输入.begin_time <> ""
ShiftOrder.produce_date >= 输入.begin_time
ShiftOrder.realproducestart_date >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ShiftOrder.produce_date <= 输入.end_time
ShiftOrder.realproducestart_date <= 输入.end_time
ENDOPTION
OPTION 输入.sale_id <> ""
ShiftOrder.sale_id like 输入.sale_id

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

Binary file not shown.

50
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
View File

@@ -125,19 +125,18 @@ public class RegionServiceImpl implements RegionService {
/**
* label,value
*/
// JSONArray res = new JSONArray();
// String point_status_explain = findByCode(region_id).getPoint_status_explain();
// if (ObjectUtil.isEmpty(point_status_explain)) return res;
// String[] explain = point_status_explain.split("，");
// for (int i = 0; i < explain.length; i++) {
// String[] status = explain[i].split("-");
// JSONObject point_status = new JSONObject();
// point_status.put("label", status[1]);
// point_status.put("value", status[0]);
// res.add(point_status);
// }
// return res;
return null;
JSONArray res = new JSONArray();
String point_status_explain = findByCode(region_code).getPoint_status_explain();
if (ObjectUtil.isEmpty(point_status_explain)) return res;
String[] explain = point_status_explain.split("，");
for (int i = 0; i < explain.length; i++) {
String[] status = explain[i].split("-");
JSONObject point_status = new JSONObject();
point_status.put("label", status[1]);
point_status.put("value", status[0]);
res.add(point_status);
}
return res;
}
/**
@@ -151,19 +150,18 @@ public class RegionServiceImpl implements RegionService {
/**
* label,value
*/
// JSONArray res = new JSONArray();
// String point_type_explain = findById(region_id).getPoint_type_explain();
// if (ObjectUtil.isEmpty(point_type_explain)) return res;
// String[] explain = point_type_explain.split("，");
// for (int i = 0; i < explain.length; i++) {
// String[] types = explain[i].split("-");
// JSONObject point_type = new JSONObject();
// point_type.put("label", types[1]);
// point_type.put("value", types[0]);
// res.add(point_type);
// }
// return res;
return null;
JSONArray res = new JSONArray();
String point_type_explain = findByCode(region_code).getPoint_type_explain();
if (ObjectUtil.isEmpty(point_type_explain)) return res;
String[] explain = point_type_explain.split("，");
for (int i = 0; i < explain.length; i++) {
String[] types = explain[i].split("-");
JSONObject point_type = new JSONObject();
point_type.put("label", types[1]);
point_type.put("value", types[0]);
res.add(point_type);
}
return res;
}
}