bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-03-08 10:32:26 +08:00
parent 75332ddd6a 50874b9974
commit 22e961a6b1
13 changed files with 105 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
View File

@ -167,4 +167,4 @@ public class LeaseOutDetails implements Serializable {
private int preStoreNum;
/** 操作后库存 */
private int postStoreNum;
}
}

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
View File

@ -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;
}
@ApiModelProperty(value="租赁单价")
private BigDecimal leasePrice;
@ApiModelProperty(value="代替规格id")
private Integer replaceTypeId;
}

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -291,4 +291,10 @@ public class TmTask implements Serializable {
private String deviceCode; //like CSG-A101-2024061900001
@ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码")
private String intelligentCode;
}
/*
* 是否库存管理
* */
@ApiModelProperty(value = "是否库存管理1是库存管理")
private String isStorage;
}

17
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java
View File

@ -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;
}

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java
View File

@ -86,4 +86,16 @@ public class ReturnOfMaterialsInfo {
@ApiModelProperty(value = "关键字")
private String keyWord;
/*
* 是否以大代小
* */
@ApiModelProperty(value = "是否以大代小1是可以")
private String isReplace;
/*
* 是否库存管理
* */
@ApiModelProperty(value = "是否库存管理1是库存管理")
private String isStorage;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TreeNode.java
View File

@ -36,6 +36,8 @@ public class TreeNode {
private String manageType;
private String isReplace;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<TreeNode> children = new ArrayList<>();
}

26
sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml
View File

@ -19,12 +19,12 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
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
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
select
<include refid="Base_Column_List" />
from lease_apply_details
where id = #{id,jdbcType=INTEGER}
@ -117,14 +117,14 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into lease_apply_details (parennt_id, type_id, pre_num,
al_num, `status`, create_by,
create_time, update_by, update_time,
remark, company_id)
values (#{parenntId,jdbcType=INTEGER}, #{typeId,jdbcType=INTEGER}, #{preNum,jdbcType=FLOAT},
#{alNum,jdbcType=FLOAT}, #{status,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
insert into lease_apply_details (parennt_id, type_id, pre_num,
al_num, `status`, create_by,
create_time, update_by, update_time,
remark, company_id,type_name,model_name,lease_price,replace_type_id)
values (#{parenntId,jdbcType=INTEGER}, #{typeId,jdbcType=INTEGER}, #{preNum,jdbcType=FLOAT},
#{alNum,jdbcType=FLOAT}, #{status,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
NOW(), #{updateBy,jdbcType=VARCHAR}, NOW(),
#{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER})
#{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},#{typeName},#{typeModelName},#{leasePrice},#{replaceTypeId})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true">
<!--@mbg.generated-->
@ -400,7 +400,7 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into lease_apply_details
(parennt_id, type_id, pre_num, al_num, `status`, create_by, create_time, update_by,
(parennt_id, type_id, pre_num, al_num, `status`, create_by, create_time, update_by,
update_time, remark, company_id)
values
<foreach collection="list" item="item" separator=",">
@ -447,7 +447,7 @@
#{remark,jdbcType=VARCHAR},
#{companyId,jdbcType=INTEGER},
</trim>
on duplicate key update
on duplicate key update
<trim suffixOverrides=",">
<if test="id != null">
id = #{id,jdbcType=INTEGER},
@ -545,7 +545,7 @@
#{companyId,jdbcType=INTEGER},
</if>
</trim>
on duplicate key update
on duplicate key update
<trim suffixOverrides=",">
<if test="id != null">
id = #{id,jdbcType=INTEGER},
@ -595,4 +595,4 @@
where tta.agreement_id = #{agreementId} and lad.`status` = '2'
group by lad.type_id
</select>
</mapper>
</mapper>

26
sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
View File

@ -242,6 +242,18 @@
<if test="carCode!= null">
car_code,
</if>
<if test="typeName!= null">
type_name,
</if>
<if test="modelName!= null">
model_name,
</if>
<if test="leasePrice!= null">
lease_price,
</if>
<if test="replaceTypeId!= null">
replace_type_id,
</if>
create_time,
update_time
</trim>
@ -276,6 +288,18 @@
<if test="carCode!= null">
#{carCode},
</if>
<if test="typeName!= null">
#{typeName},
</if>
<if test="model_name!= null">
#{model_name},
</if>
<if test="leasePrice!= null">
#{leasePrice},
</if>
<if test="replaceTypeId!= null">
#{replaceTypeId},
</if>
NOW(),
NOW()
</trim>
@ -483,4 +507,4 @@
parennt_id = #{record.parentId}
AND type_id = #{record.typeId}
</select>
</mapper>
</mapper>

3
sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -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

2
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -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

17
sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml
View File

@ -40,9 +40,10 @@
</insert>
<insert id="insert">
<foreach item="item" index="index" collection="wholeList" separator=";">
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
<foreach item="item" index="index" collection="wholeList" separator=",">
(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1)
</foreach>
</insert>
<update id="updateMaType">
@ -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 @@
<select id="selectAllTypeId" resultType="com.bonus.sgzb.material.domain.MaWhole">
select type_id from ma_whole_set
</select>
</mapper>
</mapper>

7
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml
View File

@ -46,8 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getInfoListByType" resultType="com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo">
SELECT type_id as typeId,code,model_code as modelCode,type_name as typeName FROM `ma_type`
WHERE `level` = #{level} and parent_id = #{parentId}
SELECT type_id as typeId,code,model_code as modelCode,type_name as typeName,is_replace as isReplace,is_storage as isStorage
FROM `ma_type`
WHERE `level` = #{level} and parent_id = #{parentId} and del_flag ='0'
</select>
<select id="getMaTypeList" resultType="com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo">
SELECT mt.type_id as typeId,mt.type_name as typeName ,mt.manage_type FROM `ma_type` mt
@ -56,4 +57,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY mt.type_id
</select>
</mapper>
</mapper>

5
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml
View File

@ -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
</select>
</mapper>
</mapper>