From 01aa8c72b2d3584d6ebcfe21f2b9ee296b0327be Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Tue, 18 Jun 2024 10:47:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=90=9C?= =?UTF-8?q?=E7=B4=A2,=20=E4=BC=98=E5=8C=96=E9=A2=86=E6=96=99=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BB=BB=E5=8A=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../picking/apply/component/home.vue | 27 +++++++++++++++++++ .../auditing/component/auditingPage.vue | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) 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) }) From d9e69d21b6689ff6c5f01195ccc1094fc42597a1 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 18 Jun 2024 10:58:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) 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 51531ec2..fe5af37a 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}, '%')) From 4a0741161e28604063132f57ad1e7088bc024dff Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 18 Jun 2024 13:44:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/material/service/impl/BackApplyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..ad8af003 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,7 @@ 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.setAuditNum(backApplyDetail.getPreNum()); re = backApplyMapper.auditAll(dto); } } From 7be2995a04274f7b6c8daebea547d4afd71ae387 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 18 Jun 2024 14:07:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/material/service/impl/BackApplyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 ad8af003..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,6 +492,7 @@ public class BackApplyServiceImpl implements BackApplyService { if (CollUtil.isNotEmpty(dto.getBackApplyList())) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) { + dto.setId(backApplyListDto.getId()); dto.setAuditNum(backApplyDetail.getPreNum()); re = backApplyMapper.auditAll(dto); } From 00b8031a96ac1b3210301789a8ef1fd50360538a Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Tue, 18 Jun 2024 14:49:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=BA=9F=E5=9B=BE=E7=89=87=E5=92=8C?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/app/domain/BackApplyInfo.java | 15 +++++++ .../mapper/app/BackReceiveMapper.xml | 41 ++++++++++++++++++- .../resources/mapper/app/TmTaskMapper.xml | 4 +- 3 files changed, 57 insertions(+), 3 deletions(-) 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 17cb7e52..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 @@ -669,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, @@ -691,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 From 276c919ea754dcd8ed5730afea24e7042fbf9083 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Tue, 18 Jun 2024 14:55:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E9=87=87=E8=B4=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/warehouseManage/newPurchase/serviceCenter/index.vue | 1 - .../newPurchase/toolsAcceptance/component/home.vue | 1 - 2 files changed, 2 deletions(-) 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 },