From b6b5a3a4740b7e624844fb4db9200f969ec655be Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 5 Jan 2024 08:56:51 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=A1=B5=E9=9D=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/BaseDeviceLedgerMapper.xml    |  1 +
 .../mapper/base/BaseProcessStationMapper.xml  |  3 +-
 .../base/StationDefectRelationMapper.xml      |  1 +
 .../service/impl/BaseBomInfoServiceImpl.java  |  4 +-
 .../impl/ProductPlanInfoServiceImpl.java      |  2 +-
 .../mapper/production/BaseBomInfoMapper.xml   | 21 +++--
 .../domain/ReportQualityInspection.java       | 46 +++++++++-
 .../service/IProductionReportService.java     |  7 ++
 .../mapper/report/BasePdaRecordMapper.xml     |  1 +
 .../report/ReportQualityInspectionMapper.xml  | 85 +++++++++++--------
 .../report/ReportRepairMeasuresMapper.xml     |  2 +-
 11 files changed, 121 insertions(+), 52 deletions(-)

diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
index 8692444..ddce671 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
@@ -67,6 +67,7 @@
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        order by device_code
     </select>
 
     <select id="selectBaseDeviceLedgerByObjId" parameterType="Long" resultMap="BaseDeviceLedgerResult">
diff --git a/aucma-base/src/main/resources/mapper/base/BaseProcessStationMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseProcessStationMapper.xml
index 148a83e..5fee1a6 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseProcessStationMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseProcessStationMapper.xml
@@ -73,7 +73,8 @@
             <if test="createdTime != null ">and created_time = #{createdTime}</if>
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
-            <if test="parentId != null  and parentId != ''">and bps.parent_id = #{parentId}</if>
+            <if test="parentId != null  and parentId != ''">and bps.parent_id like concat(concat('%',
+                #{parentId}), '%')</if>
         </where>
     </select>
 
diff --git a/aucma-base/src/main/resources/mapper/base/StationDefectRelationMapper.xml b/aucma-base/src/main/resources/mapper/base/StationDefectRelationMapper.xml
index 1473779..4bac4e0 100644
--- a/aucma-base/src/main/resources/mapper/base/StationDefectRelationMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/StationDefectRelationMapper.xml
@@ -53,6 +53,7 @@
                         <if test="updatedBy != null  and updatedBy != ''"> and  sdr.updated_by = #{updatedBy}</if>
                         <if test="updatedTime != null "> and  sdr.updated_time = #{updatedTime}</if>
         </where>
+        order by sdr.station_code, sdr.defect_code
     </select>
 
     <select id="selectStationDefectRelationByObjId" parameterType="Long" resultMap="StationDefectRelationResult">
diff --git a/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java b/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
index 1372617..472ef37 100644
--- a/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
+++ b/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
@@ -109,8 +109,8 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
      */
     public BaseBomInfo recursionSelectBaseBomInfoList(BaseBomInfo baseBomInfo) {
         BaseBomInfo info = new BaseBomInfo();
-        info.setAncestors(baseBomInfo.getMaterialCode());
-        info.setMaterialType(MaterialConstants.COAMING_MATERIAL_TYPE);
+        info.setMaterialCode(baseBomInfo.getMaterialCode());
+        info.setIsPlanToStation(0L);
         List<BaseBomInfo> baseBomInfos = baseBomInfoMapper.selectBaseBomInfoList(info);
         if (baseBomInfos.size() >= 1) {
             baseBomInfo.setIsPlanToStation(0L);
diff --git a/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java b/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
index e6de127..36c2c10 100644
--- a/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
+++ b/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
@@ -123,7 +123,7 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService {
         }
         //获取生产BOM信息
         BaseBomInfo bomInfo = new BaseBomInfo();
-        bomInfo.setAncestors(baseOrderInfo.getMaterialCode());
+        bomInfo.setMaterialCode(baseOrderInfo.getMaterialCode());
         bomInfo.setIsPlanToStation(0L);
         List<BaseBomInfo> baseBomInfoList = baseBomInfoService.selectBaseBomInfoList(bomInfo);
         //检查生产BOM是否满足下计划条件
diff --git a/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml b/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml
index 5529d48..8ec4444 100644
--- a/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml
+++ b/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml
@@ -71,15 +71,20 @@
             <if test="ancestors != null  and ancestors != ''">and bb.ancestors like concat(concat('%', #{ancestors}),
                 '%')
             </if>
-            <if test="isPlanToStation != null and isPlanToStation == 0L">  AND bb.MATERIAL_CODE IN (SELECT ANCESTORS
-                FROM base_bominfo
-                WHERE MATERIAL_TYPE = 400
-                GROUP BY ANCESTORS)
+            <if test="isPlanToStation != null and isPlanToStation == 0L">  AND bb.MATERIAL_CODE IN (SELECT b1.MATERIAL_CODE
+                FROM base_bominfo b1
+                left join base_bominfo b2 on b2.PARENT_ID = b1.MATERIAL_CODE and b2.MATERIAL_TYPE = 200
+                left join base_bominfo b3 on b3.PARENT_ID = b2.MATERIAL_CODE and b3.MATERIAL_TYPE = 400
+                WHERE b1.MATERIAL_TYPE = 100
+                AND b3.MATERIAL_NAME IS NOT NULL
+                )
             </if>
-            <if test="isPlanToStation != null and isPlanToStation == 1L">  AND bb.MATERIAL_CODE NOT IN (SELECT ANCESTORS
-                FROM base_bominfo
-                WHERE MATERIAL_TYPE = 400
-                GROUP BY ANCESTORS)
+            <if test="isPlanToStation != null and isPlanToStation == 1L">  AND bb.MATERIAL_CODE IN (SELECT b1.MATERIAL_CODE
+                FROM base_bominfo b1
+                left join base_bominfo b2 on b2.PARENT_ID = b1.MATERIAL_CODE and b2.MATERIAL_TYPE = 200
+                left join base_bominfo b3 on b3.PARENT_ID = b2.MATERIAL_CODE and b3.MATERIAL_TYPE = 400
+                WHERE b1.MATERIAL_TYPE = 100
+                AND b3.MATERIAL_NAME IS NULL)
             </if>
         </where>
         order by bb.material_type, bb.created_time desc
diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
index 979ccad..36973ab 100644
--- a/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
+++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
@@ -40,6 +40,12 @@ public class ReportQualityInspection extends BaseEntity {
     @Excel(name = "工序编号")
     private String processCode;
 
+    /**
+     * 工序名称
+     */
+    @Excel(name = "工序名称")
+    private String processName;
+
     /**
      * 检测项编号
      */
@@ -83,11 +89,23 @@ public class ReportQualityInspection extends BaseEntity {
     private String groupCode;
 
     /**
-     * 检测人员
+     * 班组名称
+     */
+    @Excel(name = "班组名称")
+    private String groupName;
+
+    /**
+     * 检测人员编号
      */
-    @Excel(name = "检测人员")
+    @Excel(name = "检测人员编号")
     private String inspectorCode;
 
+    /**
+     * 检测人员名称
+     */
+    @Excel(name = "检测人员名称")
+    private String inspectorName;
+
     /**
      * 检测时间
      */
@@ -130,6 +148,30 @@ public class ReportQualityInspection extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getInspectorName() {
+        return inspectorName;
+    }
+
+    public void setInspectorName(String inspectorName) {
+        this.inspectorName = inspectorName;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }
diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
index ea179ac..136f2b7 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
@@ -42,4 +42,11 @@ public interface IProductionReportService
      * @return
      */
     List<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap);
+
+    /**
+     * 发泡注料记录报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap);
 }
diff --git a/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml b/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml
index 18c11ec..8d69904 100644
--- a/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml
@@ -43,6 +43,7 @@
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        order by pda_name
     </select>
 
     <select id="selectBasePdaRecordByObjId" parameterType="Long" resultMap="BasePdaRecordResult">
diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
index 88f3914..9e756d4 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
@@ -26,65 +26,76 @@
         <result property="stationCode" column="STATION_CODE"/>
         <result property="submitQualtyId" column="SUBMINT_QUALTY_ID"/>
         <result property="productLineName" column="PRODUCT_LINE_NAME"/>
+        <result property="processName" column="processName"/>
+        <result property="groupName" column="groupName"/>
+        <result property="inspectorName" column="inspectorName"/>
     </resultMap>
 
     <sql id="selectReportQualityInspectionVo">
-        select obj_id,
-               bar_code,
-               material_name,
-               process_code,
-               test_item_code,
-               quality_defect_code,
-               quality_defect_name,
-               treatment_measure,
-               process_result,
-               is_lower_line,
-               group_code,
-               inspector_code,
-               inspector_time,
-               rework_number,
-               finish_time,
-               is_flag,
-               updated_by,
-               updated_time
-        from report_quality_inspection
+        select rqi.obj_id,
+               rqi.bar_code,
+               rqi.material_name,
+               rqi.process_code,
+               bps.PROCESS_NAME     processName,
+               rqi.test_item_code,
+               pl.PRODUCT_LINE_NAME PRODUCT_LINE_NAME,
+               rqi.quality_defect_code,
+               rqi.quality_defect_name,
+               rqi.treatment_measure,
+               rqi.process_result,
+               rqi.is_lower_line,
+               rqi.group_code,
+               btm.TEAM_NAME        groupName,
+               rqi.inspector_code,
+               su.NICK_NAME         inspectorName,
+               rqi.inspector_time,
+               rqi.rework_number,
+               rqi.finish_time,
+               rqi.is_flag,
+               rqi.updated_by,
+               rqi.updated_time
+        from report_quality_inspection rqi
+                 left join BASE_PROCESS_STATION bps on bps.PROCESS_CODE = rqi.PROCESS_CODE
+                 left join BASE_TEAMMEMBERS btm on btm.TEAM_CODE = rqi.group_code
+                 left join SYS_USER su on su.USER_NAME = rqi.inspector_code
+                 left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = rqi.STATION_CODE
     </sql>
 
     <select id="selectReportQualityInspectionList" parameterType="ReportQualityInspection"
             resultMap="ReportQualityInspectionResult">
         <include refid="selectReportQualityInspectionVo"/>
         <where>
-            <if test="barCode != null  and barCode != ''">and bar_code = #{barCode}</if>
-            <if test="materialName != null  and materialName != ''">and material_name like concat(concat('%',
+            <if test="barCode != null  and barCode != ''">and rqi.bar_code = #{barCode}</if>
+            <if test="materialName != null  and materialName != ''">and rqi.material_name like concat(concat('%',
                 #{materialName}), '%')
             </if>
-            <if test="processCode != null  and processCode != ''">and process_code = #{processCode}</if>
-            <if test="testItemCode != null  and testItemCode != ''">and test_item_code = #{testItemCode}</if>
-            <if test="qualityDefectCode != null  and qualityDefectCode != ''">and quality_defect_code =
+            <if test="processCode != null  and processCode != ''">and rqi.process_code = #{processCode}</if>
+            <if test="testItemCode != null  and testItemCode != ''">and rqi.test_item_code = #{testItemCode}</if>
+            <if test="qualityDefectCode != null  and qualityDefectCode != ''">and rqi.quality_defect_code =
                 #{qualityDefectCode}
             </if>
-            <if test="qualityDefectName != null  and qualityDefectName != ''">and quality_defect_name like
+            <if test="qualityDefectName != null  and qualityDefectName != ''">and rqi.quality_defect_name like
                 concat(concat('%', #{qualityDefectName}), '%')
             </if>
-            <if test="treatmentMeasure != null  and treatmentMeasure != ''">and treatment_measure =
+            <if test="treatmentMeasure != null  and treatmentMeasure != ''">and rqi.treatment_measure =
                 #{treatmentMeasure}
             </if>
-            <if test="processResult != null  and processResult != ''">and process_result = #{processResult}</if>
-            <if test="isLowerLine != null  and isLowerLine != ''">and is_lower_line = #{isLowerLine}</if>
-            <if test="groupCode != null  and groupCode != ''">and group_code = #{groupCode}</if>
-            <if test="inspectorCode != null  and inspectorCode != ''">and inspector_code = #{inspectorCode}</if>
-            <if test="inspectorTime != null ">and inspector_time = #{inspectorTime}</if>
-            <if test="reworkNumber != null ">and rework_number = #{reworkNumber}</if>
-            <if test="finishTime != null ">and finish_time = #{finishTime}</if>
-            <if test="isFlag != null ">and is_flag = #{isFlag}</if>
-            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
+            <if test="processResult != null  and processResult != ''">and rqi.process_result = #{processResult}</if>
+            <if test="isLowerLine != null  and isLowerLine != ''">and rqi.is_lower_line = #{isLowerLine}</if>
+            <if test="groupCode != null  and groupCode != ''">and rqi.group_code = #{groupCode}</if>
+            <if test="inspectorCode != null  and inspectorCode != ''">and rqi.inspector_code = #{inspectorCode}</if>
+            <if test="inspectorTime != null ">and rqi.inspector_time = #{inspectorTime}</if>
+            <if test="reworkNumber != null ">and rqi.rework_number = #{reworkNumber}</if>
+            <if test="finishTime != null ">and rqi.finish_time = #{finishTime}</if>
+            <if test="isFlag != null ">and rqi.is_flag = #{isFlag}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and rqi.updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and rqi.updated_time = #{updatedTime}</if>
         </where>
     </select>
 
     <select id="selectReportQualityInspectionByObjId" parameterType="Long" resultMap="ReportQualityInspectionResult">
         <include refid="selectReportQualityInspectionVo"/>
-        where obj_id = #{objId}
+        where rqi.obj_id = #{objId}
     </select>
 
     <insert id="insertReportQualityInspection" parameterType="ReportQualityInspection">
diff --git a/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml
index dbae48d..d08e692 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml
@@ -45,7 +45,7 @@
             <if test="createdTime != null ">and created_time = #{createdTime}</if>
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
-            <if test="userPermission != null  and userPermission != '2'">and user_permission = #{userPermission}</if>
+            <if test="userPermission != null ">and #{userPermission} >= user_permission</if>
         </where>
         order by repair_code
     </select>