新购入库二级列表优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java

@@ -147,6 +147,9 @@ public class PurchaseCheckDetails extends BaseEntity {
     @ApiModelProperty(value = "管理方式(0编号 1计数)")
     private Integer manageType;
 
+    @ApiModelProperty(value = "机具编码")
+    private String maCode;
+
     /** 验收附件列表 */
     //@Excel(name = "验收附件列表")
     @ApiModelProperty(value = "验收附件列表")

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.bonus.common.biz.enums.PurchaseTaskStatusEnum;
 import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.basic.domain.BmFileInfo;
@@ -74,14 +75,20 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
         if (purchaseCheckInfo != null) {
             purchaseCheckDtoResult.setPurchaseCheckInfo(purchaseCheckInfo);
             boolean isAllowPartTransfer = bmConfigService.isBmConfigEnabledWithDefaultFalse(BmConfigItems.BOOLEAN_ALLOW_PURCHASE_PART_TRANSFER);
-            List<PurchaseCheckDetails> purchaseCheckDetails;
+            List<PurchaseCheckDetails> purchaseCheckDetailsList;
             if (isAllowPartTransfer) {
-                purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
+                purchaseCheckDetailsList = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
+                if (purchaseQueryDto.getStatusList().contains(PurchaseTaskStatusEnum.TO_STORE.getStatus())) {
+                    purchaseCheckDetailsList = purchaseCheckDetailsList.stream()
+                            .filter(o -> MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(o.getManageType()) ||
+                                    MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(o.getManageType()) && StringUtils.isNotEmpty(o.getMaCode()))
+                            .collect(Collectors.toList());
+                }
             } else {
                 purchaseQueryDto.setStatusList(null);
-                purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
+                purchaseCheckDetailsList = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
             }
-            purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetails);
+            purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetailsList);
         }
         return purchaseCheckDtoResult;
     }
@@ -191,8 +198,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
             TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId(),
                     PurchaseTaskStatusEnum.TO_NOTICE.getStatus(),
                     purchaseCheckInfo.getPurchaseCheckInfo().getCompanyId(), "1", thisMonthMaxOrder + 1, taskCode);
-            //tmTask.setMonthOrder(thisMonthMaxOrder);
-            //tmTask.setCode(genderTaskCode(purchaseCheckInfo, thisMonthMaxOrder));
             tmTask.setCreateTime(DateUtils.getNowDate());
             tmTaskMapper.insertTmTask(tmTask);
             Long taskId = tmTask.getTaskId();

bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="companyId"    column="company_id"    />
         <result property="fixCode"    column="fix_code"    />
         <result property="manageType"    column="manage_type"    />
+        <result property="maCode"    column="ma_code"    />
     </resultMap>
 
     <sql id="selectPurchaseCheckDetailsVo">
@@ -44,10 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_tax_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result,
                pcd.supplier_id, pcd.status, pcd.create_by, pcd.production_time, pcd.create_time, pcd.update_by, pcd.update_time,
                pcd.remark, pcd.check_url_name, pcd.check_url, pcd.input_num, pcd.input_status, pcd.input_time, pcd.file_name,
-               pcd.file_url, pcd.company_id, pcd.fix_code, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name, mt.manage_type as manage_type
+               pcd.file_url, pcd.company_id, pcd.fix_code, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name, mt.manage_type as manage_type,pmi.ma_code
         from purchase_check_details pcd
         left join ma_type mt on pcd.type_id = mt.type_id
         left join ma_type mtp on mt.parent_id = mtp.type_id
+        left join purchase_macode_info pmi on pcd.task_id=pmi.task_id and pcd.type_id=pmi.type_id
     </sql>
 
     <select id="selectPurchaseCheckDetailsList" parameterType="com.bonus.material.purchase.domain.PurchaseCheckDetails" resultMap="PurchaseCheckDetailsResult">
@@ -109,9 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productionTime != null">
             and pcd.production_time between #{startTime} and #{endTime}
         </if>
-<!--        <if test="taskStatus != null and taskStatus != ''">-->
-<!--            and pcd.status = #{taskStatus}-->
-<!--        </if>-->
         <if test="statusList != null and statusList.size() > 0">
             and pcd.status in
             <foreach item="item" collection="statusList" open="(" separator="," close=")">
@@ -301,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" index="index" separator=",">
                 (#{item.taskId},#{item.typeId},#{item.purchasePrice},#{item.purchaseTaxPrice},
              #{item.purchaseNum},#{item.checkNum},#{item.bindNum},#{item.checkResult},#{item.supplierId},
-             #{item.status},#{item.productionTime},#{item.createBy},#{item.createTime},#{item.updateBy},
+             #{item.status},#{item.productionTime},#{item.createBy},NOW(),#{item.updateBy},
              #{item.updateTime},#{item.remark},#{item.checkUrlName},#{item.checkUrl},#{item.inputNum},
              #{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId},#{item.fixCode})
         </foreach>