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

二级库功能开发，nacos密码添加

This commit is contained in:
liang.chao 2025-01-15 19:21:09 +08:00
parent c9e9b5a003
commit 5181105c74
10 changed files with 234 additions and 69 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/MaMachine.java
View File

@ -74,6 +74,7 @@ public class MaMachine extends BaseEntity {
private String typeName;
private String manageType;
private String nuitName;
private String groupName;
private Integer receiveNum;
private String maIds;
private Integer id;
@ -251,6 +252,7 @@ public class MaMachine extends BaseEntity {
* 退料工程
*/
private String backPro;
private String name;
/**
* 退料时间
*/

8
sgzb-auth/src/main/resources/bootstrap-sgzb_cq_dev.yml
View File

@ -4,17 +4,21 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
username: nacos
password: nacos
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
username: nacos
password: nacos
onlineApprove: /lbcloud-oauth/oauth/token
wechatAppId: crhmaxnE

10
sgzb-gateway/src/main/resources/bootstrap-sgzb_cq_dev.yml
View File

@ -17,17 +17,21 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
username: nacos
password: nacos
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
username: nacos
password: nacos
sentinel:
# 取消控制台懒加载
eager: true
@ -38,7 +42,7 @@ spring:
datasource:
ds1:
nacos:
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
dataId: sentinel-sgzb-gateway
groupId: DEFAULT_GROUP
data-type: json

19
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java
View File

@ -62,6 +62,7 @@ public class SecondaryWarehouseController extends BaseController {
List<TeamGroup> list = service.listTeamGroup(bean);
return AjaxResult.success(getDataTable(list));
}
@ApiOperation(value = "新增班组")
@PostMapping("/addTeamGroup")
public AjaxResult addTeamGroup(@RequestBody TeamGroup bean) {
@ -78,6 +79,7 @@ public class SecondaryWarehouseController extends BaseController {
List<SecondaryWarehouse> list = service.getList(bean);
return getDataTable(list);
}
@ApiOperation(value = "获取二级库（在用、在库）编码机具")
@GetMapping("/getMaStatusByMaId")
public TableDataInfo getMaStatusByMaId(SecondaryWarehouse bean) {
@ -85,11 +87,18 @@ public class SecondaryWarehouseController extends BaseController {
List<MaMachine> list = service.getMaStatusByMaId(bean);
return getDataTable(list);
}
/* @ApiOperation(value = "获取二级库（在用、在库）数量机具")
@GetMapping("/getDevCount")
public Integer getDevCount(SecondaryWarehouse bean) {
return service.getDevCount(bean);
}*/
/* @ApiOperation(value = "获取二级库（在用、在库）数量机具")
@GetMapping("/getDevCount")
public Integer getDevCount(SecondaryWarehouse bean) {
return service.getDevCount(bean);
}*/
@ApiOperation(value = "班组库存台账")
@GetMapping("/getDevStockCount")
public TableDataInfo getDevStockCount(SecondaryWarehouse bean) {
startPage();
return getDataTable(service.getDevStockCount(bean));
}
/**
* 二级库导出

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java
View File

@ -77,4 +77,6 @@ public interface SecondaryWarehouseMapper {
Integer deleteOutNum(TeamLeaseInfo teamLeaseInfo);
Integer selectParentId(TeamLeaseInfo teamLeaseInfo);
List<MaMachine> getDevStockCount(SecondaryWarehouse bean);
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SecondaryWarehouseService.java
View File

@ -40,4 +40,6 @@ public interface SecondaryWarehouseService {
List<MaMachine> getMaStatusByMaId(SecondaryWarehouse bean);
Integer getDevCount(SecondaryWarehouse bean);
List<MaMachine> getDevStockCount(SecondaryWarehouse bean);
}

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java
View File

@ -147,6 +147,11 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService
return mapper.getDevCount(bean);
}
@Override
public List<MaMachine> getDevStockCount(SecondaryWarehouse bean) {
return mapper.getDevStockCount(bean);
}
@Override
public List<SecondaryWarehouse> getList(SecondaryWarehouse bean) {
bean.setLeaseType(1);

8
sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cq_dev.yml
View File

@ -15,17 +15,21 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
username: nacos
password: nacos
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
username: nacos
password: nacos
# 多站点特殊配置
sgzb:

239
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml
View File

@ -388,63 +388,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where ma_id = #{maId}
</select>
<select id="getUseMaStatusByMaId" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
SELECT DISTINCT
mt.type_name modelName,
mt.manage_type manageType,
mt2.type_name typeName,
rd.type_id typeId,
rd.parent_id as id,
mt.unit_name AS nuitName,
SUM( rd.out_num ) receiveNum,
GROUP_CONCAT( rd.ma_id ) maIds
WITH type_counts AS (
SELECT
rd.ma_id,
SUM(CASE WHEN rd.type = '1' THEN 1 ELSE 0 END) as type1_count,
SUM(CASE WHEN rd.type = '2' THEN 1 ELSE 0 END) as type2_count
FROM
receive_detail rd
LEFT JOIN ma_machine mm ON rd.ma_id = mm.ma_id
LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
receive_detail rd
WHERE
rd.type IN ( '1', '2' )
AND mm.ma_status = 132
AND rd.team_group_id = #{teamGroupId}
AND rd.unit_id = #{unitId}
AND NOT EXISTS (
SELECT
1
FROM
receive_detail rd2
WHERE
rd2.ma_id = rd.ma_id
AND ((
rd2.type = '1'
AND EXISTS (
SELECT
1
FROM
receive_detail rd3
WHERE
rd3.ma_id = rd.ma_id
AND rd3.type = '2'
AND rd3.type_id = rd2.type_id
AND rd3.team_group_id = rd2.team_group_id
AND rd3.unit_id = rd2.unit_id
))
OR (
rd2.type = '2'
AND EXISTS (
SELECT
1
FROM
receive_detail rd4
WHERE
rd4.ma_id = rd.ma_id
AND rd4.type = '1'
AND rd4.type_id = rd2.type_id
AND rd4.team_group_id = rd2.team_group_id
AND rd4.unit_id = rd2.unit_id
)))
)
rd.type IN ('1', '2')
AND rd.team_group_id = #{teamGroupId}
AND rd.unit_id = #{unitId}
GROUP BY
rd.type_id UNION
rd.ma_id
),
ranked_details AS (
SELECT
rd.*,
tc.type1_count,
tc.type2_count,
ROW_NUMBER() OVER (PARTITION BY rd.ma_id, rd.type ORDER BY rd.out_num DESC) as rn
FROM
receive_detail rd
JOIN
type_counts tc ON rd.ma_id = tc.ma_id
WHERE
rd.type IN ('1', '2')
AND rd.team_group_id = #{teamGroupId}
AND rd.unit_id = #{unitId}
)
SELECT DISTINCT
mt.type_name modelName,
mt.manage_type manageType,
mt2.type_name typeName,
rd.type_id typeId,
rd.parent_id as id,
mt.unit_name AS nuitName,
SUM(rd.out_num) receiveNum,
GROUP_CONCAT(rd.ma_id) maIds
FROM
ranked_details rd
LEFT JOIN
ma_machine mm ON rd.ma_id = mm.ma_id
LEFT JOIN
ma_type mt ON mt.type_id = mm.type_id
LEFT JOIN
ma_type mt2 ON mt2.type_id = mt.parent_id
WHERE
mm.ma_status = 132
AND ((rd.type = '1' AND rd.rn &lt;= GREATEST(0, rd.type1_count - rd.type2_count))
OR (rd.type = '2' AND rd.rn &lt;= GREATEST(0, rd.type2_count - rd.type1_count)))
GROUP BY
rd.type_id, rd.parent_id UNION
SELECT DISTINCT
mt.type_name modelName,
mt.manage_type manageType,
@ -501,7 +496,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)))
)
GROUP BY
rd.type_id
rd.type_id, rd.parent_id
</select>
<select id="getDevCount" resultType="java.lang.Integer">
SELECT
@ -516,6 +511,140 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM lease_out_details
WHERE id = #{id}
</select>
<select id="getDevStockCount" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
WITH type_counts AS (
SELECT
rd.ma_id,
SUM( CASE WHEN rd.type = '1' THEN 1 ELSE 0 END ) AS type1_count,
SUM( CASE WHEN rd.type = '2' THEN 1 ELSE 0 END ) AS type2_count
FROM
receive_detail rd
WHERE
rd.type IN ( '1', '2' )
<if test="unitId != null">
AND rd.unit_id = #{unitId}
</if>
GROUP BY
rd.ma_id
),
ranked_details AS (
SELECT
rd.*,
tc.type1_count,
tc.type2_count,
ROW_NUMBER() OVER ( PARTITION BY rd.ma_id, rd.type ORDER BY rd.out_num DESC ) AS rn
FROM
receive_detail rd
JOIN type_counts tc ON rd.ma_id = tc.ma_id
WHERE
rd.type IN ( '1', '2' )
<if test="unitId != null">
AND rd.unit_id = #{unitId}
</if>
) SELECT DISTINCT
mt.type_name modelName,
mt.manage_type manageType,
mt2.type_name typeName,
rd.type_id typeId,
tg.NAME groupName,
rd.parent_id AS id,
slc.name as name,
mt.unit_name AS unitName,
SUM( rd.out_num ) receiveNum,
GROUP_CONCAT( rd.ma_id ) maIds
FROM
ranked_details rd
LEFT JOIN team_group tg ON rd.team_group_id = tg.id
left join second_lot_config slc on rd.unit_id = slc.unit_id
LEFT JOIN ma_machine mm ON rd.ma_id = mm.ma_id
LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
WHERE
mm.ma_status = 132
<if test="keyword != null and keyword != ''">
AND tg.NAME like concat('%', #{keyword}, '%')
</if>
AND ((
rd.type = '1'
AND rd.rn &lt;= GREATEST( 0, rd.type1_count - rd.type2_count ))
OR (
rd.type = '2'
AND rd.rn &lt;= GREATEST( 0, rd.type2_count - rd.type1_count )))
GROUP BY
rd.type_id,
rd.parent_id
union
SELECT DISTINCT
mt.type_name modelName,
mt.manage_type manageType,
mt2.type_name typeName,
rd.type_id typeId,
tg.NAME groupName,
rd.parent_id as id,
slc.name as name,
mt.unit_name AS nuitName,
(SUM(CASE WHEN rd.type = '1' THEN rd.out_num ELSE 0 END)
- SUM(CASE WHEN rd.type = '2' THEN rd.out_num ELSE 0 END)) AS receiveNum,
GROUP_CONCAT( rd.ma_id ) maIds
FROM
receive_detail rd
LEFT JOIN team_group tg ON rd.team_group_id = tg.id
left join second_lot_config slc on rd.unit_id = slc.unit_id
LEFT JOIN ma_type mt ON mt.type_id = rd.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
WHERE
rd.type IN ( '1', '2' )
AND rd.ma_id IS NULL
<if test="keyword != null and keyword != ''">
AND tg.NAME like concat('%', #{keyword}, '%')
</if>
<if test="unitId != null">
AND rd.unit_id = #{unitId}
</if>
AND NOT EXISTS (
SELECT
1
FROM
receive_detail rd2
WHERE
rd2.ma_id = rd.ma_id
AND ((
rd2.type = '1'
AND EXISTS (
SELECT
1
FROM
receive_detail rd3
WHERE
rd3.ma_id = rd.ma_id
AND rd3.type = '2'
AND rd3.type_id = rd2.type_id
AND rd3.team_group_id = rd2.team_group_id
AND rd3.unit_id = rd2.unit_id
))
OR (
rd2.type = '2'
AND EXISTS (
SELECT
1
FROM
receive_detail rd4
WHERE
rd4.ma_id = rd.ma_id
AND rd4.type = '1'
AND rd4.type_id = rd2.type_id
AND rd4.team_group_id = rd2.team_group_id
AND rd4.unit_id = rd2.unit_id
)))
)
GROUP BY
rd.type_id, rd.parent_id
</select>
<insert id="addConfig">
insert into second_lot_config (name,unit_id,creater,create_time)

8
sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_cq_dev.yml
View File

@ -15,17 +15,21 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
username: nacos
password: nacos
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 192.168.0.16:18848
namespace: sgzb_cqjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
username: nacos
password: nacos
#腾讯云sms
tencent:
sms: