1.修复库存查询功能的bug

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -21,6 +21,7 @@ import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.auth.WarehouseUserService;
 import com.glxp.api.service.inv.InvProductDetailService;
 import com.glxp.api.service.inv.InvProductService;
+import com.glxp.api.util.DateUtil;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
@@ -100,6 +101,18 @@ public class InvProductController {
             });
         }
 
+        //根据单据日期排序
+        list.sort((o1, o2) -> {
+            long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
+            long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
+            if (o1OrderTime > o2OrderTime) {
+                return 1;
+            } else if (o1OrderTime < o2OrderTime) {
+                return -1;
+            }
+            return 0;
+        });
+
         PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);

src/main/java/com/glxp/api/dao/basic/UdiProductDao.java

@@ -53,5 +53,11 @@ public interface UdiProductDao {
      */
     void importUdiInfo(@Param("udiInfoEntities") List<UdiProductEntity> udiInfoEntities);
 
-
+    /**
+     * 查询包装层级
+     *
+     * @param nameCode
+     * @return
+     */
+    Integer selectPackLevel(@Param("nameCode") String nameCode);
 }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -216,6 +216,11 @@ public class IoOrderResponse {
      */
     private Integer exportStatus;
 
+    /**
+     * 校验信息
+     */
+    private String errMsg;
+
 
     public String getFromName() {
 

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -6,17 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
+import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inv.InvProductDetailDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.res.inv.InvProductDetailResponse;
 import com.glxp.api.service.inv.InvProductDetailService;
 import com.glxp.api.util.DateUtil;
-import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,6 +33,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
     private BasicBussinessTypeDao bussinessTypeDao;
     @Resource
     private IoOrderDao orderDao;
+    @Resource
+    private UdiProductDao udiProductDao;
 
 
     @Override
@@ -113,14 +114,29 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
 
     @Override
     public void setOrderInfo(InvProductDetailResponse response) {
+        //查询DI层级，根据DI层级设置数量取值
+        Integer packLevel = udiProductDao.selectPackLevel(response.getNameCode());
         //设置出入库中文及出入库数量
-        if (response.getMainAction().equals(ConstantType.TYPE_OUT)) {
-            response.setMainActionStr("出库");
-            response.setOutCount(response.getCount());
+        if (null != packLevel && packLevel != 1) {
+            //多级包装
+            if (response.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                response.setMainActionStr("出库");
+                response.setOutCount(response.getReCount());
+            } else {
+                response.setMainActionStr("入库");
+                response.setInCount(response.getReCount());
+            }
         } else {
-            response.setMainActionStr("入库");
-            response.setInCount(response.getCount());
+            //单层包装
+            if (response.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                response.setMainActionStr("出库");
+                response.setOutCount(response.getCount());
+            } else {
+                response.setMainActionStr("入库");
+                response.setInCount(response.getCount());
+            }
         }
+
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
         response.setActionName(busType.getName());
@@ -137,7 +153,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         }
         List<InvProductDetailEntity> datas =
                 invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId),"supId", supId).eq("deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode));
+                        .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode));
 
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -392,4 +392,7 @@
         </foreach>
     </select>
 
+    <select id="selectPackLevel" resultType="java.lang.Integer">
+        select packLevel from basic_products where nameCode = #{nameCode} limit 1
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -79,7 +79,7 @@
                 </foreach>
             </if>
         </where>
-        group by ip.relIdFk
+        group by ip.relIdFk, ip.batchNo
         order by ip.updateTime desc
     </select>