From e80849ec528ca13b63a29946a9dc80c03002d2c9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 18 Jun 2024 16:23:47 +0800 Subject: [PATCH 1/3] =?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 --- .../java/com/bonus/sgzb/material/domain/BackApplyDto.java | 4 ++++ .../sgzb/material/service/impl/BackApplyServiceImpl.java | 4 +++- .../src/main/resources/mapper/material/BackApplyMapper.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java index 3f265c77..aa48ca67 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java @@ -21,6 +21,10 @@ public class BackApplyDto { @ApiModelProperty(value = "退料ID") private Long id; + /** 退料内部ID */ + @ApiModelProperty(value = "退料内部ID") + private Long innerId; + @ApiModelProperty(value="同一退料单中不同器具状态") private String status; 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 ba0ea659..15c63bb4 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 @@ -473,6 +473,7 @@ public class BackApplyServiceImpl implements BackApplyService { } } } + //审核成功，赋值任务状态38 if (num == taskIdById.size()) { dto.setTaskStatus("38"); backApplyMapper.updateTmTaskAll(dto); @@ -489,7 +490,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.setInnerId(backApplyListDto.getId()); + dto.setAuditNum(backApplyDetail.getPreNum()); re = backApplyMapper.auditAll(dto); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 30a5fcf2..63b9b1cc 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN back_apply_details bad on bad.parent_id=bai.id SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() WHERE - bai.id = #{id} + bai.id = #{innerId} and bai.company_id = #{companyId} From bc45f6bf07e46914e9dc17bb3b68db0ecbc59faa Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 18 Jun 2024 17:42:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseCheckServiceCenterController.java | 8 +++++++- .../warehouseManage/newPurchase/serviceCenter/index.vue | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index 2a880590..3aa0a4ca 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -86,7 +86,13 @@ public class PurchaseCheckServiceCenterController extends BaseController @PostMapping("/putInExport") public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { - List list = purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo); + List list = new ArrayList<>(); + //判断该组织是否开启综合服务中心审核 + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + int re =purchaseCheckServiceCenterService.selectExamineType(companyId); + if (re>0){ + list=purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo); + } ExcelUtil util = new ExcelUtil<>(PurchaseInput.class); util.exportExcel(response, list, "新购工机具入库"); } diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue index 2d5c6190..a42b9648 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue @@ -872,11 +872,11 @@ export default { /** 导出按钮操作 */ handleExport() { this.download( - 'material/purchaseCheckInfo/putInExport', + 'material/purchaseCheckServiceCenter/putInExport', { ...this.queryParams, }, - `新购工机具入库_${new Date().getTime()}.xlsx`, + `综合服务中心_${new Date().getTime()}.xlsx`, ) }, /** 刷新缓存按钮操作 */ From 84022ffe21950be0876d75dd62be428ec21365e4 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Tue, 18 Jun 2024 17:58:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partsAcceptance/component/addParts.vue | 10 ++++++++-- .../newPurchase/partsAcceptance/index.vue | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue index 2dc23795..b54db68c 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue @@ -246,7 +246,7 @@ label="操作" align="center" class-name="small-padding fixed-width" - v-if="!isView" + v-if="!isView || isCheck || isEdit" >