Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-back

aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java

@@ -84,14 +84,18 @@ public class PdaApiController {
         for (int i = 0; i < size; i++) {
             ReportQualityInspection inspection = new ReportQualityInspection();
             inspection.setBarCode(checkInfo.getCode());
-//            inspection.setMaterialName(boxName);
-            inspection.setTreatmentMeasure(checkInfo.getMeasure());
-            inspection.setProcessResult(checkInfo.getMeasureName());
-
+            inspection.setMaterialName(checkInfo.getName());
+            String measure = checkInfo.getMeasure();
+            inspection.setTreatmentMeasure(measure);
+            if (measure.equals("3")){ inspection.setIsFlag(1L);}
+            //检测人
             inspection.setInspectorCode(checkInfo.getUserName());
             inspection.setInspectorTime(new Date());
+            inspection.setStationCode(checkInfo.getStationCode());
             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());

aucma-api/src/main/java/com/aucma/api/domain/dto/CheckInfoDto.java

@@ -8,28 +8,18 @@ import java.util.List;
  */
 public class CheckInfoDto {
     private String code;//产品条码
-
+    private String name;//产品型号
+    private String measure;//处置措施 3=放行,1=返修
     private List<DefectBeen> list;//缺陷列表
-    private String measure;//处理措施TREATMENT_MEASURE
-    private String measureName;//处理措施TREATMENT_MEASURE
-    private String offline;
-     private String processCode;
+    private String stationCode;
     private String userName;
 
-    public String getProcessCode() {
-        return processCode;
-    }
-
-    public void setProcessCode(String processCode) {
-        this.processCode = processCode;
-    }
-
-    public String getUserName() {
-        return userName;
+    public String getMeasure() {
+        return measure;
     }
 
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public void setMeasure(String measure) {
+        this.measure = measure;
     }
 
     public String getCode() {
@@ -40,12 +30,12 @@ public class CheckInfoDto {
         this.code = code;
     }
 
-    public String getMeasureName() {
-        return measureName;
+    public String getName() {
+        return name;
     }
 
-    public void setMeasureName(String measureName) {
-        this.measureName = measureName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public List<DefectBeen> getList() {
@@ -56,32 +46,43 @@ public class CheckInfoDto {
         this.list = list;
     }
 
-    public String getMeasure() {
-        return measure;
+    public String getStationCode() {
+        return stationCode;
     }
 
-    public void setMeasure(String measure) {
-        this.measure = measure;
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
     }
 
-    public String getOffline() {
-        return offline;
+    public String getUserName() {
+        return userName;
     }
 
-    public void setOffline(String offline) {
-        this.offline = offline;
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 
-
     public static class DefectBeen {
+        private int objId;
         private String qualityDefectCode;
         private String qualityDefectName;
-
         private String stationCode;
 
         public DefectBeen() {
         }
 
+        public int getObjId() {
+            return objId;
+        }
+
+        public void setObjId(int objId) {
+            this.objId = objId;
+        }
+
+        public void setStationCode(String stationCode) {
+            this.stationCode = stationCode;
+        }
+
         public String getQualityDefectCode() {
             return qualityDefectCode;
         }

aucma-api/src/main/resources/mapper/PdaBindingMapper.xml

@@ -51,11 +51,12 @@
     <select id="checkSelectRepairInfo" resultMap="com.aucma.report.mapper.ReportQualityInspectionMapper.ReportQualityInspectionResult">
         select OBJ_ID,
                MATERIAL_NAME,
+               TEST_ITEM_CODE as STATION_CODE,
                QUALITY_DEFECT_CODE,
                QUALITY_DEFECT_NAME
         from AUCMA_MES.REPORT_QUALITY_INSPECTION
         where BAR_CODE = #{code}
-          and IS_FLAG = 1
+          and IS_FLAG = 1 and IS_FLAG=1
     </select>
 
 </mapper>

aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java

@@ -119,6 +119,9 @@ public class ReportQualityInspection extends BaseEntity {
      */
     @Excel(name = "更新人")
     private String updatedBy;
+    //新增字段
+    private String stationCode;
+    private int submitQualtyId;
 
     /**
      * 更新时间
@@ -139,6 +142,14 @@ public class ReportQualityInspection extends BaseEntity {
         this.barCode = barCode;
     }
 
+    public int getSubmitQualtyId() {
+        return submitQualtyId;
+    }
+
+    public void setSubmitQualtyId(int submitQualtyId) {
+        this.submitQualtyId = submitQualtyId;
+    }
+
     public String getBarCode() {
         return barCode;
     }
@@ -147,6 +158,14 @@ public class ReportQualityInspection extends BaseEntity {
         this.materialName = materialName;
     }
 
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
     public String getMaterialName() {
         return materialName;
     }

aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml

@@ -23,6 +23,8 @@
         <result property="isFlag" column="is_flag"/>
         <result property="updatedBy" column="updated_by"/>
         <result property="updatedTime" column="updated_time"/>
+        <result property="stationCode" column="STATION_CODE"/>
+        <result property="submitQualtyId" column="SUBMINT_QUALTY_ID"/>
     </resultMap>
 
     <sql id="selectReportQualityInspectionVo">
@@ -108,6 +110,9 @@
             <if test="isFlag != null">is_flag,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
+            <if test="updatedTime != null">updated_time,</if>
+            <if test="stationCode != null">STATION_CODE,</if>
+            <if test="submitQualtyId != null">SUBMINT_QUALTY_ID,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="objId != null">#{objId},</if>
@@ -128,6 +133,8 @@
             <if test="isFlag != null">#{isFlag},</if>
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="stationCode != null">#{stationCode},</if>
+            <if test="submitQualtyId != null">#{submitQualtyId},</if>
         </trim>
     </insert>