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-12-01 18:59:08 +08:00
parent 238a61ccad
commit 70fe17b48c
15 changed files with 215 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,11 +76,11 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
if (!StrUtil.isEmpty(accept_pcsn)) {
map.put("accept_pcsn", "%"+accept_pcsn+"%");
}
String begin_time = map.get("begin_time");
String begin_time = (String) whereJson.get("begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
String end_time = map.get("end_time");
String end_time = (String) whereJson.get("end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicePairQueryServiceImpl.java
View File

@@ -36,16 +36,20 @@ public class DevicePairQueryServiceImpl implements DevicePairQueryService {
String repair_code = MapUtil.getStr(whereJson, "repair_code");
String device_code = MapUtil.getStr(whereJson, "device_code");
String invstatus = MapUtil.getStr(whereJson, "invstatus");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = (String) whereJson.get("class_idStr");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("invstatus",invstatus);
map.put("begin_time",begin_time);
map.put("end_time",end_time);
String begin_time = MapUtil.getStr(whereJson, "begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
String end_time = MapUtil.getStr(whereJson, "end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
if (ObjectUtil.isNotEmpty(repair_code)) map.put("repair_code","%"+repair_code+"%");
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
//处理物料当前节点的所有子节点

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql
View File

@@ -55,8 +55,8 @@
MAX(file.device_code) AS device_code,
MAX(file.device_model) AS device_model,
re.devicerecord_id,
MAX( file.device_name ) AS device_name,
MAX( file.extend_code ) AS extend_code
MAX(file.device_name) AS device_name,
MAX(file.extend_code) AS extend_code
FROM
EM_BI_DeviceRepairRequest re
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id
@@ -68,25 +68,20 @@
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.device_gz <> ""
fclass.device_faultclass_id = 输入.device_gz
ENDOPTION
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
file.device_name like 输入.device_code)
ENDOPTION
OPTION 输入.dept_id <> ""
(dept.code like 输入.dept_id or
dept.name like 输入.dept_id)
ENDOPTION
OPTION 输入.begin_time <> ""
re.fault_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
re.fault_time <= 输入.end_time
ENDOPTION

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
View File

@@ -79,6 +79,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("buss_type"))) {
map.put("buss_type", whereJson.get("buss_type") + "%");
}
String begin_time = MapUtil.getStr(whereJson, "begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
String end_time = MapUtil.getStr(whereJson, "end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
if (StrUtil.isNotEmpty(map.get("io_type"))) {
map.put("io_type", map.get("io_type"));
}

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java
View File

@@ -32,8 +32,14 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService {
String material_model = MapUtil.getStr(whereJson, "material_model");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("begin_time", MapUtil.getStr(whereJson, "begin_time"));
map.put("end_time", MapUtil.getStr(whereJson, "end_time"));
String begin_time = MapUtil.getStr(whereJson, "begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
String end_time = MapUtil.getStr(whereJson, "end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
map.put("inspection_code", MapUtil.getStr(whereJson, "inspection_code"));
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn+"%");
if (ObjectUtil.isNotEmpty(material_model)) map.put("material_model","%"+material_model+"%");

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java
View File

@@ -41,8 +41,14 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("begin_time", MapUtil.getStr(whereJson,"begin_time"));
map.put("end_time", MapUtil.getStr(whereJson,"end_time"));
String begin_time = MapUtil.getStr(whereJson, "begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
String end_time = MapUtil.getStr(whereJson, "end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
map.put("receive_code", MapUtil.getStr(whereJson,"receive_code"));
if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%");
map.put("bill_status", MapUtil.getStr(whereJson,"bill_status"));