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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-26 15:04:26 +08:00
parent adddfa1c80
commit 1d9e96a25f
13 changed files with 230 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
View File

@@ -270,6 +270,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
// 更新保养单主表
JSONObject jsonMainMst = mainMstTab.query("maint_id = '" + whereJson.getString("maint_id") + "'").uniqueResult(0);
jsonMainMst.put("invstatus", "03");
jsonMainMst.put("update_optname",whereJson.getString("update_optname") );
jsonMainMst.put("real_start_date", DateUtil.now());
mainMstTab.update(jsonMainMst);
@@ -318,6 +319,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
WQLObject lifeTab = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 设备声明周期表
WQLObject dtlTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceDtl");
this.submitMain(whereJson);
// 1.明细中的是否完成 ：必须为全部完成
JSONArray dtlArr = dtlTab.query("maint_id = '" + maint_id + "'").getResultJSONArray(0);

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

@@ -141,7 +141,7 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService {
JSONObject jsonResult1 = new JSONObject();
jsonResult1.put("prop", "0");
jsonResult1.put("label", "质检单号");
jsonResultArr.add(jsonResult1);
// jsonResultArr.add(jsonResult1);
JSONObject jsonResult2 = new JSONObject();
jsonResult2.put("prop", "1");
jsonResult2.put("label", "物料编码");
@@ -163,8 +163,8 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService {
JSONObject jsonResult19 = new JSONObject();
jsonResult19.put("prop", "19");
jsonResult19.put("label", "金相备注");
jsonResultArr.add(jsonResult2);
jsonResultArr.add(jsonResult20);
// jsonResultArr.add(jsonResult2);
// jsonResultArr.add(jsonResult20);
jsonResultArr.add(jsonResult21);
jsonResultArr.add(jsonResult3);
jsonResultArr.add(jsonResult4);

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

@@ -71,6 +71,27 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
jsonResult.put(jsonDtl.getString("material_id") +"formula_qty",jsonDtl.getString("formula_qty"));
}
}
// 碳平衡
jsonResult.put("3", json.getString("c_balance"));
// 时间
jsonResult.put("4", json.getString("ball_time"));
// 球料比
jsonResult.put("5", json.getString("ball_rate"));
// 液料比
jsonResult.put("6", json.getString("liquid_rate"));
// 球磨机号
HashMap<String, String> map1 = new HashMap<>();
map1.put("flag", "3");
map1.put("product_series_id", json.getString("product_series_id"));
map1.put("workprocedure_id", "1472449856613257216");
JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
map1.put("flag", "4");
JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) {
String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6);
String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6);
jsonResult.put("7", device_code_1 + "-" + device_code_2);
}
jsonResultArr.add(jsonResult);
}
resultJson.put("content",jsonResultArr);
@@ -81,19 +102,6 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
public JSONArray getHeader() {
JSONArray jsonResultArr = new JSONArray();
JSONObject jsonResult1 = new JSONObject();
jsonResult1.put("prop", "0");
jsonResult1.put("label", "日期");
jsonResultArr.add(jsonResult1);
JSONObject jsonResult2 = new JSONObject();
jsonResult2.put("prop", "1");
jsonResult2.put("label", "产品编码");
jsonResultArr.add(jsonResult2);
JSONObject jsonResult3 = new JSONObject();
jsonResult3.put("prop", "2");
jsonResult3.put("label", "批号");
jsonResultArr.add(jsonResult3);
String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.YL_AND_FL.getClass_idStr());
String RF = classstandardService.getAllChildIdStr(MaterOptTypeEnum.RF.getClass_idStr());
JSONArray resultJSONArray = WQL.getWO("QP_POWDERORDERQUERY01").addParam("flag", "2").addParam("classIds", classIds).addParam("rf", RF).process().getResultJSONArray(0);
@@ -104,10 +112,10 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
jsonResult4.put("prop",json.getString("material_id"));
jsonResult4.put("label","物料" + NumberUtil.add(String.valueOf(i), "1") + "");
jsonResultArr.add(jsonResult4);
JSONObject jsonResult5 = new JSONObject();
jsonResult5.put("prop",json.getString("material_code")+"");
jsonResult5.put("label","物料编码");
jsonResultArr.add(jsonResult5);
// JSONObject jsonResult5 = new JSONObject();
// jsonResult5.put("prop",json.getString("material_code")+"");
// jsonResult5.put("label","物料编码");
// jsonResultArr.add(jsonResult5);
JSONObject jsonResult6 = new JSONObject();
jsonResult6.put("prop",json.getString("material_id")+"pcsn");
jsonResult6.put("label","批次");
@@ -117,6 +125,28 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
jsonResult7.put("label","重量");
jsonResultArr.add(jsonResult7);
}
JSONObject jsonResult1 = new JSONObject();
jsonResult1.put("prop", "3");
jsonResult1.put("label", "碳平衡(%)");
jsonResultArr.add(jsonResult1);
JSONObject jsonResult2 = new JSONObject();
jsonResult2.put("prop", "4");
jsonResult2.put("label", "时间(h)");
jsonResultArr.add(jsonResult2);
JSONObject jsonResult3 = new JSONObject();
jsonResult3.put("prop", "5");
jsonResult3.put("label", "球料比");
jsonResultArr.add(jsonResult3);
JSONObject jsonResult8 = new JSONObject();
jsonResult8.put("prop", "6");
jsonResult8.put("label", "液料比");
jsonResultArr.add(jsonResult8);
JSONObject jsonResult9 = new JSONObject();
jsonResult9.put("prop", "7");
jsonResult9.put("label", "球磨机号");
jsonResultArr.add(jsonResult9);
return jsonResultArr;
}
}

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

@@ -128,7 +128,7 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
// JSONArray jsonArr = WQL.getWO("RaUatWc_query_01").addParam("flag", "2").addParam("inspection_scheme_code",inspection_scheme_code).process().getResultJSONArray(0);
JSONArray jsonArr = WQL.getWO("RaUatWc_query_01").addParam("flag", "5").process().getResultJSONArray(0);
JSONArray jonsResuftArr = new JSONArray();
JSONObject jsonResuft1 = new JSONObject();
/* JSONObject jsonResuft1 = new JSONObject();
jsonResuft1.put("prop", "1");
jsonResuft1.put("label", "物料编码");
JSONObject jsonResuft2 = new JSONObject();
@@ -139,14 +139,14 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
jsonResuft3.put("label", "批号");
JSONObject jsonResuft4 = new JSONObject();
jsonResuft4.put("prop", "4");
jsonResuft4.put("label", "重量");
jsonResuft4.put("label", "重量");*/
JSONObject jsonResuft5 = new JSONObject();
jsonResuft5.put("prop", "5");
jsonResuft5.put("label", "厂家");
jonsResuftArr.add(jsonResuft1);
/* jonsResuftArr.add(jsonResuft1);
jonsResuftArr.add(jsonResuft2);
jonsResuftArr.add(jsonResuft3);
jonsResuftArr.add(jsonResuft4);
jonsResuftArr.add(jsonResuft4);*/
jonsResuftArr.add(jsonResuft5);
for (int i = 0; i < jsonArr.size(); i++) {
JSONObject json = jsonArr.getJSONObject(i);

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/QP_POWDERORDERQUERY01.wql
View File

@@ -51,11 +51,17 @@
work.create_time,
mater.material_code,
work.pcsn,
mst.formula_id
mst.formula_id,
mst.ball_time,
mst.product_series_id,
ext.c_balance,
ext.ball_rate,
ext.liquid_rate
FROM
PDM_BI_WorkOrder work
LEFT JOIN PDM_BI_Formula mst ON mst.workorder_id = work.workorder_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = work.material_id
LEFT JOIN MD_ME_ProducMaterialExt ext ON mater.material_id = ext.material_id
WHERE
mst.is_delete= '0'