From 64f1765ae582fa26919c6858fc5cb6ef7843cf1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Fri, 7 Nov 2025 09:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E5=93=81=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/QcController.java | 111 ++++++++++++++++++ .../sys/modules/pms/data/ProductPartData.java | 26 ++++ .../sys/modules/pms/mapper/QcMapper.java | 15 +++ .../pms/service/Impl/QcServiceImpl.java | 38 ++++++ .../sys/modules/pms/service/QcService.java | 15 +++ src/main/resources/mapper/pms/QcMapper.xml | 46 ++++++++ 6 files changed, 251 insertions(+) create mode 100644 src/main/java/com/xujie/sys/modules/pms/data/ProductPartData.java diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index 825915de..c56cf0b1 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/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 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 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 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 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 list1 = qcService.getButtonsPermission1(); + if (list1.size()>0){ + for (EamAdminData data: list1){ + if (data.getAdminID().equals(inData.getAdminID())){ + return R.ok().put("flag","all"); + } + } + } + // 查询导出 权限人员 + List 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(); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProductPartData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProductPartData.java new file mode 100644 index 00000000..0572d7f9 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 946b499c..28e05168 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/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 qcLcItemSearch(Page qcItemDataPage,@Param("query") QcItemData data); IPage templateSearch2(Page qcTemplateDataPage,@Param("query") QcTemplateData data); + + List queryProductPartList(ProductPartData inData); + + List selectPartData(ProductPartData inData); + + void saveProductPartData(ProductPartData inData); + + void updateProductPartData(ProductPartData inData); + + void deleteProductPartList(ProductPartData data); + + List getButtonsPermission1(); + + List getButtonsPermission2(); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 79a3218a..23175e89 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/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 queryProductPartList(ProductPartData inData) { + return qcMapper.queryProductPartList(inData); + } + + @Override + public List 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 inData) { + for (ProductPartData data : inData){ + qcMapper.deleteProductPartList(data); + } + } + + @Override + public List getButtonsPermission1() { + return qcMapper.getButtonsPermission1(); + } + + @Override + public List getButtonsPermission2() { + return qcMapper.getButtonsPermission2(); + } + public void sendMailIQC(QcFAIRecordData data, String type) throws Exception { // 判断检验结论,不合格则发送邮件 if ("不合格".equals(data.getInspectionResult())) { diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index 62236cc2..efd6e864 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/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 inData); List queryTemplateSortList(QmsDataDictionaryData inData); + + List queryProductPartList(ProductPartData inData); + + List selectPartData(ProductPartData inData); + + void saveProductPartData(ProductPartData inData); + + void updateProductPartData(ProductPartData inData); + + void deleteProductPartList(List inData); + + List getButtonsPermission1(); + + List getButtonsPermission2(); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index d19b3804..4a9fd451 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/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 into product_part(site,buNo,partNo,productDesc,sku,spec,roll,remark,createBy,createTime) + values(#{site},#{buNo},#{partNo},#{productDesc},#{sku},#{spec},#{roll},#{remark},#{createBy},GETDATE()) + select @@ -4471,6 +4478,42 @@ order by qt.create_time desc + + + + 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 product_part set productDesc = #{productDesc},roll = #{roll},remark = #{remark} where id = #{id} +