功能完善

sgzb-modules/sgzb-material/pom.xml

@@ -107,6 +107,12 @@
             <version>5.8.16</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.bonus.sgzb</groupId>
+            <artifactId>sgzb-modules-base</artifactId>
+            <version>3.6.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <properties>
@@ -114,4 +120,21 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java

@@ -14,15 +14,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.bonus.sgzb.common.log.annotation.Log;
 import com.bonus.sgzb.common.log.enums.BusinessType;
-import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
@@ -105,4 +101,5 @@ public class RepairAuditDetailsController extends BaseController
         return toAjax(repairAuditDetailsService.auditRepair(scrapAudit));
     }
 
+
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java

@@ -114,6 +114,11 @@ public class PurchasePartInfo extends BaseEntity
     @ApiModelProperty(value = "任务状态结果")
     private String taskStatusResult;
 
+    /**
+     * 提交入库时间
+     */
+    private String submitStorageTime;
+
     public String getKeyWord() {
         return keyWord;
     }
@@ -335,6 +340,14 @@ public class PurchasePartInfo extends BaseEntity
         this.purchasePrice = purchasePrice;
     }
 
+    public String getSubmitStorageTime() {
+        return submitStorageTime;
+    }
+
+    public void setSubmitStorageTime(String submitStorageTime) {
+        this.submitStorageTime = submitStorageTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputVo.java

@@ -25,4 +25,10 @@ public class RepairTestInputVo {
 
     /** 状态*/
     private String taskStatus;
+
+    /** 工程 */
+    private String projectName;
+
+    /** 单位 */
+    private String unitName;
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java

@@ -92,7 +92,6 @@ public class ScrapApplyDetails extends BaseEntity
     @ApiModelProperty(value = "机具编号")
     private String maCode;
 
-
     // 传入参数
     @ApiModelProperty(value = "单位id")
     private Integer backUnit;

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java

@@ -1,5 +1,6 @@
 package com.bonus.sgzb.material.mapper;
 
+import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
@@ -75,4 +76,8 @@ public interface RepairAuditDetailsMapper
     List<RepairAuditDetails> selectRepairInputByTaskId(Long taskId);
 
     List<RepairAuditDetails> selectScrapNumByTaskId(Long taskId);
+
+    int updateStatus(RepairAuditDetails bean);
+
+    int insertRepairDetails(RepairTaskDetails repairTaskDetails);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java

@@ -113,4 +113,5 @@ public interface RepairTestInputMapper {
     * @date 2024/1/9 15:14
     */
     List<RepairTestInputDetailVo> exportList(RepairTestInputDto bean);
+
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java

@@ -2,9 +2,11 @@ package com.bonus.sgzb.material.service.impl;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
@@ -160,22 +162,41 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
     @Transactional(rollbackFor=Exception.class)
     public int auditRepair(ScrapAudit scrapAudit) throws Exception {
         String checkResult = scrapAudit.getCheckResult();
+        List<RepairAuditDetails> auditDetailList = scrapAudit.getAuditDetailList();
         List<Long> taskIdList = scrapAudit.getTaskIdList();
+        BigDecimal b = new BigDecimal(0);
         for (Long taskId : taskIdList) {
+            String status = "0";
             TmTask task1 = taskMapper.selectTmTaskByTaskId(taskId);
             if (task1.getTaskStatus() == 47) {
                 throw new Exception("任务已审核已通过");
             }
-            if ("通过".equals(checkResult)) {
 
-                String taskCode ="";
-                int taskStatus= 0;
-                int taskType = 0;
-                int companyId = 0;
-                // 查询协议表
-                TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId);
-                List<RepairAuditDetails> repairInputList = repairAuditDetailsMapper.selectRepairInputByTaskId(taskId);
-                List<RepairAuditDetails> scrapNumList = repairAuditDetailsMapper.selectScrapNumByTaskId(taskId);
+            List<RepairAuditDetails> auditAllList = repairAuditDetailsMapper.selectRepairAuditDetailsByTaskId(taskId);
+            // 查询协议表
+            TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId);
+            String taskCode ="";
+            int taskStatus= 0;
+            int taskType = 0;
+            int companyId = 0;
+            if ("通过".equals(checkResult)) {
+                status = "1";
+                List<RepairAuditDetails> repairInputList = new ArrayList<>();
+                List<RepairAuditDetails> scrapNumList = new ArrayList<>();
+                if (auditDetailList != null && auditDetailList.size()>0){
+                    for (RepairAuditDetails bean : auditDetailList){
+                        if (bean.getRepairedNum().compareTo(b)>0){
+                            repairInputList.add(bean);
+                        }
+                        if (bean.getScrapNum().compareTo(b)>0){
+                            scrapNumList.add(bean);
+                        }
+                    }
+                }else {
+                    repairInputList = repairAuditDetailsMapper.selectRepairInputByTaskId(taskId);
+                    scrapNumList = repairAuditDetailsMapper.selectScrapNumByTaskId(taskId);
+                }
+
                 if(repairInputList != null && repairInputList.size() > 0){
                     companyId = repairInputList.get(0).getCompanyId();
                     taskCode = purchaseCodeRule("R",50);
@@ -186,7 +207,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                         Long typeId = inputDetails.getTypeId();
                         Long maId = inputDetails.getMaId();
                         BigDecimal repairNum = inputDetails.getRepairedNum();
-                        BigDecimal b = new BigDecimal(0);
+
                         // 创建修饰后入库任务
                         if (repairNum.compareTo(b) > 0) {
                             // 添加修试后入库任务
@@ -213,7 +234,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     for (RepairAuditDetails scrapDetails : scrapNumList) {
                         Long typeId = scrapDetails.getTypeId();
                         Long maId = scrapDetails.getMaId();
-                        BigDecimal b = new BigDecimal(0);
                         // 创建报废任务
                         BigDecimal scrapNum = scrapDetails.getScrapNum();
                         if (scrapNum.compareTo(b) > 0) {
@@ -234,20 +254,68 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
 
                 }
                 // 修饰审核通过时改修任务为已通过审核
-                task1.setTaskStatus(47);
+                int i = 0;
+                int j = 0;
+                if (repairInputList != null){
+                    i = repairInputList.size();
+                }
+                if (scrapNumList != null){
+                    j = scrapNumList.size();
+                }
+                if (auditAllList.size() == (i + j)){
+                    task1.setTaskStatus(47);
+                }
                 task1.setUpdateTime(new Date());
                 task1.setUpdateBy(SecurityUtils.getUsername());
                 taskMapper.updateTmTask(task1);
             } else {
+                status = "2";
+                List<RepairAuditDetails> repairDetailList = new ArrayList<>();
+                if (auditDetailList != null && auditDetailList.size()>0){
+                    repairDetailList.addAll(auditDetailList);
+                }else {
+                    repairDetailList.addAll(auditAllList);
+                }
+                if(repairDetailList != null && repairDetailList.size() > 0){
+                    companyId = repairDetailList.get(0).getCompanyId();
+                    taskCode = purchaseCodeRule("WX",41);
+                    taskStatus = 42;
+                    taskType = 41;
+                    long inputTaskId =  genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
+                    for (RepairAuditDetails inputDetails : repairDetailList) {
+                        // 添加驳回后维修详细表数据
+                        RepairTaskDetails repairTaskDetails = new RepairTaskDetails();
+                        repairTaskDetails.setTaskId(String.valueOf(inputTaskId));
+                        repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId()));
+                        repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId()));
+                        BigDecimal repairNum = inputDetails.getRepairNum();
+                        int i = repairNum.intValue(); // 直接转换
+                        repairTaskDetails.setRepairNum(i);
+                        repairTaskDetails.setStatus("0");
+                        repairTaskDetails.setCreateBy(SecurityUtils.getUserId());
+                        repairTaskDetails.setCompanyId((long) companyId);
+                        repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails);
+                    }
+                }
                 // 修饰审核任务不通过时
                 TmTask tmTask = new TmTask();
                 tmTask.setTaskId(taskId);
                 tmTask.setRemark(scrapAudit.getRemark());
-                tmTask.setTaskStatus(48);
+                int i = repairDetailList.size();
+                if (auditAllList.size() == i){
+                    tmTask.setTaskStatus(48);
+                }
                 tmTask.setUpdateTime(new Date());
                 tmTask.setUpdateBy(SecurityUtils.getUsername());
                 taskMapper.updateTmTask(tmTask);
             }
+            if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
+                for (RepairAuditDetails bean : auditDetailList){
+                    bean.setAuditBy(SecurityUtils.getUserId());
+                    bean.setStatus(status);
+                    repairAuditDetailsMapper.updateStatus(bean);
+                }
+            }
         }
         return 1;
     }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java

@@ -1,5 +1,6 @@
 package com.bonus.sgzb.material.vo;
 
+import com.bonus.sgzb.material.domain.RepairAuditDetails;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -17,4 +18,7 @@ public class ScrapAudit {
     @ApiModelProperty(value = "不通过原因")
     private String remark;
 
+    @ApiModelProperty(value = "审核任务明细id")
+    private List<RepairAuditDetails> auditDetailList;
+
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -119,6 +119,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null">#{companyId},</if>
          </trim>
     </insert>
+    <insert id="insertRepairDetails">
+        insert into repair_apply_details
+        (
+        <if test="taskId != null">
+            task_id,
+        </if>
+        <if test="maId != null">
+            ma_id,
+        </if>
+        <if test="typeId != null">
+            type_id,
+        </if>
+        <if test="backNum != null">
+            repair_num,
+        </if>
+        <if test="status != null">
+            status,
+        </if>
+        <if test="createBy != null and createBy != ''">
+            create_by,
+        </if>
+        <if test="createBy != null and createBy != ''">
+            update_by,
+        </if>
+        update_time,
+        <if test="remark != null and remark != ''">
+            remark,
+        </if>
+        <if test="companyId != null">
+            company_id,
+        </if>
+        <if test="id != null">
+            back_id,
+        </if>
+        create_time
+        )
+        values (
+        <if test="taskId != null">
+            #{taskId},
+        </if>
+        <if test="maId != null">
+            #{maId},
+        </if>
+        <if test="typeId != null">
+            #{typeId},
+        </if>
+        <if test="backNum != null">
+            #{backNum},
+        </if>
+        <if test="status != null">
+            #{status},
+        </if>
+        <if test="createBy != null and createBy != ''">
+            #{createBy},
+        </if>
+        <if test="createBy != null and createBy != ''">
+            #{createBy},
+        </if>
+        NOW(),
+        <if test="remark != null and remark != ''">
+            #{remark},
+        </if>
+        <if test="companyId != null">
+            #{companyId},
+        </if>
+        <if test="id != null">
+            #{id},
+        </if>
+        NOW()
+        )
+    </insert>
 
     <update id="updateRepairAuditDetails" parameterType="com.bonus.sgzb.material.domain.RepairAuditDetails">
         update repair_audit_details
@@ -143,6 +214,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <update id="updateStatus">
+        update repair_audit_details
+        set audit_by = #{auditBy},
+            audit_time = now(),
+            status = #{status}
+        where id = #{id}
+    </update>
 
     <delete id="deleteRepairAuditDetailsById" parameterType="Long">
         delete from repair_audit_details where id = #{id}

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT b.id,
                b.repairCode,
                b.maTypeName,
+               b.projectName,
+               b.unitName,
                b.wxName,
                b.wxTime,
                b.taskStatus
@@ -69,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ANY_VALUE(tt2.`code`) AS repairCode,
                 ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
                 ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
+                bpl.lot_name projectName,
+                bui.unit_name unitName,
                 ANY_VALUE(us.user_name) AS wxName,
                 ANY_VALUE(tt2.create_time) AS wxTime,
                 ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
@@ -76,6 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id
                 LEFT JOIN sys_user us on us.user_id=rad.repairer
                 LEFT JOIN tm_task tt ON rid.task_id = tt.task_id
+                LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
+                LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+                LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id
+                LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
                 LEFT JOIN sys_dic sd ON tt.task_status = sd.id
                 LEFT JOIN tm_task tt2 ON rad.task_id = tt2.task_id
                 LEFT JOIN (
@@ -248,4 +256,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null">#{companyId},</if>
         </trim>
     </insert>
+
 </mapper>

sgzb-ui/package.json

@@ -5,7 +5,7 @@
   "author": "机具",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",

sgzb-ui/src/views/claimAndRefund/receive/agreement.vue

@@ -273,7 +273,7 @@ export default {
       dialogVisible: false,
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
       // 表单校验
       rules: {

sgzb-ui/src/views/repairTest/testExamine/index.vue

@@ -338,6 +338,7 @@
       </el-form>
 
       <el-table v-loading="loading" :data="dialogList" height="500px">
+        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="序号" sortable align="center" type="index" />
         <el-table-column
           label="类型名称"

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue

@@ -309,9 +309,8 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
-      //  uploadUrl:'http://10.40.92.102:9201',//本地测试
       dialogImageUrl: '',
       dialogVisible: false,
       //--------------

sgzb-ui/src/views/store/tools/toolsSupplier.vue

@@ -215,7 +215,7 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
       // 表单校验
       rules: {

sgzb-ui/src/views/store/tools/toolsType.vue

@@ -458,7 +458,8 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://192.168.5.12:9201',//本地测试
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
       defaultProps: {
         children: "children",

sgzb-ui/src/views/system/user/profile/userAvatar.vue

@@ -132,7 +132,11 @@ export default {
     uploadImg() {
       this.$refs.cropper.getCropBlob(data => {
         let formData = new FormData();
+        // console.log(data)
+        // console.log(formData)
         formData.append("avatarfile", data);
+        formData.append("fileType", 'user');
+        // console.log(formData)
         uploadAvatar(formData).then(response => {
           this.open = false;
           this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;