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

machine库存查询修改

This commit is contained in:
liang.chao 2024-08-21 11:20:27 +08:00
parent 2edf5af00b
commit 0a01e46d18
6 changed files with 28 additions and 13 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

@ -176,6 +176,8 @@ public class LeaseOutDetails implements Serializable {
@ApiModelProperty(value = "数量出库 -> 操作前库存量")
private Integer num;
/** 操作前库存 */
private int preStoreNum;
/** 操作后库存 */
private int postStoreNum;

4
sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java
View File

@ -309,7 +309,7 @@ public class LogAspect
bmStorageLog.setTaskId(String.valueOf(lod.getTaskId()));
bmStorageLog.setTypeId(lod.getTypeId());
bmStorageLog.setTypeName(lod.getMaCode());
bmStorageLog.setPreStoreNum(lod.getNum());
bmStorageLog.setPreStoreNum(lod.getPreStoreNum());
bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue());
bmStorageLog.setPostStoreNum(lod.getPostStoreNum());
bmStorageLogList.add(bmStorageLog);
@ -321,7 +321,7 @@ public class LogAspect
bmStorageLog.setTaskId(String.valueOf(lod.getTaskId()));
bmStorageLog.setTypeId(lod.getTypeId());
bmStorageLog.setTypeName(lod.getMaCode());
bmStorageLog.setPreStoreNum(lod.getNum());
bmStorageLog.setPreStoreNum(lod.getPreStoreNum());
bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue());
bmStorageLog.setPostStoreNum(lod.getPostStoreNum());
bmStorageLogList.add(bmStorageLog);

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -154,19 +154,20 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
try {
// 1、判断是否重复提交
res = checkRepeatSubmit(record);
record.setPreStoreNum(getStorageNum(record));
if (res > 0) {
if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) {
record.setOutNum(record.getInputNum().doubleValue());
}
//2、判断成套机具出库库存是否足够
if (record.getManageType() == 2) {
/* if (record.getManageType() == 2) {
res = checkStorageNumCt(record);
if (res == 0) {
throw new RuntimeException("出库失败,库存不足");
}
} else {
} else {*/
res = checkStorageNum(record);
}
// }
if (res > 0) {
// 3、插入出库记录，修改库存，修改机具状态

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -353,7 +353,7 @@ public class TmTaskServiceImpl implements TmTaskService {
List<TmTask> leaseDetailByParentId = tmTaskMapper.getLeaseDetailByParentId(record);
return leaseDetailByParentId;
}
/* for (TmTask tmTask : leaseDetailByParentId) {
/* for (TmTask tmTask : leaseDetailByParentId) {
if ("2".equals(tmTask.getManageType())) {
List<TmTask> manageTypeByTypeId = tmTaskMapper.getManageTypeByTypeId(tmTask);
// 目前先默认成套只能数量出库或编码出库

22
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -648,14 +648,28 @@
WHEN mt.manage_type = '0' THEN
'编号' ELSE '计数'
END manageTypeName,
mt.num,
CASE mt.manage_type
WHEN 0 THEN
IFNULL(subquery0.num, 0)
ELSE
IFNULL(mt.num, 0)
END as num,
(lad.pre_num -IF( lad.al_num IS NULL, '0', lad.al_num )) AS outNum,
mm.ma_code AS maCode
subquery0.ma_code AS maCode
FROM
lease_apply_details lad
LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
LEFT JOIN (SELECT mt.type_id,
mt2.type_name AS typeName,
mt.type_name AS typeModelName,
mm.ma_code,
count(mm.ma_id) num
FROM ma_machine mm
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_code is not null and mm.ma_status in (15)
GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id
WHERE
lad.parennt_id = #{record.id}
GROUP BY
@ -1115,7 +1129,6 @@
mt2.type_name as typeName,
mt.type_name as typeModelName,
mt.manage_type as manageType,
mt.num as num,
GROUP_CONCAT(su.user_id) as userId,
GROUP_CONCAT(su.nick_name) as userName,
lad.status as status,
@ -1300,7 +1313,6 @@
mt2.type_name as typeName,
mt.type_name as typeModelName,
mt.manage_type as manageType,
mt.num as num,
GROUP_CONCAT(su.nick_name) as userName,
GROUP_CONCAT(su.user_id) as userId,
lad.status as status,

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
View File

@ -117,8 +117,8 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
mapper.updateMaTypeNum(dto.getTypeId(), num);
if (Objects.equals("0", dto.getType())) {
// 查询机具状态-在库的id、管理方式为编号的需更新机具设备的机具状态
int dicId = mapper.getDicByMaStatusId("ma_status", "在库");
mapper.updateMaMachineStatus(dicId, dto.getMaId());
// int dicId = mapper.getDicByMaStatusId("ma_status", "在库");
mapper.updateMaMachineStatus(15, dto.getMaId());
}
}
}