From 2d896e54142a43e6a0ed0d654bf04b2473423128 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Wed, 13 Dec 2023 15:48:20 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E8=B4=A8=E6=A3=80=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=8F=AD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aucma-admin/src/main/resources/application.yml | 4 ++-- .../aucma/api/controller/PdaApiController.java | 6 ++++-- .../com/aucma/api/domain/dto/CheckInfoDto.java | 10 +++++++++- .../com/aucma/api/mapper/PdaBindingMapper.java | 6 ++++-- .../main/resources/mapper/PdaBindingMapper.xml | 16 ++++++++-------- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/aucma-admin/src/main/resources/application.yml b/aucma-admin/src/main/resources/application.yml index a2807ec..ca7a1ee 100644 --- a/aucma-admin/src/main/resources/application.yml +++ b/aucma-admin/src/main/resources/application.yml @@ -23,8 +23,8 @@ spring: basename: i18n/messages # 运行环境 profiles: - active: local -# active: dev +# active: local + active: dev # active: prod 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 7fef004..fad7e96 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 @@ -68,8 +68,8 @@ public class PdaApiController { public AjaxResult checkSelect(String code) { String boxName = service.selectBoxNameByCode(code); if (boxName == null) { - boxName = "固定数据"; -// return error("箱壳条码扫描错误"); + // boxName = "固定数据"; + return error("箱壳条码扫描错误"); } List list = service.checkSelectRepairInfo(code); return success(boxName, list); @@ -92,11 +92,13 @@ public class PdaApiController { inspection.setInspectorCode(checkInfo.getUserName()); inspection.setInspectorTime(new Date()); inspection.setStationCode(checkInfo.getStationCode()); + inspection.setGroupCode(checkInfo.getTeamName()); assert list != null; if (!list.isEmpty()) { CheckInfoDto.DefectBeen defectBeen = list.get(i); inspection.setSubmitQualtyId(defectBeen.getObjId()); inspection.setTestItemCode(list.get(i).getStationCode()); + inspection.setQualityDefectCode(list.get(i).getQualityDefectCode()); inspection.setQualityDefectName(list.get(i).getQualityDefectName()); } diff --git a/aucma-api/src/main/java/com/aucma/api/domain/dto/CheckInfoDto.java b/aucma-api/src/main/java/com/aucma/api/domain/dto/CheckInfoDto.java index a5f0fdf..5dab844 100644 --- a/aucma-api/src/main/java/com/aucma/api/domain/dto/CheckInfoDto.java +++ b/aucma-api/src/main/java/com/aucma/api/domain/dto/CheckInfoDto.java @@ -13,11 +13,19 @@ public class CheckInfoDto { private List list;//缺陷列表 private String stationCode; private String userName; - + private String teamName; public String getMeasure() { return measure; } + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + public void setMeasure(String measure) { this.measure = measure; } 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 16a9732..a527ba4 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 @@ -1,6 +1,8 @@ package com.aucma.api.mapper; import com.aucma.api.domain.dto.RepairSubmitInfoDto; +import com.aucma.common.annotation.DataSource; +import com.aucma.common.enums.DataSourceType; import com.aucma.report.domain.ReportQualityInspection; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -14,13 +16,13 @@ import java.util.List; @Repository public interface PdaBindingMapper { String selectBoxNameByCode(String boxCode); - + @DataSource(value = DataSourceType.SLAVE) int insertBindingInfo(@Param("boxCode") String boxCode, @Param("boxName") String boxName, @Param("innerCode")String innerCode); int countQualityRecordByCode(String code); - + @DataSource(value = DataSourceType.SLAVE) int updateCodeBinding(@Param("boxCode") String boxCode, @Param("innerCode")String innerCode); int submitRepair(@Param("info")RepairSubmitInfoDto info); diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml index 8cec07e..eea4f06 100644 --- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml +++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml @@ -6,15 +6,15 @@ - INSERT INTO AUCMA_SCADA.CODE_BINDING(OBJ_ID, BOX_CODE, BOX_NAME, LINER_CODE, BINDING_RESULT, RECORD_TIME1) - VALUES (AUCMA_SCADA.SEQ_CODE_BINDING.nextval, #{boxCode}, #{boxName}, #{innerCode}, '成功', SYSDATE) + INSERT INTO CODE_BINDING(OBJ_ID, BOX_CODE, BOX_NAME, LINER_CODE, BINDING_RESULT, RECORD_TIME1) + VALUES (SEQ_CODE_BINDING.nextval, #{boxCode}, #{boxName}, #{innerCode}, '成功', SYSDATE) - UPDATE AUCMA_SCADA.CODE_BINDING + UPDATE CODE_BINDING SET PRODUCT_CODE = #{innerCode}, BINDING_RESULT = '成功',RECORD_TIME2 = SYSDATE,IS_PASS= 1 where BOX_CODE = #{boxCode} @@ -22,11 +22,11 @@ - UPDATE AUCMA_MES.REPORT_QUALITY_INSPECTION + UPDATE REPORT_QUALITY_INSPECTION SET PROCESS_RESULT = #{info.repairName}, REWORK_NUMBER = 1, FINISH_TIME = sysdate, @@ -44,7 +44,7 @@ MATERIAL_NAME, QUALITY_DEFECT_CODE, QUALITY_DEFECT_NAME - from AUCMA_MES.REPORT_QUALITY_INSPECTION + from REPORT_QUALITY_INSPECTION where BAR_CODE = #{code} and IS_FLAG is null @@ -54,7 +54,7 @@ TEST_ITEM_CODE as STATION_CODE, QUALITY_DEFECT_CODE, QUALITY_DEFECT_NAME - from AUCMA_MES.REPORT_QUALITY_INSPECTION + from REPORT_QUALITY_INSPECTION where BAR_CODE = #{code} and IS_FLAG = 1 and IS_FLAG=1