Merge remote-tracking branch 'origin/dev' into dev

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

@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -137,7 +134,7 @@ public class UdiTraceController {
         if (filterCodeTraceRequest.getCode() == null) {
             return ResultVOUtils.success();
         }
-        System.out.println(filterCodeTraceRequest+"---------------------------------------------");
+        System.out.println(filterCodeTraceRequest + "---------------------------------------------");
         UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode());
         if (udiEntity == null) {
             return ResultVOUtils.error(500, "无效条码");
@@ -205,8 +202,6 @@ public class UdiTraceController {
                 mInvProductDetailEntities.addAll(invProductDetailEntities);
             }
         }
-
-
         if (mInvProductDetailEntities.size() > 0) {
             Map<String, String> filterMap = new HashMap<>();
 
@@ -222,6 +217,7 @@ public class UdiTraceController {
             filterOrderRequest.setPage(filterCodeTraceRequest.getPage());
             filterOrderRequest.setLimit(filterCodeTraceRequest.getLimit());
             List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
+            Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime));
             PageInfo<IoOrderResponse> pageInfo;
             pageInfo = new PageInfo<>(orderEntities);
             PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -213,7 +213,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         }
         List<InvPreInProductDetailEntity> datas =
                 invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode));
+                        .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
+                        .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo), "batchNo", "")));
 
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {

src/main/java/com/glxp/api/task/VailInvTask.java

@@ -24,8 +24,8 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Slf4j
-@Component
-@Transactional(rollbackFor = Exception.class)
+//@Component
+//@Transactional(rollbackFor = Exception.class)
 public class VailInvTask implements SchedulingConfigurer {