From 59d9c19764041a3212c3bfabbf68cc1a549b39f0 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Tue, 2 Aug 2022 19:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProductServiceImpl.java | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java index 4850fb79..7781d1bf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java @@ -18,44 +18,42 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j public class ProductServiceImpl implements ProductService { - private String now = DateUtil.now(); - private String today = DateUtil.today(); - //一个月的开始日期 - private String beginOfMonth = DateUtil.formatTime(DateUtil.beginOfMonth(DateUtil.parseDate(today))); @Override public Map planReached(Map param) { + String today = DateUtil.today(); //计算当天的计划达成 //01-弯头工段、02-综合工段、03-成品工段 Map map = new HashMap(); map.put("flag", "1"); map.put("produce_date", today); - map.put("worksection_type_scode","01"); + map.put("worksection_type_scode", "01"); JSONObject jo1 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","02"); + map.put("worksection_type_scode", "02"); JSONObject jo2 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","03"); + map.put("worksection_type_scode", "03"); JSONObject jo3 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); JSONObject dayResult = new JSONObject(); - dayResult.put("jo1",jo1); - dayResult.put("jo2",jo2); - dayResult.put("jo3",jo3); + dayResult.put("jo1", jo1); + dayResult.put("jo2", jo2); + dayResult.put("jo3", jo3); //计算一个月的计划达成 + String beginOfMonth = DateUtil.formatTime(DateUtil.beginOfMonth(DateUtil.parseDate(today))); JSONObject monthResult = new JSONObject(); map.put("flag", "14"); map.put("end_produce_date", today); map.put("begin_produce_date", beginOfMonth); - map.put("worksection_type_scode","01"); + map.put("worksection_type_scode", "01"); JSONObject joo1 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","02"); + map.put("worksection_type_scode", "02"); JSONObject joo2 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","03"); + map.put("worksection_type_scode", "03"); JSONObject joo3 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - monthResult.put("joo1",joo1); - monthResult.put("joo2",joo2); - monthResult.put("joo3",joo3); + monthResult.put("joo1", joo1); + monthResult.put("joo2", joo2); + monthResult.put("joo3", joo3); JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); returnjo.put("desc", "操作成功！"); @@ -66,6 +64,7 @@ public class ProductServiceImpl implements ProductService { @Override public Map productSchedule(Map param) { + String today = DateUtil.today(); //今日排产生产进度跟踪 Map map = new HashMap(); map.put("flag", "2"); @@ -81,6 +80,7 @@ public class ProductServiceImpl implements ProductService { @Override public Map output(Map param) { JSONObject result = new JSONObject(); + String today = DateUtil.today(); Map map = new HashMap(); // map.put("flag", "3"); map.put("flag", "7"); @@ -99,7 +99,7 @@ public class ProductServiceImpl implements ProductService { map.put("flag", "4"); int sum_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("count"); //统计延时工单 - map.put("product_date",today); + map.put("product_date", today); map.put("flag", "5"); int delayed_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("count"); @@ -121,13 +121,14 @@ public class ProductServiceImpl implements ProductService { //获取一周的日期 JSONArray dataArr = new JSONArray(); JSONArray results = new JSONArray(); + String now = DateUtil.now(); for (int i = 0; i < 7; i++) { DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(now), -i); dataArr.add(dateTime.toString().substring(0, 10)); } for (int i = 0; i < dataArr.size(); i++) { JSONObject jo = new JSONObject(); - String date = dataArr.get(( dataArr.size()-i-1)).toString(); + String date = dataArr.get((dataArr.size() - i - 1)).toString(); //01-弯头工段、02-综合工段、03-成品工段 Map map = new HashMap(); @@ -142,7 +143,7 @@ public class ProductServiceImpl implements ProductService { map.put("worksection_type_scode", "03"); int end_product_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("real_qty"); jo.put("end_product_qty", end_product_qty); - jo.put("date",date.substring(5,date.length())); + jo.put("date", date.substring(5, date.length())); results.add(jo); } JSONObject returnjo = new JSONObject(); @@ -154,6 +155,7 @@ public class ProductServiceImpl implements ProductService { @Override public Map topHarvest(Map param) { + String today = DateUtil.today(); //今日Top10产量 Map map = new HashMap(); map.put("flag", "10"); @@ -169,6 +171,7 @@ public class ProductServiceImpl implements ProductService { @Override public Map monthHarvest(Map param) { //30天产量走势 + String now = DateUtil.now(); JSONArray dataArr = new JSONArray(); JSONArray results = new JSONArray(); for (int i = 0; i < 30; i++) { @@ -177,7 +180,7 @@ public class ProductServiceImpl implements ProductService { } for (int i = 0; i < dataArr.size(); i++) { JSONObject jo = new JSONObject(); - String date = dataArr.get(dataArr.size()-i-1).toString(); + String date = dataArr.get(dataArr.size() - i - 1).toString(); Map map = new HashMap(); map.put("flag", "9"); @@ -188,7 +191,7 @@ public class ProductServiceImpl implements ProductService { real_qty = jsonObject.getIntValue("real_qty"); } jo.put("real_qty", real_qty); - jo.put("date", date.substring(5,date.length())); + jo.put("date", date.substring(5, date.length())); results.add(jo); } JSONObject returnjo = new JSONObject(); @@ -200,6 +203,7 @@ public class ProductServiceImpl implements ProductService { @Override public Map unfinishOrder(Map param) { + String today = DateUtil.today(); Map map = new HashMap(); map.put("flag", "11"); map.put("produce_date", today); @@ -214,6 +218,9 @@ public class ProductServiceImpl implements ProductService { @Override public Map monthOrder(Map param) { //计算前9种物料产能 + String today = DateUtil.today(); + String beginOfMonth = DateUtil.formatTime(DateUtil.beginOfMonth(DateUtil.parseDate(today))); + Map map = new HashMap(); map.put("flag", "12"); map.put("produce_date", today);