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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-07-01 17:12:46 +08:00
parent 1a9cf0b609 a1669a3e08
commit c28056e68c
18 changed files with 118 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,33 +203,33 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
// 首先更新领料任务详情表的领料数及状态（lease_apply_details）
res = leaseOutDetailsMapper.updateLeaseApplyDetailsOutNum(record);
LeaseApplyDetails leaseApplyDetails = leaseOutDetailsMapper.getLeaseApplyDetails(record);
if (leaseApplyDetails.getPreNum().equals(leaseApplyDetails.getAlNum()) || leaseApplyDetails.getAuditNum().equals(leaseApplyDetails.getAlNum())){
if (leaseApplyDetails.getPreNum().equals(leaseApplyDetails.getAlNum()) || leaseApplyDetails.getAuditNum().equals(leaseApplyDetails.getAlNum())) {
leaseOutDetailsMapper.updateLeaseApplyDetails(record);
}
if (res > 0) {
// 插入领料出库明细表（lease_out_details）
res = leaseOutDetailsMapper.insertSelective(record);
if (res > 0) {
// 插入领料出库明细表（lease_out_details）
res = leaseOutDetailsMapper.insertSelective(record);
if (res > 0) {
if (record.getManageType() == 2) {
// 成套机具减少 (ma_type 设备规格表)的库存数量
res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
// 成套机具减少 (ma_type 设备规格表)配件的库存数量
List<TmTask> typeIds = leaseOutDetailsMapper.getMaTypeDetails(record);
typeIds.removeIf(item -> item == null);
for (TmTask typeId : typeIds) {
MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId);
machinePart.setPartNum((typeId.getPartNum() * record.getOutNum()));
typeId.setNum(machinePart.getNum() - machinePart.getPartNum());
res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId);
}
} else {
// 普通机具减少 (ma_type 设备规格表)的库存数量
res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
if (record.getManageType() == 2) {
// 成套机具减少 (ma_type 设备规格表)的库存数量
res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
// 成套机具减少 (ma_type 设备规格表)配件的库存数量
List<TmTask> typeIds = leaseOutDetailsMapper.getMaTypeDetails(record);
typeIds.removeIf(item -> item == null);
for (TmTask typeId : typeIds) {
MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId);
machinePart.setPartNum((typeId.getPartNum() * record.getOutNum()));
typeId.setNum(machinePart.getNum() - machinePart.getPartNum());
res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId);
}
// 更新 (ma_machine 设备表)的状态
leaseOutDetailsMapper.updateMaMachineStatus(record);
} else {
// 普通机具减少 (ma_type 设备规格表)的库存数量
res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
}
// 更新 (ma_machine 设备表)的状态
leaseOutDetailsMapper.updateMaMachineStatus(record);
}
}
return res;
}
@ -239,7 +239,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
List<LeaseApplyDetails> leaseApplyDetailsList = leaseApplyDetailsMapper.getByParentId(record.getParentId());
int i = 0;
for (LeaseApplyDetails bean : leaseApplyDetailsList) {
if (Objects.equals(bean.getPreNum(), bean.getAlNum())) {
if (Objects.equals(bean.getPreNum(), bean.getAlNum()) || "2".equals(bean.getStatus())) {
i++;
}
}

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java
View File

@ -2,10 +2,12 @@ package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
@Data
@ -59,6 +61,14 @@ public class BmProjectInfo {
/**数据所属组织*/
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/**开工日期*/
@ApiModelProperty(value = "开工日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String startDate;
/**竣工日期*/
@ApiModelProperty(value = "竣工日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String completionDate;
/**数据所属组织*/
@Excel(name = "所属上级")

16
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java
View File

@ -2,10 +2,12 @@ package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
@Data
@ -112,6 +114,20 @@ public class BmProjectLot {
*/
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/**
/**
* 开工日期
*/
@ApiModelProperty(value = "开工日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String startDate;
/**
/**
* 竣工日期
*/
@ApiModelProperty(value = "竣工日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String completionDate;
/**
* 数据所属组织
*/

31
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
View File

@ -169,23 +169,28 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
@Override
public PageResultVo getAcceptanceDetailStorage(ParamsDto dto) {
extracted(dto);
// 分页
PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
PageResultVo pageResult = new PageResultVo();
List<StorageDetailVo> result;
result = mapper.getAcceptanceDetailStorage(dto);
result = result.stream()
List<StorageDetailVo> result = mapper.getAcceptanceDetailStorage(dto);
List<StorageDetailVo> filteredResult = result.stream()
.filter(storageDetail -> storageDetail.getPurchaseNum() != 0 ||
storageDetail.getCheckNum() != 0 ||
storageDetail.getInputNum() != 0)
.collect(Collectors.toList());
// 分页信息
PageInfo<StorageDetailVo> pageInfo = new PageInfo<>(result);
pageResult.setTotal(pageInfo.getTotal());
pageResult.setTotalPageCount(pageInfo.getPages());
pageResult.setRows(result);
pageResult.setPageNum (dto.getPageNum());
pageResult.setPageSize(dto.getPageSize());
// 手动计算分页信息
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize();
int total = filteredResult.size();
int totalPages = (int) Math.ceil((double) total / pageSize);
// 手动分页，获取当前页的数据
int startIndex = (pageNum - 1) * pageSize;
int endIndex = Math.min(startIndex + pageSize, total);
List<StorageDetailVo> currentPageData = filteredResult.subList(startIndex, endIndex);
// 构建返回结果对象
PageResultVo pageResult = new PageResultVo();
pageResult.setTotal(total);
pageResult.setTotalPageCount(totalPages);
pageResult.setRows(currentPageData);
pageResult.setPageNum(pageNum);
pageResult.setPageSize(pageSize);
return pageResult;
}

7
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -1075,6 +1075,7 @@
mt.type_id AS typeId,
mm.ma_code AS maCode,
mm.ma_id AS maId,
bad.remark AS remark,
sd.NAME AS maStatus
FROM
ma_type mt
@ -1084,9 +1085,11 @@
LEFT JOIN sys_dic sd ON sd.id = mm.ma_status
WHERE
mm.ma_status = '16'
AND mt.type_id = #{typeId}
AND sai.`type_id` = #{typeId}
AND sai.agreement_id = #{agreementId}
<if test="typeId != null and typeId !=''">
AND mt.type_id = #{typeId}
AND sai.`type_id` = #{typeId}
</if>
<if test="maCode != null and maCode !=''">
AND mm.ma_code like concat('%', #{maCode}, '%')
</if>

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

@ -671,15 +671,15 @@
bui.unit_id as unitId,bui.unit_name as unitName,
su.nick_name as applyFor,d.`name` as taskName,
su2.user_name as companyAuditBy,
su2.nick_name as companyAuditBy,
lai.company_audit_time as companyAuditTime,
lai.company_audit_remark as companyAuditRemark,
su3.user_name as deptAuditBy,
su3.nick_name as deptAuditBy,
lai.dept_audit_time as deptAuditTime,
lai.dept_audit_remark as deptAuditRemark,
su4.user_name as directAuditBy,
su4.nick_name as directAuditBy,
lai.direct_audit_time as directAuditTime,
lai.direct_audit_remark as directAuditRemark,
lai.lease_type as leaseType,

10
sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml
View File

@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getProjectInfoAll" parameterType="com.bonus.sgzb.base.domain.BmProjectInfo" resultMap="BmProjectInfoResult">
<!--<include refid="bmProjectInfo"/>-->
select a.pro_id, a.pro_name, a.status, a.type_id, a.link_man, a.telphone, a.dept_id, a.del_flag, a.create_by,
a.create_time,a.update_by, a.update_time, a.remark, a.company_id, b.dept_name, c.name
a.create_time,a.update_by, a.update_time, a.remark, a.company_id, b.dept_name, c.name,a.start_date,a.completion_date
from bm_project_info a
left join sys_dept b on a.dept_id = b.dept_id
left join sys_dic c on a.type_id = c.id
@ -165,6 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="companyId != null and companyId != ''">company_id,</if>
<if test="startDate != null and startDate != ''">start_date,</if>
<if test="completionDate != null and completionDate != ''">completion_date,</if>
create_time
)values(
<if test="proName != null and proName != ''">#{proName},</if>
@ -178,6 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if>
<if test="startDate != null and startDate != ''">#{startDate},</if>
<if test="completionDate != null and completionDate != ''">#{completionDate},</if>
sysdate()
)
</insert>
@ -194,8 +198,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by =#{createBy},</if>
<if test="updateBy != null and updateBy != ''">update_by =#{updateBy},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
<if test="startDate != null and startDate != ''">start_date = #{startDate},</if>
<if test="completionDate != null and completionDate != ''">completion_date = #{completionDate},</if>
update_time = sysdate()
</set>
where pro_id = #{proId}

8
sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
View File

@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getProjectLotAll" parameterType="com.bonus.sgzb.base.domain.BmProjectLot" resultMap="BmProjectLotResult">
<!--<include refid="bmProjectInfo"/>-->
select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share,
a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name
a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date
from bm_project_lot a
left join sys_dept b on a.dept_id = b.dept_id
left join sys_dic c on a.type_id = c.id
@ -115,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null and updateTime != ''">update_time,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="companyId != null and companyId != ''">company_id,</if>
<if test="startDate != null and startDate != ''">start_date,</if>
<if test="completionDate != null and completionDate != ''">completion_date,</if>
create_time
)values(
<if test="lotName != null and lotName != ''">#{lotName},</if>
@ -130,6 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if>
<if test="startDate != null and startDate != ''">#{startDate},</if>
<if test="completionDate != null and completionDate != ''">#{completionDate},</if>
sysdate()
)
</insert>
@ -149,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''">update_by =#{updateBy},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
<if test="startDate != null and startDate != ''">start_date = #{startDate},</if>
<if test="completionDate != null and completionDate != ''">completion_date = #{completionDate},</if>
update_time = sysdate()
</set>
where lot_id = #{lotId}

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

@ -157,4 +157,6 @@ public interface BackApplyMapper {
BackApplyDetailsPo getBackApplyDetailsByParentId(ScrapApplyDetails scrapApplyDetail);
void insertBackApplyDetails(BackApplyDetailsPo backApplyDetailsPoNew);
void updateBackApplyDetailsByParentId(BackApplyDetailsPo backApplyDetailsPoNew);
}

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -270,8 +270,17 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
backApplyDetailsPoNew.setCreateBy(backApplyDetailsPo.getCreateBy());
backApplyDetailsPoNew.setCompanyId(backApplyDetailsPo.getCompanyId());
backApplyDetailsPoNew.setRemark(scrapApplyDetail.getAuditRemark());
backApplyMapper.insertBackApplyDetails(backApplyDetailsPoNew);
//在存入的时候判断是否有同类型的机具，如果有数量加1,针对编码的机具
scrapApplyDetail.setParentId(backApplyInfoPo.getId());
scrapApplyDetail.setTypeId(Long.valueOf(backApplyDetailsPo.getTypeId()));
BackApplyDetailsPo backApplyDetailsPoResult = backApplyMapper.getBackApplyDetailsByParentId(scrapApplyDetail);
if (backApplyDetailsPoResult!=null){
backApplyDetailsPoNew.setPreNum(backApplyDetailsPoResult.getPreNum().add(BigDecimal.ONE));
backApplyDetailsPoNew.setAuditNum(backApplyDetailsPoResult.getAuditNum().add(BigDecimal.ONE));
backApplyMapper.updateBackApplyDetailsByParentId(backApplyDetailsPoNew);
}else {
backApplyMapper.insertBackApplyDetails(backApplyDetailsPoNew);
}
//修改协议表的状态
SltAgreementInfo sltAgreementInfo = new SltAgreementInfo();
sltAgreementInfo.setAgreementId(agreementId.toString());

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -521,6 +521,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
bai.id = #{id}
</update>
<update id="updateBackApplyDetailsByParentId">
UPDATE back_apply_details set pre_num = #{preNum} ,audit_num = #{auditNum}
WHERE parent_id = #{parentId} and type_id = #{typeId}
</update>
<delete id="del">
DELETE

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

@ -196,7 +196,7 @@
bui.unit_name AS unitName,
pisi.`CODE` AS kindName,
mt2.type_name AS typeName,
su.user_name AS modelName,
su.nick_name AS modelName,
pisi.CREATE_DATE AS createDate,
pisi.REMARKS AS remark,
ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
View File

@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND lod.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if>
order by lod.create_time desc
</select>
<select id="getSltAgreementInfo" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
SELECT

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

@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPutInListList" resultMap="PurchasePartInfoResult">
SELECT
pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, us.user_name as create_by, pci.create_time,
pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, us.nick_name as create_by, pci.create_time,
pci.update_by,
pci.update_time, pci.remark, pci.company_id ,tk.code,tk.task_status taskStatus,GROUP_CONCAT(distinct mpt1.pa_name) purchasingTypeName,
CASE

6
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -178,7 +178,7 @@ WHERE ma_machine.ma_code =
select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
pci.update_by,
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status
taskStatus,su.user_name purchaserName,
taskStatus,su.nick_name purchaserName,
tk.create_by,
CASE tk.task_status
WHEN 28 THEN
@ -190,9 +190,9 @@ WHERE ma_machine.ma_code =
END as inputTime,
CASE tk.task_status
WHEN 28 THEN
us.user_name
us.nick_name
WHEN 123 THEN
us.user_name
us.nick_name
ELSE
''
END as inputUser

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

@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
iad.input_num as inputNum,mm.ma_code as maCode,
tt.create_time as returnTime,
iad.create_time as submitStorageTime,
us.user_name as submitToStoragePersonnel,iad.remark as remark
us.nick_name as submitToStoragePersonnel,iad.remark as remark
FROM input_apply_details iad
LEFT JOIN tm_task tt ON iad.task_id = tt.task_id
LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id

5
sgzb-ui/src/views/stquery/deviceStatusRecord.vue
View File

@ -239,6 +239,7 @@ export default {
proId: null, //工程id
types: 1, // 1申请列表 2审核列表
maType: '1', // 1机具 2调试
},
unitList: [], //来往单位集合
proList: [], //工程集合
@ -320,11 +321,11 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
'material/backRecord/export',
'material/storageStatus/export',
{
...this.queryParams,
},
`综合查询_退料记录_${new Date().getTime()}.xlsx`,
`综合查询_机具仓储状态_${new Date().getTime()}.xlsx`,
)
},

5
sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
View File

@ -239,6 +239,7 @@ export default {
proId: null, //工程id
types: 1, // 1申请列表 2审核列表
maType: '2', // 1机具 2调试
},
unitList: [], //来往单位集合
proList: [], //工程集合
@ -320,11 +321,11 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
'material/backRecord/export',
'material/storageStatus/export',
{
...this.queryParams,
},
`综合查询_退料记录_${new Date().getTime()}.xlsx`,
`综合查询_调试仓储状态_${new Date().getTime()}.xlsx`,
)
},