From 7a2ce51878b1bbf3b34cabd1a79043d01bee6283 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 22 Nov 2024 14:59:28 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B5=8B=E6=B8=A9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=A1=A8=E3=80=81=E8=A1=A5=E6=89=93=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/base/BaseDeviceLedgerMapper.xml | 4 +-- .../PrintSupplementBarCodeController.java | 10 ------ .../report/domain/BoxTemperatureHistory.java | 10 ++++++ .../aucma/report/domain/PerfusionRecord.java | 15 ++++++++ .../report/domain/PrintSupplementBarCode.java | 10 ++++++ .../mapper/PrintSupplementBarCodeMapper.java | 8 ----- .../IPrintSupplementBarCodeService.java | 8 ----- .../PrintSupplementBarCodeServiceImpl.java | 11 ------ .../report/BoxTemperatureHistoryMapper.xml | 5 ++- .../mapper/report/PerfusionRecordMapper.xml | 5 ++- .../report/PrintSupplementBarCodeMapper.xml | 36 +++---------------- .../mapper/report/RecordSwitchOrderMapper.xml | 1 + 12 files changed, 50 insertions(+), 73 deletions(-) diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml index 0e44609..182f9ed 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml @@ -93,7 +93,7 @@ from base_deviceledger - + SELECT seq_base_deviceledger.NEXTVAL as objId FROM DUAL @@ -144,7 +144,7 @@ - + update base_deviceledger device_code = #{deviceCode}, diff --git a/aucma-report/src/main/java/com/aucma/report/controller/PrintSupplementBarCodeController.java b/aucma-report/src/main/java/com/aucma/report/controller/PrintSupplementBarCodeController.java index 94b9b31..3d8911e 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/PrintSupplementBarCodeController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/PrintSupplementBarCodeController.java @@ -67,16 +67,6 @@ public class PrintSupplementBarCodeController extends BaseController { return success(printSupplementBarCodeService.selectPrintSupplementBarCodeByObjId(objId)); } - /** - * 新增补打条码记录 - */ - @PreAuthorize("@ss.hasPermi('report:supplementBarCode:add')") - @Log(title = "补打条码记录", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody PrintSupplementBarCode printSupplementBarCode) { - return toAjax(printSupplementBarCodeService.insertPrintSupplementBarCode(printSupplementBarCode)); - } - /** * 修改补打条码记录 */ diff --git a/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java b/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java index e4e32f4..f48cbd2 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/BoxTemperatureHistory.java @@ -181,6 +181,16 @@ public class BoxTemperatureHistory extends BaseEntity { @Excel(name = "供电频率") private Long frequency; + private String productLineCode; + + public String getProductLineCode() { + return productLineCode; + } + + public void setProductLineCode(String productLineCode) { + this.productLineCode = productLineCode; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/PerfusionRecord.java b/aucma-report/src/main/java/com/aucma/report/domain/PerfusionRecord.java index e700942..9f715ad 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/PerfusionRecord.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/PerfusionRecord.java @@ -3,6 +3,7 @@ package com.aucma.report.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.aucma.common.annotation.Excel; @@ -123,6 +124,20 @@ public class PerfusionRecord extends BaseEntity { @Excel(name = "灌注完成状态字") private String finishStatus; + /** + * 产线编号 + */ + @Excel(name = "产线编号") + private String PRODUCT_LINE_CODE; + + public String getPRODUCT_LINE_CODE() { + return PRODUCT_LINE_CODE; + } + + public void setPRODUCT_LINE_CODE(String PRODUCT_LINE_CODE) { + this.PRODUCT_LINE_CODE = PRODUCT_LINE_CODE; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/PrintSupplementBarCode.java b/aucma-report/src/main/java/com/aucma/report/domain/PrintSupplementBarCode.java index 35721df..1283444 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/PrintSupplementBarCode.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/PrintSupplementBarCode.java @@ -84,6 +84,16 @@ public class PrintSupplementBarCode extends BaseEntity { @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date recordTime; + private String productLineCode; + + public String getProductLineCode() { + return productLineCode; + } + + public void setProductLineCode(String productLineCode) { + this.productLineCode = productLineCode; + } + public Date getRecordTime() { return recordTime; } diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/PrintSupplementBarCodeMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/PrintSupplementBarCodeMapper.java index 2968196..58803d1 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/PrintSupplementBarCodeMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/PrintSupplementBarCodeMapper.java @@ -27,14 +27,6 @@ public interface PrintSupplementBarCodeMapper { */ public List selectPrintSupplementBarCodeList(PrintSupplementBarCode printSupplementBarCode); - /** - * 新增补打条码记录 - * - * @param printSupplementBarCode 补打条码记录 - * @return 结果 - */ - public int insertPrintSupplementBarCode(PrintSupplementBarCode printSupplementBarCode); - /** * 修改补打条码记录 * diff --git a/aucma-report/src/main/java/com/aucma/report/service/IPrintSupplementBarCodeService.java b/aucma-report/src/main/java/com/aucma/report/service/IPrintSupplementBarCodeService.java index 7029f00..6978f07 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IPrintSupplementBarCodeService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IPrintSupplementBarCodeService.java @@ -27,14 +27,6 @@ public interface IPrintSupplementBarCodeService { */ public List selectPrintSupplementBarCodeList(PrintSupplementBarCode printSupplementBarCode); - /** - * 新增补打条码记录 - * - * @param printSupplementBarCode 补打条码记录 - * @return 结果 - */ - public int insertPrintSupplementBarCode(PrintSupplementBarCode printSupplementBarCode); - /** * 修改补打条码记录 * diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/PrintSupplementBarCodeServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/PrintSupplementBarCodeServiceImpl.java index 2c22494..cf147c0 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/PrintSupplementBarCodeServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/PrintSupplementBarCodeServiceImpl.java @@ -41,17 +41,6 @@ public class PrintSupplementBarCodeServiceImpl implements IPrintSupplementBarCod return printSupplementBarCodeMapper.selectPrintSupplementBarCodeList(printSupplementBarCode); } - /** - * 新增补打条码记录 - * - * @param printSupplementBarCode 补打条码记录 - * @return 结果 - */ - @Override - public int insertPrintSupplementBarCode(PrintSupplementBarCode printSupplementBarCode) { - return printSupplementBarCodeMapper.insertPrintSupplementBarCode(printSupplementBarCode); - } - /** * 修改补打条码记录 * diff --git a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml index 7ffa3ca..c7fb059 100644 --- a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml @@ -33,6 +33,7 @@ + @@ -63,7 +64,8 @@ lowv_powerfact, lowvoltage, sync_datetime, - frequency + frequency, + PRODUCT_LINE_CODE from C##AUCMA_SCADA.box_temperaturehistory @@ -100,6 +102,7 @@ and lowvoltage = #{lowvoltage} and sync_datetime = #{syncDatetime} and frequency = #{frequency} + and PRODUCT_LINE_CODE = #{productLineCode} order by enddatetime DESC diff --git a/aucma-report/src/main/resources/mapper/report/PerfusionRecordMapper.xml b/aucma-report/src/main/resources/mapper/report/PerfusionRecordMapper.xml index d12c6d8..cfce608 100644 --- a/aucma-report/src/main/resources/mapper/report/PerfusionRecordMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/PerfusionRecordMapper.xml @@ -22,6 +22,7 @@ + @@ -41,7 +42,8 @@ updated_time, perfusion_result, yield, - finish_status + finish_status, + PRODUCT_LINE_CODE from perfusion_record @@ -65,6 +67,7 @@ and perfusion_r = #{perfusionR} and perfusion_l = #{perfusionL} + and PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE} and perfusion_duration = #{perfusionDuration} diff --git a/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml b/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml index b94e285..1f1c438 100644 --- a/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml @@ -17,6 +17,7 @@ + @@ -30,9 +31,11 @@ PS.print_reason, PS.record_time, PS.create_by, + PB.PRODUCT_LINE_CODE, 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 + LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = PS.MATERIAL_CODE @@ -65,38 +69,6 @@ where PS.obj_id = #{objId} - - - SELECT seq_print_supplementbarcode.NEXTVAL as objId FROM DUAL - - insert into print_supplementbarcode - - obj_id, - order_code, - material_code, - material_name, - material_barcode, - print_time, - print_bartype, - print_name, - is_print, - print_reason, - create_by, - - - #{objId}, - #{orderCode}, - #{materialCode}, - #{materialName}, - #{materialBarcode}, - #{printTime}, - #{printBartype}, - #{printName}, - #{isPrint}, - #{printReason}, - #{createBy}, - - update print_supplementbarcode diff --git a/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml b/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml index aeced3c..a05bb60 100644 --- a/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml @@ -177,6 +177,7 @@ #{MATERIAL_BARCODE}, #{PRINT_BARTYPE}, #{PRINT_NAME}, + #{print_reason} #{CREATE_BY},