From d32777e7ea9c58ce4aa75367b167f511f7d99a11 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Wed, 25 Sep 2024 15:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEBU=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/entity/PartInformationEntity.java | 6 ++++++ .../project/data/PlmProjectInfoData.java | 11 +---------- .../project/entity/PlmProjectPart.java | 19 +++++++++++++++++++ src/main/resources/mapper/base/BaseMapper.xml | 4 ---- .../mapper/part/PartInformationMapper.xml | 8 +++++--- .../resources/mapper/project/ProjectDao.xml | 19 ++++++++++--------- 6 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java index e535888f..2bf1c94f 100644 --- a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java +++ b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java @@ -370,4 +370,10 @@ public class PartInformationEntity extends QueryPage implements Serializable { */ @TableField(exist = false) private String partNoSource; + + /*2024-09-25 LR 新增项目物料的 BU字段*/ + @TableField(exist = false) + private String buNo; + @TableField(exist = false) + private String buDesc; } diff --git a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java index a35f6391..1118cef3 100644 --- a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java +++ b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java @@ -7,7 +7,7 @@ import org.apache.ibatis.type.Alias; import java.util.List; @Alias("PlmProjectInfoData") -public class PlmProjectInfoData extends PlmProjectInfo{ +public class PlmProjectInfoData extends PlmProjectInfo { private String projectType; private String projectManagerName; @@ -18,7 +18,6 @@ public class PlmProjectInfoData extends PlmProjectInfo{ private String finalCustomerName; private String priorityDesc; private String type; - private String buDesc; private String userRoleName; private List projectManagerList; private List projectOwnerList; @@ -148,14 +147,6 @@ public class PlmProjectInfoData extends PlmProjectInfo{ this.userName = userName; } - public String getBuDesc() { - return buDesc; - } - - public void setBuDesc(String buDesc) { - this.buDesc = buDesc; - } - public String getFinalCustomerName() { return finalCustomerName; } diff --git a/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java b/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java index b0912925..b37e4b7c 100644 --- a/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java +++ b/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java @@ -87,6 +87,9 @@ public class PlmProjectPart extends QueryPage { // 含税单价 private BigDecimal taxUnitPrice; + //项目物料新增Bu 2024-09-25 + private String buNo; + private String buDesc; public BigDecimal getUnitPrice() { return unitPrice; @@ -263,5 +266,21 @@ public class PlmProjectPart extends QueryPage { public void setProductGroupId2(String productGroupId2) { this.productGroupId2 = productGroupId2; } + + public String getBuNo() { + return buNo; + } + + public void setBuNo(String buNo) { + this.buNo = buNo; + } + + public String getBuDesc() { + return buDesc; + } + + public void setBuDesc(String buDesc) { + this.buDesc = buDesc; + } } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index e09e48b1..4c6b5442 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -184,10 +184,8 @@ ,isnull(c.updateFlag,'N') updateFlag,isnull(c.downFlag,'N') downFlag,isnull(c.deleteFlag,'N') deleteFlag,#{username} as username from plm_project_info a left join AccessSite b on a.site=b.site left join AccessProject c on a.project_id=c.project_id and c.site=#{site} and c.username=#{username} - left join AccessBu d on a.bu_NO=D.bu_NO AND D.site=#{site} and b.UserID=#{username} - and D.username=#{username} and a.site=#{site} order by a.project_id desc @@ -275,8 +273,6 @@ @@ -122,16 +121,16 @@ insert into plm_project_info (project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by, - create_date,priority,site,project_desc,customer_remark,remark,need_date,bu_no,parent_project_no,final_customer_id) values + create_date,priority,site,project_desc,customer_remark,remark,need_date,parent_project_no,final_customer_id) values (#{projectId},#{projectId},#{projectTypeDb},#{projectName},#{status},#{projectSource},#{customerId}, - #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{buNo},#{parentProjectNo} + #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{parentProjectNo} ,#{finalCustomerId}) update plm_project_info set project_type_db=#{projectTypeDb},project_name=#{projectName},project_source=#{projectSource},status=#{status}, customer_id=#{customerId},priority=#{priority},project_desc=#{projectDesc},customer_remark=#{customerRemark},remark=#{remark},need_date=#{needDate}, - update_by=#{updateBy},update_date=GetDate(),bu_no=#{buNo},parent_project_no = #{parentProjectNo},final_customer_id=#{finalCustomerId} + update_by=#{updateBy},update_date=GetDate(),parent_project_no = #{parentProjectNo},final_customer_id=#{finalCustomerId} where id=#{id} @@ -281,7 +280,9 @@ a.final_part_no, a.part_no_source, a.unit_price, - a.tax_unit_price + a.tax_unit_price, + a.bu_no, + dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc from plm_project_part as a LEFT JOIN part as b on a.site = b.site and a.test_part_no = b.part_no left join plm_project_info as c on a.site = c.site and a.project_id = c.project_id @@ -473,7 +474,7 @@