yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 页面排序

Browse Source
master
yinq 10 months ago
parent c06fa24a75
commit b6b5a3a474
11 changed files with 121 additions and 52 deletions
Show Stats Download Patch File Download Diff File

1
aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
Unescape Escape View File

@ -67,6 +67,7 @@
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if> <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
</where> </where>
order by device_code
</select> </select>
<select id="selectBaseDeviceLedgerByObjId" parameterType="Long" resultMap="BaseDeviceLedgerResult"> <select id="selectBaseDeviceLedgerByObjId" parameterType="Long" resultMap="BaseDeviceLedgerResult">

3
aucma-base/src/main/resources/mapper/base/BaseProcessStationMapper.xml
Unescape Escape View File

@ -73,7 +73,8 @@
<if test="createdTime != null ">and created_time = #{createdTime}</if> <if test="createdTime != null ">and created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if> <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
<if test="parentId != null and parentId != ''">and bps.parent_id = #{parentId}</if> <if test="parentId != null and parentId != ''">and bps.parent_id like concat(concat('%',
#{parentId}), '%')</if>
</where> </where>
</select> </select>

1
aucma-base/src/main/resources/mapper/base/StationDefectRelationMapper.xml
Unescape Escape View File

@ -53,6 +53,7 @@
<if test="updatedBy != null and updatedBy != ''"> and sdr.updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''"> and sdr.updated_by = #{updatedBy}</if>
<if test="updatedTime != null "> and sdr.updated_time = #{updatedTime}</if> <if test="updatedTime != null "> and sdr.updated_time = #{updatedTime}</if>
</where> </where>
order by sdr.station_code, sdr.defect_code
</select> </select>
<select id="selectStationDefectRelationByObjId" parameterType="Long" resultMap="StationDefectRelationResult"> <select id="selectStationDefectRelationByObjId" parameterType="Long" resultMap="StationDefectRelationResult">

4
aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
Unescape Escape View File

@ -109,8 +109,8 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
*/ */
public BaseBomInfo recursionSelectBaseBomInfoList(BaseBomInfo baseBomInfo) { public BaseBomInfo recursionSelectBaseBomInfoList(BaseBomInfo baseBomInfo) {
BaseBomInfo info = new BaseBomInfo(); BaseBomInfo info = new BaseBomInfo();
info.setAncestors(baseBomInfo.getMaterialCode()); info.setMaterialCode(baseBomInfo.getMaterialCode());
info.setMaterialType(MaterialConstants.COAMING_MATERIAL_TYPE); info.setIsPlanToStation(0L);
List<BaseBomInfo> baseBomInfos = baseBomInfoMapper.selectBaseBomInfoList(info); List<BaseBomInfo> baseBomInfos = baseBomInfoMapper.selectBaseBomInfoList(info);
if (baseBomInfos.size() >= 1) { if (baseBomInfos.size() >= 1) {
baseBomInfo.setIsPlanToStation(0L); baseBomInfo.setIsPlanToStation(0L);

2
aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
Unescape Escape View File

@ -123,7 +123,7 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService {
} }
//获取生产BOM信息 //获取生产BOM信息
BaseBomInfo bomInfo = new BaseBomInfo(); BaseBomInfo bomInfo = new BaseBomInfo();
bomInfo.setAncestors(baseOrderInfo.getMaterialCode()); bomInfo.setMaterialCode(baseOrderInfo.getMaterialCode());
bomInfo.setIsPlanToStation(0L); bomInfo.setIsPlanToStation(0L);
List<BaseBomInfo> baseBomInfoList = baseBomInfoService.selectBaseBomInfoList(bomInfo); List<BaseBomInfo> baseBomInfoList = baseBomInfoService.selectBaseBomInfoList(bomInfo);
//检查生产BOM是否满足下计划条件 //检查生产BOM是否满足下计划条件

21
aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml
Unescape Escape View File

@ -71,15 +71,20 @@
<if test="ancestors != null and ancestors != ''">and bb.ancestors like concat(concat('%', #{ancestors}), <if test="ancestors != null and ancestors != ''">and bb.ancestors like concat(concat('%', #{ancestors}),
'%') '%')
</if> </if>
<if test="isPlanToStation != null and isPlanToStation == 0L"> AND bb.MATERIAL_CODE IN (SELECT ANCESTORS <if test="isPlanToStation != null and isPlanToStation == 0L"> AND bb.MATERIAL_CODE IN (SELECT b1.MATERIAL_CODE
FROM base_bominfo FROM base_bominfo b1
WHERE MATERIAL_TYPE = 400 left join base_bominfo b2 on b2.PARENT_ID = b1.MATERIAL_CODE and b2.MATERIAL_TYPE = 200
GROUP BY ANCESTORS) left join base_bominfo b3 on b3.PARENT_ID = b2.MATERIAL_CODE and b3.MATERIAL_TYPE = 400
WHERE b1.MATERIAL_TYPE = 100
AND b3.MATERIAL_NAME IS NOT NULL
)
</if> </if>
<if test="isPlanToStation != null and isPlanToStation == 1L"> AND bb.MATERIAL_CODE NOT IN (SELECT ANCESTORS <if test="isPlanToStation != null and isPlanToStation == 1L"> AND bb.MATERIAL_CODE IN (SELECT b1.MATERIAL_CODE
FROM base_bominfo FROM base_bominfo b1
WHERE MATERIAL_TYPE = 400 left join base_bominfo b2 on b2.PARENT_ID = b1.MATERIAL_CODE and b2.MATERIAL_TYPE = 200
GROUP BY ANCESTORS) left join base_bominfo b3 on b3.PARENT_ID = b2.MATERIAL_CODE and b3.MATERIAL_TYPE = 400
WHERE b1.MATERIAL_TYPE = 100
AND b3.MATERIAL_NAME IS NULL)
</if> </if>
</where> </where>
order by bb.material_type, bb.created_time desc order by bb.material_type, bb.created_time desc

46
aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
Unescape Escape View File

@ -40,6 +40,12 @@ public class ReportQualityInspection extends BaseEntity {
@Excel(name = "工序编号") @Excel(name = "工序编号")
private String processCode; private String processCode;
/**
* 工序名称
*/
@Excel(name = "工序名称")
private String processName;
/** /**
* 检测项编号 * 检测项编号
*/ */
@ -83,11 +89,23 @@ public class ReportQualityInspection extends BaseEntity {
private String groupCode; private String groupCode;
/** /**
* 检测人员 * 班组名称
*/
@Excel(name = "班组名称")
private String groupName;
/**
* 检测人员编号
*/ */
@Excel(name = "检测人员") @Excel(name = "检测人员编号")
private String inspectorCode; private String inspectorCode;
/**
* 检测人员名称
*/
@Excel(name = "检测人员名称")
private String inspectorName;
/** /**
* 检测时间 * 检测时间
*/ */
@ -130,6 +148,30 @@ public class ReportQualityInspection extends BaseEntity {
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime; private Date updatedTime;
public String getProcessName() {
return processName;
}
public void setProcessName(String processName) {
this.processName = processName;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public String getInspectorName() {
return inspectorName;
}
public void setInspectorName(String inspectorName) {
this.inspectorName = inspectorName;
}
public void setObjId(Long objId) { public void setObjId(Long objId) {
this.objId = objId; this.objId = objId;
} }

7
aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
Unescape Escape View File

@ -42,4 +42,11 @@ public interface IProductionReportService
* @return * @return
*/ */
List<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap); List<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap);
/**
* 发泡注料记录报表
* @param hashMap
* @return
*/
List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap);
} }

1
aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml
Unescape Escape View File

@ -43,6 +43,7 @@
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if> <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
</where> </where>
order by pda_name
</select> </select>
<select id="selectBasePdaRecordByObjId" parameterType="Long" resultMap="BasePdaRecordResult"> <select id="selectBasePdaRecordByObjId" parameterType="Long" resultMap="BasePdaRecordResult">

85
aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
Unescape Escape View File

@ -26,65 +26,76 @@
<result property="stationCode" column="STATION_CODE"/> <result property="stationCode" column="STATION_CODE"/>
<result property="submitQualtyId" column="SUBMINT_QUALTY_ID"/> <result property="submitQualtyId" column="SUBMINT_QUALTY_ID"/>
<result property="productLineName" column="PRODUCT_LINE_NAME"/> <result property="productLineName" column="PRODUCT_LINE_NAME"/>
<result property="processName" column="processName"/>
<result property="groupName" column="groupName"/>
<result property="inspectorName" column="inspectorName"/>
</resultMap> </resultMap>
<sql id="selectReportQualityInspectionVo"> <sql id="selectReportQualityInspectionVo">
select obj_id, select rqi.obj_id,
bar_code, rqi.bar_code,
material_name, rqi.material_name,
process_code, rqi.process_code,
test_item_code, bps.PROCESS_NAME processName,
quality_defect_code, rqi.test_item_code,
quality_defect_name, pl.PRODUCT_LINE_NAME PRODUCT_LINE_NAME,
treatment_measure, rqi.quality_defect_code,
process_result, rqi.quality_defect_name,
is_lower_line, rqi.treatment_measure,
group_code, rqi.process_result,
inspector_code, rqi.is_lower_line,
inspector_time, rqi.group_code,
rework_number, btm.TEAM_NAME groupName,
finish_time, rqi.inspector_code,
is_flag, su.NICK_NAME inspectorName,
updated_by, rqi.inspector_time,
updated_time rqi.rework_number,
from report_quality_inspection rqi.finish_time,
rqi.is_flag,
rqi.updated_by,
rqi.updated_time
from report_quality_inspection rqi
left join BASE_PROCESS_STATION bps on bps.PROCESS_CODE = rqi.PROCESS_CODE
left join BASE_TEAMMEMBERS btm on btm.TEAM_CODE = rqi.group_code
left join SYS_USER su on su.USER_NAME = rqi.inspector_code
left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = rqi.STATION_CODE
</sql> </sql>
<select id="selectReportQualityInspectionList" parameterType="ReportQualityInspection" <select id="selectReportQualityInspectionList" parameterType="ReportQualityInspection"
resultMap="ReportQualityInspectionResult"> resultMap="ReportQualityInspectionResult">
<include refid="selectReportQualityInspectionVo"/> <include refid="selectReportQualityInspectionVo"/>
<where> <where>
<if test="barCode != null and barCode != ''">and bar_code = #{barCode}</if> <if test="barCode != null and barCode != ''">and rqi.bar_code = #{barCode}</if>
<if test="materialName != null and materialName != ''">and material_name like concat(concat('%', <if test="materialName != null and materialName != ''">and rqi.material_name like concat(concat('%',
#{materialName}), '%') #{materialName}), '%')
</if> </if>
<if test="processCode != null and processCode != ''">and process_code = #{processCode}</if> <if test="processCode != null and processCode != ''">and rqi.process_code = #{processCode}</if>
<if test="testItemCode != null and testItemCode != ''">and test_item_code = #{testItemCode}</if> <if test="testItemCode != null and testItemCode != ''">and rqi.test_item_code = #{testItemCode}</if>
<if test="qualityDefectCode != null and qualityDefectCode != ''">and quality_defect_code = <if test="qualityDefectCode != null and qualityDefectCode != ''">and rqi.quality_defect_code =
#{qualityDefectCode} #{qualityDefectCode}
</if> </if>
<if test="qualityDefectName != null and qualityDefectName != ''">and quality_defect_name like <if test="qualityDefectName != null and qualityDefectName != ''">and rqi.quality_defect_name like
concat(concat('%', #{qualityDefectName}), '%') concat(concat('%', #{qualityDefectName}), '%')
</if> </if>
<if test="treatmentMeasure != null and treatmentMeasure != ''">and treatment_measure = <if test="treatmentMeasure != null and treatmentMeasure != ''">and rqi.treatment_measure =
#{treatmentMeasure} #{treatmentMeasure}
</if> </if>
<if test="processResult != null and processResult != ''">and process_result = #{processResult}</if> <if test="processResult != null and processResult != ''">and rqi.process_result = #{processResult}</if>
<if test="isLowerLine != null and isLowerLine != ''">and is_lower_line = #{isLowerLine}</if> <if test="isLowerLine != null and isLowerLine != ''">and rqi.is_lower_line = #{isLowerLine}</if>
<if test="groupCode != null and groupCode != ''">and group_code = #{groupCode}</if> <if test="groupCode != null and groupCode != ''">and rqi.group_code = #{groupCode}</if>
<if test="inspectorCode != null and inspectorCode != ''">and inspector_code = #{inspectorCode}</if> <if test="inspectorCode != null and inspectorCode != ''">and rqi.inspector_code = #{inspectorCode}</if>
<if test="inspectorTime != null ">and inspector_time = #{inspectorTime}</if> <if test="inspectorTime != null ">and rqi.inspector_time = #{inspectorTime}</if>
<if test="reworkNumber != null ">and rework_number = #{reworkNumber}</if> <if test="reworkNumber != null ">and rqi.rework_number = #{reworkNumber}</if>
<if test="finishTime != null ">and finish_time = #{finishTime}</if> <if test="finishTime != null ">and rqi.finish_time = #{finishTime}</if>
<if test="isFlag != null ">and is_flag = #{isFlag}</if> <if test="isFlag != null ">and rqi.is_flag = #{isFlag}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''">and rqi.updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if> <if test="updatedTime != null ">and rqi.updated_time = #{updatedTime}</if>
</where> </where>
</select> </select>
<select id="selectReportQualityInspectionByObjId" parameterType="Long" resultMap="ReportQualityInspectionResult"> <select id="selectReportQualityInspectionByObjId" parameterType="Long" resultMap="ReportQualityInspectionResult">
<include refid="selectReportQualityInspectionVo"/> <include refid="selectReportQualityInspectionVo"/>
where obj_id = #{objId} where rqi.obj_id = #{objId}
</select> </select>
<insert id="insertReportQualityInspection" parameterType="ReportQualityInspection"> <insert id="insertReportQualityInspection" parameterType="ReportQualityInspection">

2
aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml
Unescape Escape View File

@ -45,7 +45,7 @@
<if test="createdTime != null ">and created_time = #{createdTime}</if> <if test="createdTime != null ">and created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if> <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
<if test="userPermission != null and userPermission != '2'">and user_permission = #{userPermission}</if> <if test="userPermission != null ">and #{userPermission} >= user_permission</if>
</where> </where>
order by repair_code order by repair_code
</select> </select>

Write Preview
Loading…
Cancel
Save