配件管理，报废原因功能优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/partArrivedController.java

@@ -162,4 +162,13 @@ public class partArrivedController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 根据任务id查询入库单
+     */
+    @ApiOperation("根据任务id查询入库单")
+    //@RequiresPermissions("purchase:info:query")
+    @GetMapping(value = "/getInBoundForm")
+    public AjaxResult getInBoundForm( PartTypeQueryDto partTypeQueryDto) {
+        return success(partArrivedService.getInBoundForm(partTypeQueryDto));
+    }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java

@@ -109,4 +109,12 @@ public interface PartArrivedMapper
 
     //删除附件文件相关任务文件
     int deleteBmFileList(Long taskId);
+
+    /**
+     * 获取入库单外层信息数据
+     *
+     * @param partTypeQueryDto 外层信息
+     * @return 外层信息
+     */
+    PartTypeCheckInfo getCheckInfoForm(PartTypeQueryDto partTypeQueryDto);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/IPartArrivedService.java

@@ -72,4 +72,12 @@ public interface IPartArrivedService {
      * @return 查询附件列表
      */
     List<BmPartFileInfo> getPartFilelist(BmPartFileInfo bmPartFileInfo);
+
+    /**
+     * 根据任务id查询入库单
+     *
+     * @param partTypeQueryDto 入库单
+     * @return 入库单
+     */
+    PartTypeCheckDto getInBoundForm(PartTypeQueryDto partTypeQueryDto);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java

@@ -319,4 +319,22 @@ public class PartArrivedServiceImpl implements IPartArrivedService
         }
         return list;
     }
+
+    /**
+     * 根据任务id查询入库单
+     *
+     * @param partTypeQueryDto 入库单
+     * @return 入库单
+     */
+    @Override
+    public PartTypeCheckDto getInBoundForm(PartTypeQueryDto partTypeQueryDto) {
+        PartTypeCheckInfo partTypeCheckInfo = partArrivedMapper.getCheckInfoForm(partTypeQueryDto);
+        PartTypeCheckDto PartTypeCheckDto = new PartTypeCheckDto();
+        PartTypeCheckDto.setPartTypeCheckInfo(partTypeCheckInfo);
+        if(null != partTypeCheckInfo){
+            List<PartTypeCheckDetails> partTypeCheckDetailsList = partArrivedMapper.selectPartTypeCheckDetailsListByQueryDto(partTypeQueryDto);
+            PartTypeCheckDto.setPartTypeCheckDetailsList(partTypeCheckDetailsList);
+        }
+        return PartTypeCheckDto;
+    }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapReason.java

@@ -73,7 +73,7 @@ public class ScrapReason extends BaseEntity {
     private Date updateTime;
 
     /** 备注 */
-    @Excel(name = "备注", width = 40)
+//    @Excel(name = "备注", width = 40)
     @ApiModelProperty(value = "备注")
     private String remark;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapReasonServiceImpl.java

@@ -71,8 +71,8 @@ public class ScrapReasonServiceImpl implements IScrapReasonService
     {
         scrapReason.setCreateTime(DateUtils.getNowDate());
         scrapReason.setUpdateTime(DateUtils.getNowDate());
-        scrapReason.setCreateBy(SecurityUtils.getUsername());
+        scrapReason.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
-        scrapReason.setUpdateBy(SecurityUtils.getUsername());
+        scrapReason.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         try {
             return scrapReasonMapper.insertScrapReasonInfo(scrapReason);
         } catch (Exception e) {
@@ -106,7 +106,7 @@ public class ScrapReasonServiceImpl implements IScrapReasonService
     public int updateScrapReasonInfo(ScrapReason scrapReason)
     {
         scrapReason.setUpdateTime(DateUtils.getNowDate());
-        scrapReason.setUpdateBy(SecurityUtils.getUsername());
+        scrapReason.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         try {
             return scrapReasonMapper.updateScrapReasonInfo(scrapReason);
         } catch (Exception e) {

bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml

@@ -197,4 +197,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteBmFileList" parameterType="Long">
         delete from bm_file_info bfi where task_id = #{taskId} and task_type = 13
     </delete>
+
+    <select id="getCheckInfoForm" resultType="com.bonus.material.part.domain.PartTypeCheckInfo">
+        select
+            ppi.id, ppi.task_id as taskId, ppi.purchase_time as purchasePrice, ppi.arrival_time as arrivalTime, ppi.purchaser, ppi.supplier_id as supplierId, ppi.tax_rate as taxRate,
+            ppi.create_by as createBy, ppi.create_time as createTime, ppi.update_by as updateBy, ppi.update_time as updateTime, ppi.remark, ppi.company_id as companyId,
+            t.task_status as taskStatus,t.code,msi.supplier
+        from
+            purchase_part_info ppi
+                left join tm_task t on t.task_id = ppi.task_id
+                left join sys_user su ON ppi.create_by = su.user_id
+                left join ma_supplier_info msi on ppi.supplier_id = msi.supplier_id
+        where ppi.id = #{id}
+    </select>
 </mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapReasonMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectScrapReasonList" resultType="com.bonus.material.scrap.domain.ScrapReason">
         select
         sc.id as id,sc.type_id as typeId,mt.type_name as typeName,mt1.type_id as parentId,mt1.type_name as parentName,
-            sc.update_time as updateTime,sc.update_by as updateBy,sc.reason as reason
+        sc.update_time as updateTime,su.nick_name as updateBy,sc.reason as reason
         from scrap_reason sc
         left join ma_type mt on sc.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 sys_user su on sc.update_by  = su.user_id and su.del_flag = 0
         where  sc.del_flag = 0
 
         <if test="keyWord != null  and keyWord != ''">
@@ -102,9 +103,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-
-
-
     <update id="updateScrapReasonInfo">
         update scrap_reason
         set type_id = #{typeId},