1.修复预验收库库存查询问题

2.修复分页失败问题
3.UDI码流向查询添加时间排序

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -92,7 +92,6 @@ public class StockOrderDetailController {
         }
 
         StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk());
-        String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code");
         List<StockOrderDetailEntity> stockOrderDetailEntityList
                 = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
@@ -460,10 +459,8 @@ public class StockOrderDetailController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/order/detail/filterProduct")
     public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
-
+        String nameCode;
-
+        UdiEntity udiEntity;
-        String nameCode = null;
-        UdiEntity udiEntity = null;
         if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
             udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
             if (udiEntity != null) {
@@ -485,33 +482,37 @@ public class StockOrderDetailController {
         companyProductRelevanceRequest.setIsDisable(false);
         List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
+
+        PageInfo<UdiRelevanceResponse> pageInfo2 = null;
         if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
             companyProductRelevanceRequest.setCustomerId(null);
             companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
             basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
         } else {
-            basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
+            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            pageInfo2 = new PageInfo<>(udiRelevanceResponses);
+            if (!pageInfo2.getList().isEmpty()) {
+                basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size());
+                for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) {
+                    CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
+                    BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
+                    companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
+                    basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
+                }
+            }
         }
         PageInfo<CompanyProductRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
         PageSimpleResponse<CompanyProductRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        if (null != pageInfo2) {
+            pageSimpleResponse.setTotal(pageInfo2.getTotal());
+        } else {
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+        }
         pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    public List<CompanyProductRelevanceResponse> getHosDatas(FilterUdiInfoRequest filterUdiInfoRequest) {
-        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
-        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = new ArrayList<>();
-        for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
-            CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
-            BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
-            companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
-            basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
-        }
-        return basicInstrumentMaintainRelevanceResponses;
-    }
-
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/order/detail/copy")
     public BaseResponse uploadCount(@RequestParam("id") String id) {

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java

@@ -7,7 +7,6 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.constant.Constant;
 import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.constant.ConstantType;
-import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvProductEntity;
 import com.glxp.api.admin.req.inout.DeleteRequest;
@@ -18,7 +17,6 @@ import com.glxp.api.admin.res.inventory.InvProductDetailResponse;
 import com.glxp.api.admin.res.inventory.InvProductPageRespnonse;
 import com.glxp.api.admin.res.inventory.InvProductResponse;
 import com.glxp.api.admin.res.inventory.InvProductStatResponse;
-import com.glxp.api.admin.service.info.CompanyService;
 import com.glxp.api.admin.service.inventory.InvPreInProductDetailService;
 import com.glxp.api.admin.service.inventory.InvPreInProductService;
 import com.glxp.api.common.enums.ResultEnum;
@@ -38,13 +36,10 @@ import java.util.List;
 @RestController
 public class InvPreInProductsController {
 
-
     @Resource
     InvPreInProductService invProductService;
     @Resource
     InvPreInProductDetailService invProductDetailService;
-    @Resource
-    private CompanyService companyService;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/prein/inv/products/filter")

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java

@@ -17,9 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailService {
@@ -103,7 +101,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
     public InvProductDetailEntity statInvPreInDetail(String code) {
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
         filterInvProductDetailRequest.setOriginCode(code);
-
+        filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT);
         List<InvProductDetailEntity> datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
         if (CollUtil.isEmpty(datas)) {
             filterInvProductDetailRequest.setOriginCode(null);

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -587,6 +587,7 @@
         <foreach collection="orderList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        order by actDate
     </select>
 
     <select id="selectByBillNo" resultType="com.glxp.api.admin.entity.inout.OrderEntity">