diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index f83a8792..7a11cd94 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -198,4 +198,19 @@ public class BackApplyInfo { * 报废数量 */ private Integer bfNum; + + /** + * 报废原因 + */ + private String scrapReason; + + /** + * 报废类型0：自然报废，1人为报废 + */ + private String scrapType; + + /** + * 图片地址 + */ + private String fileUrl; } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 3376d40a..05ad3d56 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -312,6 +312,15 @@ remark, + + scrap_reason, + + + scrap_type, + + + file_url, + company_id, @@ -343,6 +352,15 @@ #{remark}, + + #{scrapReason}, + + + #{scrapType}, + + + #{fileUrl}, + #{companyId}, @@ -512,6 +530,15 @@ company_id, + + audit_remark, + + + scrap_type, + + + file_url, + create_time ) values ( @@ -538,6 +565,15 @@ #{companyId}, + + #{scrapReason}, + + + #{scrapType}, + + + #{fileUrl}, + NOW() ) @@ -749,7 +785,10 @@ bcd.parent_id as parentId, bcd.create_by as createBy, bcd.ma_id as maId, - bai.company_id as companyId + bai.company_id as companyId, + bcd.scrap_reason as scrapReason, + bcd.scrap_type as scrapType, + bcd.file_url as fileUrl FROM back_check_details bcd LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 90b19c57..89a4678b 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -522,6 +522,10 @@ AND bpl.lot_id = #{record.projectId} + + AND tt.task_status = #{record.taskStatus} + + AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%')) @@ -665,7 +669,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpi.lot_id as proId, bpi.pro_id as projectId,bpi.lot_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, - tt.create_by as applyFor,d.`name` as taskName, + su.nick_name as applyFor,d.`name` as taskName, su2.user_name as companyAuditBy, lai.company_audit_time as companyAuditTime, @@ -687,7 +691,7 @@ bai.agreement_id as agreementId FROM tm_task tt - LEFT JOIN sys_user su ON tt.create_by = su.user_name + LEFT JOIN sys_user su ON tt.create_by = su.user_id LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 71b7a4cc..063744fb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -492,7 +492,8 @@ public class BackApplyServiceImpl implements BackApplyService { if (CollUtil.isNotEmpty(dto.getBackApplyList())) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) { - dto.setAuditNum(backApplyDetail.getNum()); + dto.setId(backApplyListDto.getId()); + dto.setAuditNum(backApplyDetail.getPreNum()); re = backApplyMapper.auditAll(dto); } } diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue index e5cfa0ec..c2c2b784 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue @@ -57,6 +57,24 @@ + + + + + + + { this.$set(v, 'applyFor', this.queryParams.applyFor) this.$set(v, 'updateTimes', this.queryParams.updateTimes) - this.$set(v, 'taskName', v.statusName) + if (!res.rows[0].directAuditRemark) { + this.$set(v, 'taskName', this.queryParams.taskName) + } else { + this.$set(v, 'taskName', v.statusName) + } this.$set(v, 'createTime', this.queryParams.createTimes) this.$set(v, 'updateTime', this.queryParams.updateTimes) }) diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue index 76e8ad96..f07687dc 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue @@ -563,7 +563,6 @@ export default { modelList: [], // 采购状态下拉数据 statusList: [ - { label: '全部', taskState: null }, { label: '待审核', taskState: 122 }, { label: '入库审核中', taskState: 105 }, { label: '已驳回', taskState: 106 }, diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue index 3dfe34cf..0138b806 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue @@ -510,7 +510,6 @@ export default { modelList: [], // 采购状态下拉数据 statusList: [ - { label: '全部', taskState: null }, { label: '待通知', taskState: 24 }, { label: '待验收', taskState: 25 }, { label: '验收合格', taskState: 26 },