Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备模块修改故障描述和设备类型绑定，质量模块来料报告导出调整。

Browse Source
master
Yangwl 2 weeks ago
parent ec3a22b30b
commit 520ca5a284
10 changed files with 420 additions and 384 deletions
Show Stats Download Patch File Download Diff File

10
op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java
Unescape Escape View File

@ -181,16 +181,16 @@ public class ExcelReportMapUtil {
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 5, 8));
Cell cellData3 = dataRow.getCell(9);
cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField())));
cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField())));
cellData3.setCellStyle(getDataStyle(sheet));
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 9, 10));
Cell cellData4 = dataRow.getCell(11);
cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField())));
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(4).getField())));
cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField())));
cellData5.setCellStyle(getDataStyle(sheet));
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 12, 13));
iterator.remove();
@ -291,7 +291,7 @@ public class ExcelReportMapUtil {
// return cellStyle;
// }
// //内容样式
// //内容样式
// public static CellStyle getDataFont(Workbook workbook){
// Font font = workbook.createFont();
// font.setFontHeightInPoints((short) 12);//字体大小
@ -312,7 +312,7 @@ public class ExcelReportMapUtil {
return object.toString();
}
}
// //处理数据
// //处理数据
// public static Integer getValueNum(Object object){
// if (object==null){
// return 0;

25
op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.op.device.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import com.op.system.api.domain.SysDept;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -61,6 +62,30 @@ public class EquTeamUser extends BaseEntity {
@Excel(name = "手机号")
private String phonenumber;
private SysDept dept;
private Long deptId;
@Override
public Long getDeptId() {
return deptId;
}
@Override
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public SysDept getDept() {
return dept;
}
public void setDept(SysDept dept) {
this.dept = dept;
}
public void setId(String id) {
this.id = id;
}

1
op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
Unescape Escape View File

@ -720,6 +720,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
return success("新增报修记录成功！");
} catch (Exception e) {
logger.error(e.getMessage());
return error();
}
}

1
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
Unescape Escape View File

@ -470,6 +470,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
EquOrder order = new EquOrder();
//源->目标
BeanUtils.copyProperties(plan, order);
order.setOrderId(IdUtils.fastSimpleUUID());
order.setCreateBy(createBy);
order.setCreateTime(nowtime);

4
op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.datascope.annotation.DataScope;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquTeamUser;
import com.op.device.mapper.EquTeamUserMapper;
@ -188,6 +189,7 @@ public class EquTeamServiceImpl implements IEquTeamService {
@Override
@DS("#master")
public List<EquTeamUser> selectTeamMembers(EquTeamUser equTeamUser) {
return equTeamMapper.selectTeamMembers(equTeamUser);
List<EquTeamUser> equTeamUserList =equTeamMapper.selectTeamMembers(equTeamUser);
return equTeamUserList;
}
}

2
op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
Unescape Escape View File

@ -389,7 +389,7 @@
LEFT JOIN base_equipment B ON A.equipment_code = B.equipment_code
WHERE
A.auxiliary_equipment_code = #{equipmentCode}
AND A.del_flag='0'
</select>
<select id="selectRepairEquList" resultType="java.util.Map">
SELECT

10
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
Unescape Escape View File

@ -28,7 +28,6 @@
<result property="attr1" column="attr1"/>
<result property="attr2" column="attr2"/>
<result property="atrr2" column="atrr2"/>
<result property="attr3" column="attr3"/>
<result property="attr4" column="attr4"/>
<result property="createBy" column="create_by"/>
@ -107,10 +106,17 @@
pow.route_code, pow.prod_line_code, pow.product_date,
pow.shift_id, pow.parent_order,pow.status, pow.prod_type,pow.factory_code,
pow.end_flag,pow.car_num,pow.sort_no,
pow.workorder_code_sap,po.atrr2,be.sap_code,be.sap_name
pow.workorder_code_sap,po.atrr2,be.sap_code,be.sap_name,
REPLACE(FORMAT(bp.length, '0.########'), '.', '') + '×' +
REPLACE(FORMAT(bp.width, '0.########'), '.', '') + '×' +
REPLACE(FORMAT(bp.height, '0.########'), '.', '') AS attr4,
sda.dict_label AS attr3
from pro_order_workorder pow
left join pro_order po on pow.order_id = po.id
left join base_equipment be on pow.workorder_name=be.equipment_code
left join base_product bp on pow.product_code=bp.product_code
LEFT JOIN base_product_attached bpa ON RIGHT(bp.product_code, 11) = bpa.product_code
LEFT JOIN lanju_op_cloud.dbo.sys_dict_data sda ON bpa.pack_type = sda.dict_value and sda.dict_type = 'pack_type'
<where>
<if test="workorderCode != null and workorderCode != ''">and pow.workorder_code like concat('%',
#{workorderCode}, '%')

2
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
Unescape Escape View File

@ -168,7 +168,7 @@ public class QcCheckTaskIncomeController extends BaseController {
ArrayList<ExcelCol> excelCols = new ArrayList<>();
excelCols.add(new ExcelCol("检验项目", "ruleName", 30));
excelCols.add(new ExcelCol("标准要求", "checkStandard", 30));
excelCols.add(new ExcelCol("抽检数", "samplePlan", 30));
excelCols.add(new ExcelCol("抽检数", "sampleQuality", 30));
excelCols.add(new ExcelCol("实测结果", "actualValue", 30));
excelCols.add(new ExcelCol("判定", "status", 30));
excelCols.add(new ExcelCol("附件", "fileUrls", 30));

1
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
Unescape Escape View File

@ -1414,6 +1414,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
mapdto.put("ruleName",detail.getRuleName());
mapdto.put("checkStandard",detail.getCheckStandard());
mapdto.put("actualValue",detail.getActualValue());
mapdto.put("sampleQuality",detail.getSampleQuality());
if("Y".equals(detail.getStatus())){
mapdto.put("status","合格");
}else if("N".equals(detail.getStatus())){

Write Preview
Loading…
Cancel
Save