puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

46281 PCN-按工位统计产量信息

Browse Source
uat-temp-wj-chongqingdaqu-prod-temp-merge-all
王杰 3 months ago
parent 24b84acaf0
commit a1240198eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
Map<String, Object> resultMap = new HashMap<>();
//验证参数
Map<String, String> paramMap = null;
Map<String, Object> paramMap = null;
try {
paramMap = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : JSONObject.parseObject(buttonDynamicModel.getFunctionValue(), Map.class);
} catch (Exception e) {
@ -63,8 +63,8 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
reportStatusMap.put(REPORT_STATUS.UN_REPORT.getValue(), REPORT_STATUS.UN_REPORT.getDescription());
resultMap.put(MesPcnExtConstWords.REPORT_STATUS, reportStatusMap);
String startTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.START_TIME)) ? paramMap.get(MesPcnExtConstWords.START_TIME) : null;
String endTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.END_TIME)) ? paramMap.get(MesPcnExtConstWords.END_TIME) : null;
String startTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.START_TIME)) ? (String) paramMap.get(MesPcnExtConstWords.START_TIME) : null;
String endTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.END_TIME)) ? (String) paramMap.get(MesPcnExtConstWords.END_TIME) : null;
if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) {
//根据当前时间计算当前班次的时间
Map<String, String> shiftTimeMap = shiftService.calcCurShiftTimeMapByCurTime(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());
@ -93,7 +93,7 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
if (!checkTime) return packResultMap(resultMap, "时间查询条件限制一天!");
String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? paramMap.get(MesPcnExtConstWords.PART_NO) : null;
String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? (String) paramMap.get(MesPcnExtConstWords.PART_NO) : null;
//查询加工记录数据
DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode());
@ -104,7 +104,7 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
List<MesProductionRecord> productionRecordList = productionRecordRepository.findByHqlWhere(packBean);
if (CollectionUtils.isEmpty(productionRecordList)) return resultMap;
Integer reportStatus = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) ? Integer.valueOf(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) : null;
Integer reportStatus = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) ? (Integer) paramMap.get(MesPcnExtConstWords.REPORT_STATUS) : null;
//搜集需要汇报的加工记录
List<MesProductionRecord> productionRecordList2Report = (StringUtils.isEmpty(reportStatus) || reportStatus.compareTo(REPORT_STATUS.REPORT.getValue()) == 0)

Write Preview
Loading…
Cancel
Save