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

change - 异常修复

Browse Source
master
yinq 12 months ago
parent 43e1be41ce
commit b3b7100660
18 changed files with 166 additions and 52 deletions
Show Stats Download Patch File Download Diff File

26
aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java
Unescape Escape View File

@ -26,25 +26,45 @@ public class ElectricalInspectionController {
/**
* 二线电检
* http://10.100.72.10:8010/Electricalinspection
* 解析电检数据接口
* @param paramMap
* @return
*/
@PostMapping("/electricalInspectionElectricalinspection")
public HashMap<String, String> getSAPMaterialData(@RequestBody Map paramMap) {
return electricalInspectionService.analysisElectricalInspectionData(paramMap);
String productLineCode = "CX_02";
System.out.println("++++++++解析电检数据接口++++++++");
return electricalInspectionService.analysisElectricalInspectionData(paramMap, productLineCode);
}
/**
* 解析电检数据接口NEW
* @param paramMap
* @return
*/
@PostMapping("/Electricalinspection")
public HashMap<String, String> electricalInspection(@RequestBody Map paramMap) {
return electricalInspectionService.analysisElectricalInspectionData(paramMap);
String productLineCode = "CX_02";
System.out.println("++++++++解析电检数据接口NEW++++++++");
return electricalInspectionService.analysisElectricalInspectionData(paramMap, productLineCode);
}
/**
* 一线电检
* http://10.100.72.10:8020/Electricalinspection
* 解析电检数据接口NEW
* @param paramMap
* @return
*/
@PostMapping("/oneElectricalInspection")
public HashMap<String, String> oneElectricalInspection(@RequestBody Map paramMap) {
String productLineCode = "CX_01";
System.out.println("++++++++一线解析电检数据接口NEW++++++++");
return electricalInspectionService.analysisElectricalInspectionData(paramMap, productLineCode);
}
}

3
aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java
Unescape Escape View File

@ -141,6 +141,7 @@ public class PdaApiController {
processStation.setParentId(checkInfo.getStationCode());
List<BaseProcessStation> processStations = baseProcessStationService.selectBaseProcessStationList(processStation);
inspection.setProcessCode(processStations.get(0).getProcessCode());
inspection.setProductLineName(processStations.get(0).getProductLineCode());
} catch (Exception e) {
e.printStackTrace();
}
@ -215,7 +216,7 @@ public class PdaApiController {
*/
@PostMapping("/rebarCode")
public AjaxResult rebarCode(String barCode) {
String result = service.rebarCode(barCode);
String result = service.rebarCode(barCode, "PDA补码");
if (StringUtils.isNotEmpty(result)){
return error(result);
}

2
aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java
Unescape Escape View File

@ -44,7 +44,7 @@ public interface IPdaBindingService {
* @param barCode
* @return
*/
public String rebarCode(String barCode);
public String rebarCode(String barCode, String printReason);
/**
* PDA解绑条码

23
aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.aucma.common.utils.StringUtils;
import com.aucma.report.domain.RecordExceptionProcess;
import com.aucma.report.domain.RecordSwitchOrder;
import com.aucma.report.domain.ReportQualityInspection;
import com.aucma.report.mapper.ReportQualityInspectionMapper;
import com.aucma.report.service.IRecordExceptionProcessService;
import com.aucma.report.service.IRecordSwitchOrderService;
import com.aucma.system.service.ISysPostService;
@ -35,6 +36,9 @@ public class PdaServiceImpl implements IPdaBindingService {
@Autowired
private IRecordSwitchOrderService recordSwitchOrderService;
@Autowired
private ReportQualityInspectionMapper reportQualityInspectionMapper;
@Override
public String selectBoxNameByCode(String boxCode) {
// mapper.selectBoxNameByCode(boxCode.substring(7,17));
@ -90,6 +94,20 @@ public class PdaServiceImpl implements IPdaBindingService {
recordExceptionProcessService.updateRecordExceptionProcess(recordExceptionProcess);
}
}
try {
if(StringUtils.isNotEmpty(info.getRepairName()) && info.getRepairName().equals("报废重做")){
Integer objId = info.getList().get(0);
ReportQualityInspection inspection = reportQualityInspectionMapper.selectReportQualityInspectionByObjId(Long.valueOf(objId));
this.rebarCode(inspection.getBarCode(), "报废重做,报废原因:" + inspection.getQualityDefectName());
}
if(StringUtils.isNotEmpty(info.getRepairName()) && info.getRepairName().equals("设备报废重做")){
Integer objId = info.getList().get(0);
ReportQualityInspection inspection = reportQualityInspectionMapper.selectReportQualityInspectionByObjId(Long.valueOf(objId));
this.rebarCode(inspection.getBarCode(), "设备报废重做,报废原因:" + inspection.getQualityDefectName());
}
} catch (Exception e) {
System.out.println("质量返修提交报废重做|设备报废重做异常：" + e);
}
return mapper.submitRepair(info);
}
@ -121,7 +139,7 @@ public class PdaServiceImpl implements IPdaBindingService {
* @return
*/
@Override
public String rebarCode(String barCode) {
public String rebarCode(String barCode, String printReason) {
if (StringUtils.isEmpty(barCode)){
return "条码信息输入错误！";
}
@ -132,6 +150,9 @@ public class PdaServiceImpl implements IPdaBindingService {
return "请勿重复补打条码！";
}
// 维护条码补打记录表
for (HashMap<String, String> map : barcodeList) {
map.put("print_reason", printReason);
}
mapper.printSupplementBarcode(barcodeList.get(0));
}
return null;

3
aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
Unescape Escape View File

@ -10,6 +10,7 @@
FROM C##AUCMA_SCADA.PRINT_BARCODE PB
LEFT JOIN C##AUCMA_MES.BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE
WHERE PB.MATERIAL_BARCODE = #{boxCode}
GROUP BY BO.MATERIAL_NAME
</select>
<select id="selectBoxNameBarCode" resultType="string">
@ -137,6 +138,7 @@
<if test="MATERIAL_BARCODE != null">MATERIAL_BARCODE,</if>
<if test="PRINT_BARTYPE != null">PRINT_BARTYPE,</if>
<if test="PRINT_NAME != null">PRINT_NAME,</if>
<if test="print_reason != null">print_reason,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ORDER_CODE != null">#{ORDER_CODE},</if>
@ -145,6 +147,7 @@
<if test="MATERIAL_BARCODE != null">#{MATERIAL_BARCODE},</if>
<if test="PRINT_BARTYPE != null">#{PRINT_BARTYPE},</if>
<if test="PRINT_NAME != null">#{PRINT_NAME},</if>
<if test="print_reason != null">#{print_reason},</if>
</trim>
</insert>

2
aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml
Unescape Escape View File

@ -167,7 +167,7 @@
WHERE PRODUCT_LINE_TYPE = 2
AND STATION_TYPE = 2
AND EXECUTION_SORT IS NOT NULL
AND PARENT_ID = 'CX_02'
AND PARENT_ID = (SELECT PARENT_ID FROM BASE_PRODUCTLINE WHERE PRODUCT_LINE_CODE = #{productLineCode})
AND PRODUCT_LINE_CODE NOT IN ('2015', '2009')
ORDER BY EXECUTION_SORT
</select>

29
aucma-report/src/main/java/com/aucma/report/domain/PrintSupplementBarCode.java
Unescape Escape View File

@ -71,6 +71,35 @@ public class PrintSupplementBarCode extends BaseEntity {
@Excel(name = "是否打印 1=已打印,0=未打印")
private String isPrint;
/**
* 打印原因（报废重做 切换订单）
*/
@Excel(name = "打印原因")
private String printReason;
/**
* 记录时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
public Date getRecordTime() {
return recordTime;
}
public void setRecordTime(Date recordTime) {
this.recordTime = recordTime;
}
public String getPrintReason() {
return printReason;
}
public void setPrintReason(String printReason) {
this.printReason = printReason;
}
public void setObjId(Long objId) {
this.objId = objId;
}

10
aucma-report/src/main/java/com/aucma/report/domain/RecordElectricalInspection.java
Unescape Escape View File

@ -65,11 +65,21 @@ public class RecordElectricalInspection extends BaseEntity {
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
private String productLineCode;
/**
* 电检数据明细信息
*/
private List<DetailElectricalinspection> detailElectricalinspectionList;
public String getProductLineCode() {
return productLineCode;
}
public void setProductLineCode(String productLineCode) {
this.productLineCode = productLineCode;
}
public String getMaterialModel() {
return materialModel;
}

3
aucma-report/src/main/java/com/aucma/report/service/IRecordElectricalInspectionService.java
Unescape Escape View File

@ -65,7 +65,8 @@ public interface IRecordElectricalInspectionService
/**
* 解析电检数据接口
* @param paramMap
* @param productLineCode
* @return
*/
HashMap<String, String> analysisElectricalInspectionData(Map paramMap);
HashMap<String, String> analysisElectricalInspectionData(Map paramMap, String productLineCode);
}

2
aucma-report/src/main/java/com/aucma/report/service/impl/MaterialCompletionServiceImpl.java
Unescape Escape View File

@ -111,7 +111,7 @@ public class MaterialCompletionServiceImpl implements IMaterialCompletionService
materialCompletion.setMaterialName(inspection.getMaterialName());
materialCompletion.setStationName(inspection.getStationCode());
materialCompletion.setCompleteDate(inspection.getInspectorTime());
materialCompletion.setProductLineCode("CX_02");
materialCompletion.setProductLineCode(inspection.getProductLineName());
materialCompletionMapper.insertMaterialCompletion(materialCompletion);
}

6
aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java
Unescape Escape View File

@ -358,11 +358,9 @@ public class QualityReportServiceImpl implements IQualityReportService {
if (hashMap.get("month").toString().equals("0")) {
return reportMapper.weldLeakRateList(hashMap);
}else if (hashMap.get("month").toString().equals("1")) {
List<WeldLeakRateReport> weldLeakRateReports = reportMapper.weldLeakRateListMonth(hashMap);
return weldLeakRateReports;
return reportMapper.weldLeakRateListMonth(hashMap);
}
return reportMapper.weldLeakRateList(hashMap);
return null;
}
//根据年份获取月份日期

5
aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java
Unescape Escape View File

@ -149,10 +149,11 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI
* 解析电检数据接口
*
* @param paramMap
* @param productLineCode
* @return
*/
@Override
public HashMap<String, String> analysisElectricalInspectionData(Map paramMap) {
public HashMap<String, String> analysisElectricalInspectionData(Map paramMap, String productLineCode) {
HashMap<String, String> resultData = new HashMap<>();
RecordElectricalInspection inspection = new RecordElectricalInspection();
ArrayList<DetailElectricalinspection> detailList = new ArrayList<>();
@ -171,6 +172,7 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI
inspection.setTestTime(testtime);
inspection.setTestData(uuid);
inspection.setRecordTime(DateUtils.getNowDate());
inspection.setProductLineCode(productLineCode);
recordElectricalInspectionMapper.insertRecordElectricalInspection(inspection);
String[] testDataEntries = testdata.split(";");
for (String testDataEntry : testDataEntries) {
@ -215,6 +217,7 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI
//质检合格存入质检数据
if (StringUtils.isNotEmpty(inspectionInfo.getResult()) && inspectionInfo.getResult().equals("OK")) {
qualityInspection.setTreatmentMeasure("3");
qualityInspection.setProductLineName(inspectionInfo.getProductLineCode());
qualityInspectionService.insertReportQualityInspection(qualityInspection);
materialCompletionService.inspectionProcessing(qualityInspection);
return;

3
aucma-report/src/main/java/com/aucma/report/service/impl/RecordSwitchOrderServiceImpl.java
Unescape Escape View File

@ -96,6 +96,9 @@ public class RecordSwitchOrderServiceImpl implements IRecordSwitchOrderService {
recordSwitchOrderMapper.updateRecordSwitchOrder(recordSwitchOrder);
List<HashMap<String, String>> barcodeList = recordSwitchOrderMapper.selectPrintBarcode(recordSwitchOrder.getMaterialBarcode());
// 维护条码补打记录表
for (HashMap<String, String> map : barcodeList) {
map.put("print_reason", "切换订单");
}
recordSwitchOrderMapper.printSupplementBarcode(barcodeList.get(0));
} catch (Exception e) {
e.printStackTrace();

4
aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
Unescape Escape View File

@ -130,7 +130,9 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect
@Override
public String checkBeforeStationInspection(String boxCode, String stationCode) {
String result = null;
List<BaseProductLine> productLineList = productLineService.selectReportQualityStationCode(new BaseProductLine());
BaseProductLine baseProductLine = new BaseProductLine();
baseProductLine.setProductLineCode(stationCode);
List<BaseProductLine> productLineList = productLineService.selectReportQualityStationCode(baseProductLine);
int markLocation = 0;
for (int i = 0; i < productLineList.size(); i++) {
if (productLineList.get(i).getProductLineCode().equals(stationCode)){

77
aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
Unescape Escape View File

@ -317,7 +317,7 @@
GROUP BY
DA.QUALITY_DEFECT_NAME, TD.ALL_DEFECT
) SD
ORDER BY RATE
ORDER BY DEFECT_NUMBER DESC
</select>
<select id="productTraceabilityReportList" resultType="com.aucma.report.domain.ProductTraceabilityReport"
@ -711,13 +711,16 @@
GROUP BY PRODUCT_SCANTIME) VPO
LEFT JOIN (SELECT INSPECTOR_TIME, NVL(COUNT(*), 0) QUALITY_SUM
FROM (SELECT TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD') INSPECTOR_TIME, RQI.BAR_CODE
FROM REPORT_QUALITY_INSPECTION RQI
FROM REPORT_QUALITY_INSPECTION RQI
LEFT JOIN BASE_PRODUCTLINE BP on RQI.STATION_CODE = BP.PRODUCT_LINE_CODE
<if test="alarmType != null and alarmType == 1 ">
WHERE RQI.PROCESS_RESULT = 'KA'
</if>
<if test="alarmType != null and alarmType == 2 ">
WHERE RQI.PROCESS_RESULT = '报废重做'
</if>
<if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''">
AND BP.PARENT_ID= #{PRODUCT_LINE_CODE}
</if>
GROUP BY TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD'), RQI.BAR_CODE)
GROUP BY INSPECTOR_TIME) RQI ON VPO.PRODUCT_SCANTIME = RQI.INSPECTOR_TIME
@ -802,33 +805,33 @@
<select id="weldLeakRateList" resultType="com.aucma.report.domain.WeldLeakRateReport" parameterType="java.util.HashMap">
SELECT WEEK_NUMBER,
WEEK_START,
WEEK_END,
NVL(COUNT(*), 0) Q_SUM,
NVL(SUM(LEAK_SUM), 0) LEAK_SUM,
TO_CHAR(ROUND(SUM(LEAK_SUM) / COUNT(*) * 100, 2), 'FM99990.00') REPAIR_RATE,
PRODUCT_LINE_NAME PRODUCT_LINE_NAME
WEEK_START,
WEEK_END,
NVL(COUNT(*), 0) Q_SUM,
NVL(SUM(LEAK_SUM), 0) LEAK_SUM,
TO_CHAR(ROUND(SUM(LEAK_SUM) / COUNT(*) * 100, 2), 'FM99990.00') REPAIR_RATE,
CASE WHEN 'CX_02' = #{PRODUCT_LINE_CODE} THEN '二线' ELSE '一线' END PRODUCT_LINE_NAME
FROM (
SELECT TO_NUMBER(COLUMN_A) WEEK_NUMBER,
COLUMN_B WEEK_START,
COLUMN_C WEEK_END,
P2.PRODUCT_LINE_NAME,
BAR_CODE,
MAX(CASE WHEN QUALITY_DEFECT_NAME LIKE '%漏%' THEN 1 ELSE 0 END) LEAK_SUM
FROM (SELECT COLUMN_A, COLUMN_B, COLUMN_C
FROM TABLE (GET_YEAR_WEEK_TIME(${year}))) WEE
LEFT JOIN REPORT_QUALITY_INSPECTION RQI
LEFT JOIN BASE_PRODUCTLINE BP on RQI.STATION_CODE = BP.PRODUCT_LINE_CODE
LEFT JOIN BASE_PRODUCTLINE P2 on P2.PRODUCT_LINE_CODE = BP.PARENT_ID
ON RQI.BAR_CODE LIKE 'B%' AND
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') > WEE.COLUMN_B AND
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') &lt;= WEE.COLUMN_C
<if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''">
WHERE P2.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
</if>
GROUP BY COLUMN_A, COLUMN_B, COLUMN_C, P2.PRODUCT_LINE_NAME, BAR_CODE
)
GROUP BY PRODUCT_LINE_NAME, WEEK_NUMBER, WEEK_START, WEEK_END
SELECT TO_NUMBER(COLUMN_A) WEEK_NUMBER,
COLUMN_B WEEK_START,
COLUMN_C WEEK_END,
BAR_CODE,
MAX(CASE WHEN QUALITY_DEFECT_NAME LIKE '%漏%' THEN 1 ELSE 0 END) LEAK_SUM
FROM (SELECT COLUMN_A, COLUMN_B, COLUMN_C
FROM TABLE (GET_YEAR_WEEK_TIME(${year}))) WEE
LEFT JOIN (
SELECT R.BAR_CODE, R.INSPECTOR_TIME, R.QUALITY_DEFECT_NAME
FROM REPORT_QUALITY_INSPECTION R
LEFT JOIN BASE_PRODUCTLINE BP on R.STATION_CODE = BP.PRODUCT_LINE_CODE
LEFT JOIN BASE_PRODUCTLINE P2 on P2.PRODUCT_LINE_CODE = BP.PARENT_ID
WHERE P2.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
) RQI ON RQI.BAR_CODE LIKE 'B%' AND
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') > WEE.COLUMN_B AND
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') &lt;
= WEE.COLUMN_C
GROUP BY COLUMN_A, COLUMN_B, COLUMN_C, BAR_CODE
)
GROUP BY WEEK_NUMBER, WEEK_START, WEEK_END
ORDER BY WEEK_NUMBER
</select>
@ -839,25 +842,27 @@
NVL(COUNT(*), 0) Q_SUM,
NVL(SUM(LEAK_SUM), 0) LEAK_SUM,
TO_CHAR(ROUND(SUM(LEAK_SUM) / COUNT(*) * 100, 2), 'FM99990.00') REPAIR_RATE,
PRODUCT_LINE_NAME PRODUCT_LINE_NAME
CASE WHEN 'CX_02' = #{PRODUCT_LINE_CODE} THEN '二线' ELSE '一线' END PRODUCT_LINE_NAME
FROM (
SELECT TO_NUMBER(COLUMN_A) WEEK_NUMBER,
COLUMN_B WEEK_START,
COLUMN_C WEEK_END,
P2.PRODUCT_LINE_NAME,
BAR_CODE,
MAX(CASE WHEN QUALITY_DEFECT_NAME LIKE '%漏%' THEN 1 ELSE 0 END) LEAK_SUM
FROM (SELECT COLUMN_A, COLUMN_B, COLUMN_C
FROM TABLE (GET_YEAR_MONTH_TIME(${year}))) WEE
LEFT JOIN REPORT_QUALITY_INSPECTION RQI
LEFT JOIN BASE_PRODUCTLINE BP on RQI.STATION_CODE = BP.PRODUCT_LINE_CODE
LEFT JOIN (
SELECT R.BAR_CODE, R.INSPECTOR_TIME, R.QUALITY_DEFECT_NAME
FROM REPORT_QUALITY_INSPECTION R
LEFT JOIN BASE_PRODUCTLINE BP on R.STATION_CODE = BP.PRODUCT_LINE_CODE
LEFT JOIN BASE_PRODUCTLINE P2 on P2.PRODUCT_LINE_CODE = BP.PARENT_ID
ON RQI.BAR_CODE LIKE 'B%' AND
WHERE P2.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
) RQI ON RQI.BAR_CODE LIKE 'B%' AND
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') > WEE.COLUMN_B AND
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') &lt;= WEE.COLUMN_C
GROUP BY COLUMN_A, COLUMN_B, COLUMN_C, P2.PRODUCT_LINE_NAME ,BAR_CODE
GROUP BY COLUMN_A, COLUMN_B, COLUMN_C, BAR_CODE
)
GROUP BY PRODUCT_LINE_NAME, WEEK_NUMBER, WEEK_START, WEEK_END
GROUP BY WEEK_NUMBER, WEEK_START, WEEK_END
ORDER BY WEEK_NUMBER
</select>

11
aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml
Unescape Escape View File

@ -14,6 +14,8 @@
<result property="printBartype" column="print_bartype"/>
<result property="printName" column="print_name"/>
<result property="isPrint" column="is_print"/>
<result property="printReason" column="print_reason"/>
<result property="recordTime" column="record_time"/>
</resultMap>
<sql id="selectPrintSupplementBarCodeVo">
@ -24,6 +26,8 @@
PS.PRINT_TIME,
CASE WHEN PS.PRINT_BARTYPE = '1' THEN '箱体' ELSE '内胆' END PRINT_BARTYPE,
PS.PRINT_NAME,
PS.print_reason,
PS.record_time,
CASE WHEN PS.IS_PRINT = '1' THEN '已打印' ELSE '未打印' END IS_PRINT
FROM C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS
LEFT JOIN C##AUCMA_MES.BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PS.MATERIAL_CODE
@ -44,12 +48,14 @@
to_date(#{params.endPrintTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="printBartype != null ">and PS.print_bartype = #{printBartype}</if>
<if test="printReason != null and printReason != '' ">and PS.print_reason like concat(concat('%',
#{printReason}), '%')</if>
<if test="printName != null and printName != ''">and PS.print_name like concat(concat('%', #{printName}),
'%')
</if>
<if test="isPrint != null and isPrint != ''">and PS.is_print = #{isPrint}</if>
</where>
ORDER BY PS.PRINT_TIME DESC
ORDER BY PS.record_time DESC
</select>
<select id="selectPrintSupplementBarCodeByObjId" parameterType="Long" resultMap="PrintSupplementBarCodeResult">
@ -72,6 +78,7 @@
<if test="printBartype != null">print_bartype,</if>
<if test="printName != null">print_name,</if>
<if test="isPrint != null">is_print,</if>
<if test="printReason != null">print_reason,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="objId != null">#{objId},</if>
@ -83,6 +90,7 @@
<if test="printBartype != null">#{printBartype},</if>
<if test="printName != null">#{printName},</if>
<if test="isPrint != null">#{isPrint},</if>
<if test="printReason != null">#{printReason},</if>
</trim>
</insert>
@ -97,6 +105,7 @@
<if test="printBartype != null">print_bartype = #{printBartype},</if>
<if test="printName != null">print_name = #{printName},</if>
<if test="isPrint != null">is_print = #{isPrint},</if>
<if test="printReason != null">print_reason = #{printReason},</if>
</trim>
where obj_id = #{objId}
</update>

7
aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml
Unescape Escape View File

@ -12,6 +12,7 @@
<result property="testData" column="testdata"/>
<result property="recordTime" column="recordtime"/>
<result property="materialModel" column="MATERIAL_MODEL"/>
<result property="productLineCode" column="product_line_code"/>
<result property="qualityDefectNames" column="QUALITY_DEFECT_NAMES"/>
</resultMap>
@ -39,6 +40,7 @@
MI.MATERIAL_SPECIFICATIONS MATERIAL_MODEL,
ei.TESTTIME,
ei.TESTDATA,
ei.product_line_code,
NG.QUALITY_DEFECT_NAMES,
ei.RECORDTIME
FROM RECORD_ELECTRICALINSPECTION ei
@ -71,6 +73,7 @@
<if test="barcode != null and barcode != ''">and ei.barcode = #{barcode}</if>
<if test="testTime != null and testTime != ''">and ei.testtime = #{testTime}</if>
<if test="testData != null and testData != ''">and ei.testdata = #{testData}</if>
<if test="productLineCode != null and productLineCode != ''">and ei.product_line_code = #{productLineCode}</if>
<if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
and ei.recordtime between to_date(#{params.beginRecordTime}, 'yyyy-mm-dd hh24:mi:ss') and
to_date(#{params.endRecordTime}, 'yyyy-mm-dd hh24:mi:ss')
@ -87,6 +90,7 @@
a.testtime,
a.testdata,
a.recordtime,
a.product_line_code,
b.uuid as sub_uuid,
b.serialnumber as sub_serialnumber,
b.projectname as sub_projectname,
@ -120,6 +124,7 @@
<if test="testTime != null">testtime,</if>
<if test="testData != null">testdata,</if>
<if test="recordTime != null">recordtime,</if>
<if test="productLineCode != null">product_line_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="uuid != null">#{uuid},</if>
@ -128,6 +133,7 @@
<if test="testTime != null">#{testTime},</if>
<if test="testData != null">#{testData},</if>
<if test="recordTime != null">#{recordTime},</if>
<if test="productLineCode != null">#{productLineCode},</if>
</trim>
</insert>
@ -139,6 +145,7 @@
<if test="testTime != null">testtime = #{testTime},</if>
<if test="testData != null">testdata = #{testData},</if>
<if test="recordTime != null">recordtime = #{recordTime},</if>
<if test="productLineCode != null">product_line_code = #{productLineCode},</if>
</trim>
where uuid = #{uuid}
</update>

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

@ -167,6 +167,7 @@
<if test="MATERIAL_BARCODE != null">MATERIAL_BARCODE,</if>
<if test="PRINT_BARTYPE != null">PRINT_BARTYPE,</if>
<if test="PRINT_NAME != null">PRINT_NAME,</if>
<if test="print_reason != null">print_reason,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ORDER_CODE != null">#{ORDER_CODE},</if>
@ -175,6 +176,7 @@
<if test="MATERIAL_BARCODE != null">#{MATERIAL_BARCODE},</if>
<if test="PRINT_BARTYPE != null">#{PRINT_BARTYPE},</if>
<if test="PRINT_NAME != null">#{PRINT_NAME},</if>
<if test="print_reason != null">#{print_reason},</if>
</trim>
</insert>
</mapper>
Write Preview
Loading…
Cancel
Save