diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java
index 5e00dc2b2..1a72ff878 100644
--- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java
+++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java
@@ -73,7 +73,7 @@ public class ExcelReportMapUtil {
for(int r5=4;r5<13;r5++){
Row row05 = sheet.getRow(r5);
if (row05 == null) {row05 = sheet.createRow(r5);}
- for (int col = 0; col < 14; col++) {
+ for (int col = 0; col < 15; col++) {
Cell cell1 = row05.createCell(col);
cell1.setCellStyle(getRowStyle(sheet));
}
@@ -81,7 +81,7 @@ public class ExcelReportMapUtil {
for(int d5=13;d5<(13+data.size());d5++){
Row row05 = sheet.getRow(d5);
if (row05 == null) {row05 = sheet.createRow(d5);}
- for (int col = 0; col < 14; col++) {
+ for (int col = 0; col < 15; col++) {
Cell cell1 = row05.createCell(col);
cell1.setCellStyle(getDataStyle(sheet));
}
@@ -99,7 +99,7 @@ public class ExcelReportMapUtil {
// 合并J5到K6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 9, 10), "报告编号", true, true, IndexedColors.GREY_25_PERCENT);
// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）
- mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 11, 13), detailMap.get("checkNo"), true, false, null);
+ mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 11, 14), detailMap.get("checkNo"), true, false, null);
Row row7 = sheet.getRow(6);
// 合并A7到B8的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 0, 1), "物料名称", true, true, IndexedColors.GREY_25_PERCENT);
@@ -112,7 +112,7 @@ public class ExcelReportMapUtil {
// 合并J5到K6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 9, 10), "供应单位", true, true, IndexedColors.GREY_25_PERCENT);
// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）
- mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 11, 13), detailMap.get("supplierName"), true, false, null);
+ mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 11, 14), detailMap.get("supplierName"), true, false, null);
Row row9 = sheet.getRow(8);
// 合并A7到B8的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 0, 1), "供应编码", true, true, IndexedColors.GREY_25_PERCENT);
@@ -125,7 +125,7 @@ public class ExcelReportMapUtil {
// 合并J5到K6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 9, 10), "单位", true, true, IndexedColors.GREY_25_PERCENT);
// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）
- mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 11, 13), detailMap.get("unit"), true, false, null);
+ mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 11, 14), detailMap.get("unit"), true, false, null);
Row row10 = sheet.getRow(10);
// 合并A7到B8的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 0, 1), "物料来源", true, true, IndexedColors.GREY_25_PERCENT);
@@ -138,7 +138,7 @@ public class ExcelReportMapUtil {
// 合并J5到K6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 9, 10), "报检日期", true, true, IndexedColors.GREY_25_PERCENT);
// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）
- mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 11, 13), detailMap.get("incomeTime"), true, false, null);
+ mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 11, 14), detailMap.get("incomeTime"), true, false, null);
/**上下表格2**/
Row row12 = sheet.getRow(12);
if (row12 == null) {row12 = sheet.createRow(12);}
@@ -147,11 +147,18 @@ public class ExcelReportMapUtil {
cellA13.setCellStyle(getRowStyle(sheet));
mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 1, 4), "检验项目");
mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 5, 8), "标准要求");
- mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 9, 10), "实测结果");
- Cell cellL13 = row12.createCell(11);
+
+ Cell cellA9 = row12.createCell(9);
+ cellA9.setCellValue("抽检数");
+ cellA9.setCellStyle(getRowStyle(sheet));
+
+ mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 10, 11), "实测结果");
+
+ Cell cellL13 = row12.createCell(12);
cellL13.setCellValue("判定");
cellL13.setCellStyle(getRowStyle(sheet));
- mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 12, 13), "附件");
+
+ mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 13, 14), "附件");
//将data中的值填充到excel
int rowNum = 13;
if(!CollectionUtils.isEmpty(data)){
@@ -166,33 +173,42 @@ public class ExcelReportMapUtil {
// 假设使用了默认字体和字符宽度来计算行高（这是一个简化的示例）
int cellHeight = (int) (cell.getStringCellValue().length() * 6); // 每个字符大约15个单位高度
dataRow.setHeightInPoints(Math.max(dataRow.getHeightInPoints(), cellHeight));
-
+ //序号
Cell cellData0 = dataRow.getCell(0);
cellData0.setCellValue(rowNum-12);
cellData0.setCellStyle(getDataStyle(sheet));
+ //检验项目
Cell cellData1 = dataRow.getCell(1);
cellData1.setCellValue(getValue(jsonObject.get(excelCol.get(0).getField())));
cellData1.setCellStyle(getDataStyle(sheet));
+ //标准要求
Cell cellData2 = dataRow.getCell(5);
cellData2.setCellValue(getValue(jsonObject.get(excelCol.get(1).getField())));
cellData2.setCellStyle(getDataStyle(sheet));
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 5, 8));
- Cell cellData3 = dataRow.getCell(9);
+ //抽检数
+ Cell cellData6 = dataRow.getCell(9);
+ cellData6.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField())));
+ cellData6.setCellStyle(getDataStyle(sheet));
+
+ //实测结果
+ Cell cellData3 = dataRow.getCell(10);
cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField())));
cellData3.setCellStyle(getDataStyle(sheet));
- sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 9, 10));
+ sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 10, 11));
- Cell cellData4 = dataRow.getCell(11);
+ //判定
+ Cell cellData4 = dataRow.getCell(12);
cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField())));
cellData4.setCellStyle(getDataStyle(sheet));
-
- Cell cellData5 = dataRow.getCell(12);
- cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField())));
+ //附件
+ Cell cellData5 = dataRow.getCell(13);
+ cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(5).getField())));
cellData5.setCellStyle(getDataStyle(sheet));
- sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 12, 13));
+ sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 13, 14));
iterator.remove();
rowNum++;
}
diff --git a/op-common/op-common-datasource/op-common-datasource.iml b/op-common/op-common-datasource/op-common-datasource.iml
index 0ed4ebddd..f9c2d6200 100644
--- a/op-common/op-common-datasource/op-common-datasource.iml
+++ b/op-common/op-common-datasource/op-common-datasource.iml
@@ -1,55 +1,15 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/op-common/op-common-redis/op-common-redis.iml b/op-common/op-common-redis/op-common-redis.iml
index b0a11c54a..f9c2d6200 100644
--- a/op-common/op-common-redis/op-common-redis.iml
+++ b/op-common/op-common-redis/op-common-redis.iml
@@ -1,118 +1,15 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/op-common/op-common-seata/op-common-seata.iml b/op-common/op-common-seata/op-common-seata.iml
index 629f8cd46..885146d17 100644
--- a/op-common/op-common-seata/op-common-seata.iml
+++ b/op-common/op-common-seata/op-common-seata.iml
@@ -1,111 +1,13 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml
index 5422c64f1..c77b938cd 100644
--- a/op-common/op-common-security/op-common-security.iml
+++ b/op-common/op-common-security/op-common-security.iml
@@ -1,128 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
index 10ba3ab29..7f6d2c039 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
@@ -30,7 +30,7 @@
select efd.fault_id, efd.fault_code, efd.fault_type, efd.fault_subclass, efd.fault_remark,
efd.factory_code, efd.attr1, efd.attr2, efd.attr3, efd.del_flag, efd.create_by, efd.create_time,
- efd.update_by, efd.update_tim,efdi.dict_value from equ_fault_description efd
+ efd.update_by, efd.update_time,efdi.dict_value from equ_fault_description efd
LEFT JOIN equ_faultdes_dict efdi ON efd.fault_id= efdi.fault_id
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
index f1c7b587a..2ead9ced9 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
@@ -486,12 +486,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
//更新产线设备运行时间,故障率
logger.info("==========================更新产线设备运行时间,故障率开始");
Map updateDeviceParam=new HashMap();
- updateDeviceParam.put("RunTime",mesReportWork.getWorkTime());
+ updateDeviceParam.put("RunTime",sHzWorks.getWorkTime());
updateDeviceParam.put("equipmentCode",mesReportWork.getMachineCode());
- updateDeviceParam.put("productDate",mesReportWork.getProductDate());
+ updateDeviceParam.put("productDate",sHzWorks.getProductDate());
R rs = remoteDeviceService.updateDeviceRunTimeORRate(updateDeviceParam);
logger.info("==========================更新产线设备运行时间,故障率结束：结果"+ rs.getMsg());
- }else if(workOrders.size()==2){
+ }
+ else if(workOrders.size()==2){
/**(两层报工)子工单先报工，然后母工单报工**/
mesReportWork.setUploadStatus("1");//除了1报工成功的，都需要报工
mesReportWork.setProdType("prod");
@@ -547,9 +548,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
//更新产线设备运行时间,故障率
logger.info("==========================更新产线设备运行时间,故障率开始");
Map updateDeviceParam=new HashMap();
- updateDeviceParam.put("RunTime",mesReportWork.getWorkTime());
+ updateDeviceParam.put("RunTime",sHzWorks.getSac1());
updateDeviceParam.put("equipmentCode",mesReportWork.getMachineCode());
- updateDeviceParam.put("productDate",mesReportWork.getProductDate());
+ updateDeviceParam.put("productDate",sHzWorks.getProductDate());
R rs = remoteDeviceService.updateDeviceRunTimeORRate(updateDeviceParam);
logger.info("==========================更新产线设备运行时间,故障率结束：结果"+ rs.getMsg());
return sapR;
@@ -611,14 +612,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
break;
}
}
- //更新产线设备运行时间,故障率
- logger.info("==========================更新产线设备运行时间,故障率开始");
- Map updateDeviceParam=new HashMap();
- updateDeviceParam.put("RunTime",mesReportWork.getWorkTime());
- updateDeviceParam.put("equipmentCode",mesReportWork.getMachineCode());
- updateDeviceParam.put("productDate",mesReportWork.getProductDate());
- R rs = remoteDeviceService.updateDeviceRunTimeORRate(updateDeviceParam);
- logger.info("==========================更新产线设备运行时间,故障率结束：结果"+ rs.getMsg());
}
return sapRson;
} catch (Exception e) {
@@ -934,7 +927,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
SapRFW sapRFW = new SapRFW();
sapRFW.setAufnr(workOrder.getWorkorderCodeSap());//虚拟工单号
sapRFW.setGamng(workOrder.getQuantityFeedback().toString());//报工数量
-
SapRFW.lt_gs ltgs = new SapRFW.lt_gs();//生产订单报工工时修改
ltgs.setConf_activity1(workOrder.getSac1());//机器
ltgs.setConf_activity2(workOrder.getSac2());//人工
@@ -985,6 +977,15 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
//如果是暂停的工单报工，向sap报工结束后，工单状态->w3
workOrder.setStatus("w3");
mesReportWorkMapper.updateOrderWorkStatus(workOrder);
+
+ //更新产线设备运行时间,故障率
+ logger.info("==========================更新产线设备运行时间,故障率开始");
+ Map updateDeviceParam=new HashMap();
+ updateDeviceParam.put("RunTime",workOrder.getSac1());
+ updateDeviceParam.put("equipmentCode",workOrder.getMachineCode());
+ updateDeviceParam.put("productDate",workOrder.getProductDate());
+ R rs = remoteDeviceService.updateDeviceRunTimeORRate(updateDeviceParam);
+ logger.info("==========================更新产线设备运行时间,故障率结束：结果"+ rs.getMsg());
return r;
// return R.ok();//测试
}
diff --git a/op-visual/op-monitor/op-visual-monitor.iml b/op-visual/op-monitor/op-visual-monitor.iml
index 106428e8f..eccc40cf8 100644
--- a/op-visual/op-monitor/op-visual-monitor.iml
+++ b/op-visual/op-monitor/op-visual-monitor.iml
@@ -10,136 +10,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file