接口优化

bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java

@@ -136,48 +136,40 @@ public class StoreLogAspect {
             // 领料出库库存变化
             if (joinPoint.getArgs()[0] instanceof LeaseOutRequestVo) {
                 LeaseOutRequestVo lod = (LeaseOutRequestVo) joinPoint.getArgs()[0];
-                //数量类型设备
-                for (LeaseOutDetails leaseOutDetails : lod.getLeaseOutDetailsList()) {
-                    if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) {
-                        BmStorageLog bmStorageLog = new BmStorageLog();
-                        bmStorageLog.setTaskId(String.valueOf(leaseOutDetails.getParentId()));
-                        bmStorageLog.setTypeId(leaseOutDetails.getTypeId());
-                        bmStorageLog.setTypeName(leaseOutDetails.getTypeModelName());
-                        bmStorageLog.setManageType(String.valueOf(leaseOutDetails.getManageType()));
-                        bmStorageLog.setTypeModelName(leaseOutDetails.getTypeName());
-                        bmStorageLog.setPreStoreNum(leaseOutDetails.getPreStoreNum());
-                        bmStorageLog.setOutNum(leaseOutDetails.getInputNum());
-                        bmStorageLog.setPostStoreNum(leaseOutDetails.getPostStoreNum());
-                        bmStorageLog.setOutType(InputOutEnum.NUMBER_DEVICE.getTypeId());
-                        bmStorageLogList.add(bmStorageLog);
-                    }
-                }
-                //编码、二维码、标准箱类型设备
                 LeaseOutDetails leaseOutDetails = lod.getLeaseOutDetailsList().get(0);
                 BmStorageLog bmStorageLog = new BmStorageLog();
-                bmStorageLog.setTaskId(String.valueOf(leaseOutDetails.getParentId()));
+                bmStorageLog.setTaskId(leaseOutDetails.getTaskId());
                 bmStorageLog.setTypeId(leaseOutDetails.getTypeId());
-                bmStorageLog.setTypeName(leaseOutDetails.getTypeName());
+                bmStorageLog.setTypeName(leaseOutDetails.getTypeModelName());
                 bmStorageLog.setManageType(String.valueOf(leaseOutDetails.getManageType()));
-                bmStorageLog.setTypeModelName(leaseOutDetails.getTypeModelName());
+                bmStorageLog.setTypeModelName(leaseOutDetails.getTypeName());
-                String maCode = lod.getLeaseOutDetailsList().stream()
-                        .map(LeaseOutDetails::getMaCode)
-                        .filter(Objects::nonNull)
-                        .collect(Collectors.joining(","));
-                bmStorageLog.setMaCode(maCode);
                 bmStorageLog.setPreStoreNum(leaseOutDetails.getPreStoreNum());
-                bmStorageLog.setOutNum(BigDecimal.valueOf(lod.getLeaseOutDetailsList().size()));
+                //数量类型设备
-                bmStorageLog.setPostStoreNum(leaseOutDetails.getPreStoreNum().subtract(bmStorageLog.getOutNum()));
+                if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) {
-                if (leaseOutDetails.getOutType() != null) {
+                    bmStorageLog.setOutNum(leaseOutDetails.getInputNum());
-                    if (leaseOutDetails.getOutType().equals(InputOutEnum.STANDARD_BOX.getTypeId())) {
+                    bmStorageLog.setPostStoreNum(leaseOutDetails.getPreStoreNum().subtract(bmStorageLog.getOutNum()));
-                        bmStorageLog.setOutType(InputOutEnum.STANDARD_BOX.getTypeId());
+                    bmStorageLog.setOutType(InputOutEnum.NUMBER_DEVICE.getTypeId());
-                    } else if (leaseOutDetails.getOutType().equals(InputOutEnum.QR_CODE.getTypeId())) {
+                    bmStorageLogList.add(bmStorageLog);
-                        bmStorageLog.setOutType(InputOutEnum.QR_CODE.getTypeId());
+                } else {
+                    //编码、二维码、标准箱类型设备
+                    String maCode = lod.getLeaseOutDetailsList().stream()
+                            .map(LeaseOutDetails::getMaCode)
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.joining(","));
+                    bmStorageLog.setMaCode(maCode);
+                    bmStorageLog.setOutNum(BigDecimal.valueOf(lod.getLeaseOutDetailsList().size()));
+                    bmStorageLog.setPostStoreNum(leaseOutDetails.getPreStoreNum().subtract(bmStorageLog.getOutNum()));
+                    if (leaseOutDetails.getOutType() != null) {
+                        if (leaseOutDetails.getOutType().equals(InputOutEnum.STANDARD_BOX.getTypeId())) {
+                            bmStorageLog.setOutType(InputOutEnum.STANDARD_BOX.getTypeId());
+                        } else if (leaseOutDetails.getOutType().equals(InputOutEnum.QR_CODE.getTypeId())) {
+                            bmStorageLog.setOutType(InputOutEnum.QR_CODE.getTypeId());
+                        }
+                    } else if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) {
+                        bmStorageLog.setOutType(InputOutEnum.CODE_DEVICE.getTypeId());
                     }
-                } else if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) {
+                    bmStorageLogList.add(bmStorageLog);
-                    bmStorageLog.setOutType(InputOutEnum.CODE_DEVICE.getTypeId());
                 }
-                bmStorageLogList.add(bmStorageLog);
             }
             // 新购验收任务
             if (joinPoint.getArgs()[0] instanceof PurchaseDto) {

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java

@@ -29,6 +29,8 @@ public class LeaseOutDetails extends BaseEntity {
     @ApiModelProperty(value = "任务ID")
     private Long parentId;
 
+    private String taskId;
+
     @ApiModelProperty(value = "标准箱ID")
     private Long boxId;
 

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

@@ -184,6 +184,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
                     }
                     // 5、插入结算记录
                     String taskId = leaseApplyInfoMapper.getTaskId(record.getParentId());
+                    record.setTaskId(taskId);
                     res = insSltInfo(taskId, record);
                     if (res == 0) {
                         throw new RuntimeException("出库失败,插入结算记录失败");

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml

@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
             mm.ma_code
         ORDER BY
-            bai.agreement_code,lod.id
+            bcd.create_time
     </select>
 
     <select id="getInputRecordList" resultType="com.bonus.material.basic.domain.InputRecordInfo">
@@ -280,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>
+        order by bs.create_time desc
     </select>
 
     <select id="getOutRecordList" resultType="com.bonus.material.basic.domain.OutRecordInfo">
@@ -340,6 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>
+        order by bs.create_time desc
     </select>
 
     <select id="getRetainedEquipmentList" resultType="com.bonus.material.basic.domain.RetainedEquipmentInfo">