接口修改

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java

@@ -53,6 +53,21 @@ public class RepairInputDetails extends BaseEntity {
     @ApiModelProperty(value = "规格ID")
     private Long typeId;
 
+    @ApiModelProperty(value = "物资名称")
+    private String typeName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String typeModelName;
+
+    @ApiModelProperty(value = "机具状态")
+    private String maStatus;
+
+    @ApiModelProperty(value = "机具状态名称")
+    private String inputType;
+
+    @ApiModelProperty(value = "二维码code")
+    private String qrCode;
+
     /**
      * 退料单位名称
      */

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java

@@ -1,6 +1,9 @@
 package com.bonus.material.basic.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
@@ -293,9 +296,10 @@ public class ComplexQueryController extends BaseController {
     @ApiOperation(value = "综合查询--机具入库查询列表")
     @GetMapping("/getInputRecordList")
     public AjaxResult getInputRecordList(InputRecordInfo bean) {
-        startPage();
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<InputRecordInfo> list = complexQueryService.getInputRecordList(bean);
-        return AjaxResult.success(getDataTable(list));
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     /**
@@ -320,9 +324,10 @@ public class ComplexQueryController extends BaseController {
     @ApiOperation(value = "综合查询--机具出库查询列表")
     @GetMapping("/getOutRecordList")
     public AjaxResult getOutRecordList(OutRecordInfo bean) {
-        startPage();
+        Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<OutRecordInfo> list = complexQueryService.getOutRecordList(bean);
-        return AjaxResult.success(getDataTable(list));
+        return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 
     @ApiOperation("导出综合查询机具出库查询")

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java

@@ -168,8 +168,6 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
                 if ((record.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) && record.getInputNum() != null) {
                     record.setOutNum(record.getInputNum());
                     record.setOutType(InputOutEnum.NUMBER_DEVICE.getTypeId());
-                } else if (record.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) {
-                    record.setOutType(InputOutEnum.CODE_DEVICE.getTypeId());
                 }
                 res = checkStorageNum(record);
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.bonus.common.biz.annotation.StoreLog;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.back.domain.vo.MaCodeVo;
+import com.bonus.material.basic.domain.BmQrcodeInfo;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -134,6 +135,16 @@ public class RepairInputDetailsController extends BaseController {
         return repairInputDetailsService.warehouse(repairInputDetails);
     }
 
+    /**
+     * 二维码出库：根据qrcode查询在库机具信息
+     * @param bmQrcodeInfo
+     * @return
+     */
+    @GetMapping("/getInfoByQrcode")
+    public AjaxResult getInfoByQrcode(BmQrcodeInfo bmQrcodeInfo) {
+        return repairInputDetailsService.getInfoByQrcode(bmQrcodeInfo);
+    }
+
     /**
      * 查询修试待入库机具编码
      * @param mdCodeVo

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.bonus.material.back.domain.vo.MaCodeVo;
 import com.bonus.common.biz.domain.repair.RepairInputDetails;
+import com.bonus.material.basic.domain.BmQrcodeInfo;
 import com.bonus.material.repair.domain.RepairInputInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -122,4 +123,11 @@ public interface RepairInputDetailsMapper {
      * @return
      */
     List<RepairInputDetails> selectRepairDetails(@Param("list") List<Long> taskIdList);
+
+    /**
+     * 根据二维码查询详情
+     * @param bmQrcodeInfo
+     * @return
+     */
+    List<RepairInputDetails> getInfoByQrcode(BmQrcodeInfo bmQrcodeInfo);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairInputDetailsService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.back.domain.vo.MaCodeVo;
 import com.bonus.common.biz.domain.repair.RepairInputDetails;
+import com.bonus.material.basic.domain.BmQrcodeInfo;
 import com.bonus.material.repair.domain.RepairInputInfo;
 
 /**
@@ -82,4 +83,11 @@ public interface IRepairInputDetailsService {
      * @return
      */
     AjaxResult reject(RepairInputDetails repairInputDetails);
+
+    /**
+     * 根据二维码查询机具信息
+     * @param bmQrcodeInfo
+     * @return
+     */
+    AjaxResult getInfoByQrcode(BmQrcodeInfo bmQrcodeInfo);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.domain.lease.LeaseOutDetails;
@@ -17,6 +18,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.back.domain.vo.MaCodeVo;
 import com.bonus.common.biz.domain.repair.RePairDto;
+import com.bonus.material.basic.domain.BmQrcodeInfo;
 import com.bonus.material.lease.mapper.LeaseOutDetailsMapper;
 import com.bonus.material.ma.domain.Type;
 import com.bonus.material.repair.domain.RepairInputInfo;
@@ -246,6 +248,23 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
         return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
     }
 
+    /**
+     * 获取二维码信息
+     * @param bmQrcodeInfo
+     * @return
+     */
+    @Override
+    public AjaxResult getInfoByQrcode(BmQrcodeInfo bmQrcodeInfo) {
+        if (bmQrcodeInfo.getQrCode() == null) {
+            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "二维码code不能为空");
+        }
+        List<RepairInputDetails> recordList = repairInputDetailsMapper.getInfoByQrcode(bmQrcodeInfo);
+        if (CollectionUtil.isNotEmpty(recordList)) {
+            return AjaxResult.success(recordList);
+        }
+        return AjaxResult.error(HttpCodeEnum.SYSTEM_ERROR.getCode(), "该二维码处于非修试待入库状态");
+    }
+
     /**
      * 外部驳回
      * @param repairInputDetails

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml

@@ -190,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN repair_apply_details rad ON rid.repair_id = rad.id
         WHERE
             rid.task_id = #{taskId}
+            LIMIT 1
     </select>
 
     <select id="selectRepairDetails" resultType="com.bonus.common.biz.domain.repair.RepairInputDetails">
@@ -221,6 +222,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt.type_id
     </select>
 
+    <select id="getInfoByQrcode" resultType="com.bonus.common.biz.domain.repair.RepairInputDetails">
+        SELECT
+            mt1.type_name as typeName,
+            mt.type_name  as typeModelName,
+            mm.ma_id      as maId,
+            mm.ma_code    as maCode,
+            mm.type_id    as typeId,
+            mm.ma_status  as maStatus,
+            mm.qr_code    as qrCode,
+            case when mm.ma_status = '5' then '修试后待入库'
+                 else ''
+                end as statusName,
+            mt.manage_type as manageType,
+            rid.task_id as taskId,
+            bp.pro_name as backPro,
+            bu.unit_name as backUnit,
+            tt.CODE AS inputCode,
+            tt1.CODE AS repairCode,
+            bai.agreement_id as agreementId
+        FROM ma_machine mm
+                 LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
+                 LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'
+                 LEFT JOIN repair_input_details rid ON mm.ma_id = rid.ma_id
+                 LEFT JOIN tm_task_agreement tta ON rid.task_id = tta.task_id
+                 LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+                 LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id
+                 LEFT JOIN bm_unit bu ON bai.unit_id = bu.unit_id
+                 LEFT JOIN tm_task tt on rid.task_id = tt.task_id
+                 LEFT JOIN repair_apply_details rad ON rad.id = rid.repair_id
+                 LEFT JOIN tm_task tt1 on rad.task_id = tt1.task_id
+        WHERE
+            mm.ma_status = '5' and mm.qr_code = #{qrCode}
+    </select>
+
     <insert id="batchInsertRepairInputDetails" parameterType="com.bonus.common.biz.domain.repair.RepairInputDetails">
         insert into repair_input_details
         (task_id, audit_id, repair_id, ma_id, type_id, repair_num, input_num, create_by, create_time,