From 6c5a14c811b3977600864199991b03f041d7a027 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Fri, 7 Mar 2025 11:05:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A5=E5=A4=A7=E4=BB=A3=E5=B0=8F?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8F=92=E5=85=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseOutDetails.java | 2 +- .../sgzb/app/domain/LeaseApplyDetails.java | 9 ++++++- .../bonus/sgzb/material/domain/TreeNode.java | 2 ++ .../mapper/app/LeaseApplyDetailsMapper.xml | 26 +++++++++---------- .../mapper/app/LeaseOutDetailsMapper.xml | 26 ++++++++++++++++++- .../mapper/material/SelectMapper.xml | 5 ++-- 6 files changed, 52 insertions(+), 18 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index 8cbede7..1fa585d 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -167,4 +167,4 @@ public class LeaseOutDetails implements Serializable { private int preStoreNum; /** 操作后库存 */ private int postStoreNum; -} \ No newline at end of file +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index b886051..f949c02 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -8,6 +8,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -173,4 +174,10 @@ public class LeaseApplyDetails implements Serializable { private String maStatus; @ApiModelProperty(value="预领数量-已领数量的差值") private Integer nums; -} \ No newline at end of file + + @ApiModelProperty(value="租赁单价") + private BigDecimal leasePrice; + + @ApiModelProperty(value="代替规格id") + private Integer replaceTypeId; +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TreeNode.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TreeNode.java index b5f0b67..20e79de 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TreeNode.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TreeNode.java @@ -36,6 +36,8 @@ public class TreeNode { private String manageType; + private String isReplace; + @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children = new ArrayList<>(); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml index 7207223..95be6f0 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml @@ -19,12 +19,12 @@ - id, parennt_id, type_id, pre_num, al_num, `status`, create_by, create_time, update_by, + id, parennt_id, type_id, pre_num, al_num, `status`, create_by, create_time, update_by, update_time, remark, company_id - \ No newline at end of file + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index f1a04c7..608e286 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -242,6 +242,18 @@ car_code, + + type_name, + + + model_name, + + + lease_price, + + + replace_type_id, + create_time, update_time @@ -276,6 +288,18 @@ #{carCode}, + + #{typeName}, + + + #{model_name}, + + + #{leasePrice}, + + + #{replaceTypeId}, + NOW(), NOW() @@ -483,4 +507,4 @@ parennt_id = #{record.parentId} AND type_id = #{record.typeId} - \ No newline at end of file + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml index 5d9068b..139d2ac 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml @@ -111,7 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(mt.num, 0) END as num, mt.model_code AS modelCode, - mt.manage_type AS manageType + mt.manage_type AS manageType, + mt.is_replace as isReplace FROM ma_type mt left join (SELECT mt.type_id, mt2.type_name AS typeName, @@ -228,4 +229,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join bm_unit_info bui on slc.unit_id = bui.unit_id - \ No newline at end of file + From 50874b99742ca26bca846a008921f488ae47cb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 7 Mar 2025 18:13:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=90=E5=A5=97=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/app/domain/TmTask.java | 8 +++++++- .../bonus/sgzb/material/domain/MaWholeVo.java | 17 +++++++++++++++++ .../material/domain/ReturnOfMaterialsInfo.java | 12 ++++++++++++ .../main/resources/mapper/app/TmTaskMapper.xml | 3 ++- .../mapper/base/MaMachineTypeMapper.xml | 2 +- .../mapper/material/MaWholeSetMapper.xml | 17 ++++++++++------- .../material/ReturnOfMaterialsInfoMapper.xml | 7 ++++--- 7 files changed, 53 insertions(+), 13 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index bcd98fd..edbbe30 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -291,4 +291,10 @@ public class TmTask implements Serializable { private String deviceCode; //like CSG-A101-2024061900001 @ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码") private String intelligentCode; -} \ No newline at end of file + + /* + * 是否库存管理 + * */ + @ApiModelProperty(value = "是否库存管理1是库存管理") + private String isStorage; +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java index cac4e24..f2cee15 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java @@ -62,4 +62,21 @@ public class MaWholeVo { /** 库存数量 */ @ApiModelProperty(value = "库存数量") private Integer num; + + /* + * 是否库存管理 + * */ + @ApiModelProperty(value = "是否库存管理1是库存管理") + private String isStorage; + + /** + * 第一级id + */ + @ApiModelProperty(value = "第一级id") + private Integer oneId; + /** + * 第二级id + */ + @ApiModelProperty(value = "第二级id") + private Integer towId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java index 5d0f095..1b70238 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java @@ -86,4 +86,16 @@ public class ReturnOfMaterialsInfo { @ApiModelProperty(value = "关键字") private String keyWord; + /* + * 是否以大代小 + * */ + @ApiModelProperty(value = "是否以大代小1是可以") + private String isReplace; + + /* + * 是否库存管理 + * */ + @ApiModelProperty(value = "是否库存管理1是库存管理") + private String isStorage; + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml index cf31d7b..143db5b 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1081,7 +1081,8 @@ mt.manage_type as manageType, mt.num as num, su.nick_name as userName, - lad.type_id as typeId + lad.type_id as typeId, + mt.is_storage as isStorage FROM lease_apply_details lad LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml index 800b3ed..0d28245 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -354,7 +354,7 @@ m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl, mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId, su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time, - m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code + m.remark, m.company_id,m.fac_model as facModel,m.is_replace, m.is_storage, m.intelligent_code from ma_type m left join ma_prop_set mps on m.type_id = mps.type_id left join ma_prop_info mpi on mps.prop_id = mpi.prop_id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml index 0cb1dcc..1c35e02 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml @@ -40,9 +40,10 @@ - - insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status) - values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1) + insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status) + values + + (#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1) @@ -71,13 +72,14 @@ SUM(CASE WHEN mws.ascription_type = 2 THEN 1 ELSE 0 END) AS totalNum, mt2.type_name AS typeName, mt.type_name AS typeModelName, - su.nick_name AS nickName + su.nick_name AS nickName, + mt3.type_id AS oneId, + mt2.type_id AS towId FROM ma_whole_set mws JOIN sys_user su ON su.user_id = mws.create_by JOIN ma_type mt ON mws.parent_id = mt.type_id JOIN ma_type mt2 ON mt2.type_id = mt.parent_id JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id - JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id WHERE mt.`status` = '0' AND mt.del_flag = '0' @@ -108,7 +110,8 @@ END as num, case when mws.ascription_type = 1 then '主体设备' else '配套设备' end as deviceAscription, mws.ascription_type as ascriptionType, - mws.part_num AS deviceNum + mws.part_num AS deviceNum, + mt.is_storage AS isStorage FROM ma_whole_set mws JOIN ma_type mt ON mws.type_id = mt.type_id @@ -209,4 +212,4 @@ - \ No newline at end of file + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml index cad47a1..64671a9 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml @@ -46,8 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file +