From 877ac2150b230dfc0a962d8d78a29889e4472a3e Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 26 Sep 2024 13:53:23 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=AE=B1=E4=BD=93=E6=B5=81?= =?UTF-8?q?=E8=BD=AC=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=86=85=E8=83=86=E7=A0=81=E6=98=BE=E7=A4=BA=E3=80=81=E7=AE=B1?= =?UTF-8?q?=E4=BD=93=E5=8F=91=E6=B3=A1=E6=A3=80=E9=AA=8C=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=AF=B9=E5=A3=B3=E8=83=86=E7=BB=91=E5=AE=9A=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E6=89=93=E6=9D=A1=E7=A0=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BA=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/PdaApiController.java | 7 +++++ .../aucma/api/mapper/PdaBindingMapper.java | 2 +- .../aucma/api/service/IPdaBindingService.java | 7 +++++ .../api/service/impl/PdaServiceImpl.java | 19 ++++++++++++++ .../resources/mapper/PdaBindingMapper.xml | 14 ++++++++++ .../domain/BoxTurnoverTraceabilityReport.java | 15 +++++++++++ .../impl/RecordSwitchOrderServiceImpl.java | 1 + .../ReportQualityInspectionServiceImpl.java | 2 +- .../mapper/report/GeneralReportMapper.xml | 26 ++++++++++++------- .../report/PrintSupplementBarCodeMapper.xml | 4 +++ .../mapper/report/RecordSwitchOrderMapper.xml | 3 ++- 11 files changed, 87 insertions(+), 13 deletions(-) diff --git a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java index 0f9dc8a..96abd80 100644 --- a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java +++ b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java @@ -101,6 +101,13 @@ public class PdaApiController { } //检验前一工位是否已完成质检 if (StringUtils.isNotEmpty(station)){ + //箱体发泡检验01工位 对 壳胆绑定进行验证 + if (station.equals("2003")){ + String result = service.checkShellBinding(code, station); + if (StringUtils.isNotNull(result)){ + return error(result); + } + } String result = qualityService.checkBeforeStationInspection(code, station); if (StringUtils.isNotNull(result)){ return error(result); diff --git a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java index e2ae92d..7433307 100644 --- a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java +++ b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java @@ -78,5 +78,5 @@ public interface PdaBindingMapper { @DataSource(value = DataSourceType.SLAVE) int insertCodeBinding(@Param("boxCode") String boxCode); - + List> checkShellBinding(@Param("boxCode") String boxCode); } diff --git a/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java b/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java index d8f7b10..1d754af 100644 --- a/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java +++ b/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java @@ -76,4 +76,11 @@ public interface IPdaBindingService { */ List selectExceptionProcessList(String inspectionUserFlag); + /** + * 箱体发泡检验01工位 对 壳胆绑定进行验证 + * @param code + * @param station + * @return + */ + String checkShellBinding(String code, String station); } diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java index 6f4563f..258c604 100644 --- a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java +++ b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java @@ -18,6 +18,8 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; +import static com.aucma.common.utils.SecurityUtils.getUsername; + /** * @author wanghao * @date 2023/11/14 9:56 @@ -152,6 +154,7 @@ public class PdaServiceImpl implements IPdaBindingService { // 维护条码补打记录表 for (HashMap map : barcodeList) { map.put("print_reason", printReason); + map.put("CREATE_BY", getUsername()); } mapper.printSupplementBarcode(barcodeList.get(0)); } @@ -243,4 +246,20 @@ public class PdaServiceImpl implements IPdaBindingService { return recordExceptionProcessService.selectRecordExceptionProcessList(process); } + /** + * 箱体发泡检验01工位 对 壳胆绑定进行验证 + * @param code + * @param station + * @return + */ + @Override + public String checkShellBinding(String code, String station) { + String result = null; + List> mapList = mapper.checkShellBinding(code); + if (mapList.size() == 0){ + result = "该箱体未绑定内胆码！"; + } + return result; + } + } diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml index 54916c1..3ba125b 100644 --- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml +++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml @@ -121,6 +121,18 @@ AND rep.QUALITY_MANAGER_TIME > (SYSDATE - 5.25) AND (rep.INSPECTION_USER_CODE IS NULL OR rep.INSPECTION_USER_CODE NOT LIKE '%' || #{userName} || '%') + @@ -140,6 +152,7 @@ PRINT_BARTYPE, PRINT_NAME, print_reason, + CREATE_BY, #{ORDER_CODE}, @@ -149,6 +162,7 @@ #{PRINT_BARTYPE}, #{PRINT_NAME}, #{print_reason}, + #{CREATE_BY}, diff --git a/aucma-report/src/main/java/com/aucma/report/domain/BoxTurnoverTraceabilityReport.java b/aucma-report/src/main/java/com/aucma/report/domain/BoxTurnoverTraceabilityReport.java index c825265..b3f512d 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/BoxTurnoverTraceabilityReport.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/BoxTurnoverTraceabilityReport.java @@ -77,6 +77,13 @@ public class BoxTurnoverTraceabilityReport extends BaseEntity { @JsonProperty("BOX_CODE") private String BOX_CODE; + /** + * 内胆码 + */ + @Excel(name = "内胆码") + @JsonProperty("LINER_CODE") + private String LINER_CODE; + /** * MES码打印时间 */ @@ -85,6 +92,14 @@ public class BoxTurnoverTraceabilityReport extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String PRINT_TIME; + public String getLINER_CODE() { + return LINER_CODE; + } + + public void setLINER_CODE(String LINER_CODE) { + this.LINER_CODE = LINER_CODE; + } + public String getPRODUCT_LINE_CODE() { return PRODUCT_LINE_CODE; } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordSwitchOrderServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordSwitchOrderServiceImpl.java index ffe8f58..1af9cb7 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordSwitchOrderServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordSwitchOrderServiceImpl.java @@ -98,6 +98,7 @@ public class RecordSwitchOrderServiceImpl implements IRecordSwitchOrderService { // 维护条码补打记录表 for (HashMap map : barcodeList) { map.put("print_reason", "切换订单"); + map.put("CREATE_BY", getUsername()); } recordSwitchOrderMapper.printSupplementBarcode(barcodeList.get(0)); } catch (Exception e) { diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java index a6cc00b..9210ab4 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java @@ -139,7 +139,7 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect markLocation = i; } } - if (markLocation <= 2){ + if (markLocation <= 1){ return null; } BaseProductLine productLineInfo = productLineList.get(markLocation - 1); diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 0413411..dd3ea3e 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -520,13 +520,14 @@