增加成品物料模块

src/main/java/com/xujie/sys/modules/pms/controller/QcController.java

@@ -3,6 +3,7 @@ package com.xujie.sys.modules.pms.controller;
 import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.common.utils.R;
 import com.xujie.sys.modules.base.data.BuData;
+import com.xujie.sys.modules.orderIssure.entity.PartData;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.entity.QmsDataDictionaryData;
@@ -2156,6 +2157,116 @@ public class QcController {
         List<QmsDataDictionaryData> list = qcService.queryTemplateSortList(inData);
         return R.ok().put("rows", list).put("total", list.size());
     }
+
+    /**
+     * @Description 查询 成品物料模块 数据
+     * @Title queryEquipmentFolderLocationList
+     * @param inData
+     * @author zhb
+     * @date 2025/11/6
+     * @return R
+     * @throw
+     */
+    @PostMapping("/queryProductPartList")
+    @ResponseBody
+    public R queryProductPartList(@RequestBody ProductPartData inData){
+        List<ProductPartData> list = qcService.queryProductPartList(inData);
+        return R.ok().put("rows", list).put("total", list.size());
+    }
+    /**
+     * @Description 根据site bu partNo查询物料信息
+     * @Title queryEquipmentFolderLocationList
+     * @param inData
+     * @author zhb
+     * @date 2025/11/6
+     * @return R
+     * @throw
+     */
+    @PostMapping("/selectPartData")
+    @ResponseBody
+    public R selectPartData(@RequestBody ProductPartData inData){
+        List<PartData> list = qcService.selectPartData(inData);
+        return R.ok().put("rows", list).put("total", list.size());
+    }
+
+    /**
+     * @Description 根据site bu partNo查询物料信息
+     * @Title queryEquipmentFolderLocationList
+     * @param inData
+     * @author zhb
+     * @date 2025/11/6
+     * @return R
+     * @throw
+     */
+    @PostMapping("/saveProductPartData")
+    @ResponseBody
+    public R saveProductPartData(@RequestBody ProductPartData inData){
+        qcService.saveProductPartData(inData);
+        return R.ok();
+    }
+
+    /**
+     * @Description 根据site bu partNo查询物料信息
+     * @Title queryEquipmentFolderLocationList
+     * @param inData
+     * @author zhb
+     * @date 2025/11/6
+     * @return R
+     * @throw
+     */
+    @PostMapping("/updateProductPartData")
+    @ResponseBody
+    public R updateProductPartData(@RequestBody ProductPartData inData){
+        qcService.updateProductPartData(inData);
+        return R.ok();
+    }
+    /**
+     * @Description 根据site bu partNo查询物料信息
+     * @Title queryEquipmentFolderLocationList
+     * @param inData
+     * @author zhb
+     * @date 2025/11/6
+     * @return R
+     * @throw
+     */
+    @PostMapping("/deleteProductPartList")
+    @ResponseBody
+    public R deleteProductPartList(@RequestBody List<ProductPartData> inData){
+        qcService.deleteProductPartList(inData);
+        return R.ok();
+    }
+    /**
+     * @Description 查询人员权限
+     * @Title queryEquipmentFolderLocationList
+     * @param
+     * @author zhb
+     * @date 2025/11/6
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getButtonsPermission")
+    @ResponseBody
+    public R getButtonsPermission(@RequestBody EamAdminData inData){
+        //CRUD权限人员
+        List<EamAdminData> list1 = qcService.getButtonsPermission1();
+        if (list1.size()>0){
+            for (EamAdminData data: list1){
+                if (data.getAdminID().equals(inData.getAdminID())){
+                    return R.ok().put("flag","all");
+                }
+            }
+        }
+        // 查询导出 权限人员
+        List<EamAdminData> list2 = qcService.getButtonsPermission2();
+        if (list2.size()>0){
+            for (EamAdminData data: list2){
+                if (data.getAdminID().equals(inData.getAdminID())){
+                    return R.ok().put("flag","search");
+                }
+            }
+        }
+        return R.error();
+    }
 }
 
 

src/main/java/com/xujie/sys/modules/pms/data/ProductPartData.java

@@ -0,0 +1,26 @@
+package com.xujie.sys.modules.pms.data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class ProductPartData {
+    private Integer id;
+    private String bu;
+    private String site;
+    private String buNo;
+    private String buDesc;
+    private String partNo;
+    private String sku;
+    private String productDesc;
+    private String spec;
+    private Integer roll;
+    private String remark;
+    private String createBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+}

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -2,6 +2,7 @@ package com.xujie.sys.modules.pms.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xujie.sys.modules.orderIssure.entity.PartData;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.data.QcMasterInformationData;
@@ -657,4 +658,18 @@ public interface QcMapper {
     IPage<QcItemData> qcLcItemSearch(Page<QcItemData> qcItemDataPage,@Param("query") QcItemData data);
 
     IPage<QcTemplateData> templateSearch2(Page<QcTemplateData> qcTemplateDataPage,@Param("query") QcTemplateData data);
+
+    List<ProductPartData> queryProductPartList(ProductPartData inData);
+
+    List<PartData> selectPartData(ProductPartData inData);
+
+    void saveProductPartData(ProductPartData inData);
+
+    void updateProductPartData(ProductPartData inData);
+
+    void deleteProductPartList(ProductPartData data);
+
+    List<EamAdminData> getButtonsPermission1();
+
+    List<EamAdminData> getButtonsPermission2();
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -7,6 +7,7 @@ import com.xujie.sys.common.utils.DateUtils;
 import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.common.utils.R;
 import com.xujie.sys.common.utils.RandomUtil;
+import com.xujie.sys.modules.orderIssure.entity.PartData;
 import com.xujie.sys.modules.oss.dao.SysOssDao;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.oss.service.SysOssService;
@@ -3463,6 +3464,43 @@ public class QcServiceImpl implements QcService {
         return qcMapper.queryTemplateSortList(inData);
     }
 
+    @Override
+    public List<ProductPartData> queryProductPartList(ProductPartData inData) {
+        return qcMapper.queryProductPartList(inData);
+    }
+
+    @Override
+    public List<PartData> selectPartData(ProductPartData inData) {
+        return qcMapper.selectPartData(inData);
+    }
+
+    @Override
+    public void saveProductPartData(ProductPartData inData) {
+        qcMapper.saveProductPartData(inData);
+    }
+
+    @Override
+    public void updateProductPartData(ProductPartData inData) {
+        qcMapper.updateProductPartData(inData);
+    }
+
+    @Override
+    public void deleteProductPartList(List<ProductPartData> inData) {
+        for (ProductPartData data : inData){
+            qcMapper.deleteProductPartList(data);
+        }
+    }
+
+    @Override
+    public List<EamAdminData> getButtonsPermission1() {
+        return qcMapper.getButtonsPermission1();
+    }
+
+    @Override
+    public List<EamAdminData> getButtonsPermission2() {
+        return qcMapper.getButtonsPermission2();
+    }
+
     public void sendMailIQC(QcFAIRecordData data, String type) throws Exception {
         // 判断检验结论,不合格则发送邮件
         if ("不合格".equals(data.getInspectionResult())) {

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -2,6 +2,7 @@ package com.xujie.sys.modules.pms.service;
 
 import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.common.utils.R;
+import com.xujie.sys.modules.orderIssure.entity.PartData;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.pms.data.*;
 import com.xujie.sys.modules.pms.entity.QmsDataDictionaryData;
@@ -355,4 +356,18 @@ public interface QcService {
     void deleteEquipmentFolderLocationList(List<QCEquipmentFolderLocation> inData);
 
     List<QmsDataDictionaryData> queryTemplateSortList(QmsDataDictionaryData inData);
+
+    List<ProductPartData> queryProductPartList(ProductPartData inData);
+
+    List<PartData> selectPartData(ProductPartData inData);
+
+    void saveProductPartData(ProductPartData inData);
+
+    void updateProductPartData(ProductPartData inData);
+
+    void deleteProductPartList(List<ProductPartData> inData);
+
+    List<EamAdminData> getButtonsPermission1();
+
+    List<EamAdminData> getButtonsPermission2();
 }

src/main/resources/mapper/pms/QcMapper.xml

@@ -4051,6 +4051,10 @@
                 #{excelCompareFieldsX}, #{excelCompareFieldsY}, #{initialLine}, #{dataRow}, #{skipLine}, #{cuttingSymbol}, #{transparentFlag}, #{formulaCalculation},
                 #{formula}, #{groupCalculation}, #{regexp}, #{repairType}, #{buzzer}, #{createBy}, getDate())
     </insert>
+    <insert id="saveProductPartData">
+        insert into product_part(site,buNo,partNo,productDesc,sku,spec,roll,remark,createBy,createTime)
+        values(#{site},#{buNo},#{partNo},#{productDesc},#{sku},#{spec},#{roll},#{remark},#{createBy},GETDATE())
+    </insert>
 
     <select id="getInspectionTemplateDetail" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData" resultType="com.xujie.sys.modules.pms.data.QcInspectionStandardData">
         select
@@ -4273,6 +4277,9 @@
         delete from Equipment_folder_location
         where id = #{id}
     </delete>
+    <delete id="deleteProductPartList">
+        delete from product_part where id = #{id}
+    </delete>
 
     <select id="getQMSTask" resultType="com.xujie.sys.modules.pms.data.QmsTaskData">
         select
@@ -4471,6 +4478,42 @@
         </where>
         order by qt.create_time desc
     </select>
+    <select id="queryProductPartList" resultType="com.xujie.sys.modules.pms.data.ProductPartData">
+        select *,
+               dbo.get_bu_desc(site,buNo) as buDesc
+        from product_part
+        <where>
+            <if test=" bu != null and bu != '' ">
+                and site+'_'+buNo = #{bu}
+            </if>
+            <if test=" partNo != null and partNo != '' ">
+                and partNo = #{partNo}
+            </if>
+            <if test=" sku != null and sku != '' ">
+                and sku like '%'+#{sku}+'%'
+            </if>
+            <if test=" productDesc != null and productDesc != '' ">
+                and productDesc = #{productDesc}
+            </if>
+        </where>
+    </select>
+    <select id="selectPartData" resultType="com.xujie.sys.modules.orderIssure.entity.PartData">
+        select part_desc,sku from part where site = #{site} and part_no = #{partNo}
+    </select>
+    <select id="getButtonsPermission1" resultType="com.xujie.sys.modules.pms.data.EamAdminData">
+        SELECT username as adminID,user_display as adminName
+        from sys_user a
+                 LEFT JOIN sys_user_role b on a.user_id = b.user_id
+                 LEFT JOIN sys_role c on b.role_id = c.role_id
+        where c.role_name  = '成品物料模块-全部按钮权限'
+    </select>
+    <select id="getButtonsPermission2" resultType="com.xujie.sys.modules.pms.data.EamAdminData">
+        SELECT username as adminID,user_display as adminName
+        from sys_user a
+                 LEFT JOIN sys_user_role b on a.user_id = b.user_id
+                 LEFT JOIN sys_role c on b.role_id = c.role_id
+        where c.role_name  = '成品物料模块-查询导出权限'
+    </select>
     <update id="updateEquipmentFolderLocation">
         UPDATE Equipment_folder_location
         SET
@@ -4526,6 +4569,9 @@
         SET is_submit = 'Y'
         WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
     </update>
+    <update id="updateProductPartData">
+        update product_part set productDesc = #{productDesc},roll = #{roll},remark = #{remark} where id = #{id}
+    </update>
 </mapper>