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

问题修改

This commit is contained in:
1539530615@qq.com 2024-01-30 13:21:41 +08:00
parent f737a289f5
commit 8bf9558fc5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
View File

@ -138,6 +138,7 @@ public class LeaseApplyDetails implements Serializable {
*/
@ApiModelProperty(value = "装备管理方式名称")
private String manageTypeName;
private String maCode;
/**
* 实时库存

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

@ -516,11 +516,12 @@
SELECT
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum
mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.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
WHERE
lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId}
</select>

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

@ -139,7 +139,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
* @return 结果
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public int auditScrap(ScrapAudit scrapAudit) throws Exception {
String checkResult = scrapAudit.getCheckResult();
List<ScrapApplyDetails> scrapDetailList = scrapAudit.getScrapDetailList();
@ -186,9 +186,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
List<ScrapApplyDetails> repairList = new ArrayList<>();
if (scrapApplyDetailsList.size()>0){
for (ScrapApplyDetails bean : scrapApplyDetailsList){
if (bean.getScrapSource().equals("1")){
if ("1".equals(bean.getScrapSource())){
backList.add(bean);
}else if (bean.getScrapSource().equals("2")){
}else if ("2".equals(bean.getScrapSource())){
repairList.add(bean);
}
}