Merge remote-tracking branch 'origin/dev-cq' into dev-cq

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<PurchaseInput> list = purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo);
+        List<PurchaseInput> list = new ArrayList<>();
+        //判断该组织是否开启综合服务中心审核
+        Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
+        int re =purchaseCheckServiceCenterService.selectExamineType(companyId);
+        if (re>0){
+            list=purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo);
+        }
         ExcelUtil<PurchaseInput> util = new ExcelUtil<>(PurchaseInput.class);
         util.exportExcel(response, list, "新购工机具入库");
     }

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;
 

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);
                 }
             }

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}
         <if test="companyId != null and companyId != ''">
             and bai.company_id = #{companyId}
         </if>

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"
             >
                 <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                     <el-button
@@ -425,6 +425,12 @@ export default {
                 return false
             },
         },
+        isShow: {
+            type: Boolean,
+            default: () => {
+                return false
+            },
+        },
         partsTaskId: {
             type: [String, Number],
         },
@@ -467,7 +473,7 @@ export default {
             },
             taskId: '',
             // isView: false,
-            isShow: false,
+            // isShow: false,
             // isEdit: false,
             // isCheck: false,
             addForm: {

sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue

@@ -13,6 +13,7 @@
             :isEdit="isEdit"
             :isCheck="isCheck"
             :isDisabled="isDisabled"
+            :isShow="isShow"
             @addParts="addParts"
             @queryParts="queryParts"
             @editParts="editParts"
@@ -36,11 +37,12 @@ export default {
         return {
             isShowComponent: 'Home',
             pageContent: '新增配件',
-            partsTaskId: '',
+            partsTaskId: undefined,
             isView: false,
             isEdit: false,
             isCheck: false,
             isDisabled: false,
+            isShow: false,
         }
     },
     methods: {
@@ -48,12 +50,19 @@ export default {
         addParts() {
             this.pageContent = '新增配件'
             this.isShowComponent = 'AddParts'
+            this.partsTaskId = ''
+            this.isView = false
+            this.isDisabled = false
+            this.isCheck = false
+            this.isShow = true
         },
         /* 查询配件 */
         queryParts(taskId) {
+            this.pageContent = '配件详情'
             this.partsTaskId = taskId
             this.isView = true
             this.isDisabled = true
+            this.isCheck = false
             this.isShowComponent = 'AddParts'
         },
         /* 新增 修改保存成功 */
@@ -62,17 +71,23 @@ export default {
         },
         /* 编辑配件 */
         editParts(taskId) {
+            this.pageContent = '编辑配件'
             this.partsTaskId = taskId
             this.isView = true
             this.isEdit = true
+            this.isCheck = false
+            this.isShow = false
+            this.isDisabled = false
             this.isShowComponent = 'AddParts'
         },
         /* 验收配件 */
         acceptParts(taskId) {
+            this.pageContent = '配件验收'
             this.partsTaskId = taskId
             this.isView = true
             this.isDisabled = true
             this.isCheck = true
+            this.isShow = false
             this.isShowComponent = 'AddParts'
         },
         /* 返回按钮 */

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`,
             )
         },
         /** 刷新缓存按钮操作 */