1.修复预验收单据查询错误问题

api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantType.java

@@ -18,8 +18,8 @@ public interface ConstantType {
     String TYPE_CODE_DESTORY = "CodeDestory";    //码注销
     String TYPE_STOCK_CHECK = "StockCheck"; //盘点
 
-    String TYPE_PUT = "WareHouseIn";             //出库
-    String TYPE_OUT = "WareHouseOut";             //入库
+    String TYPE_PUT = "WareHouseIn";             //入库
+    String TYPE_OUT = "WareHouseOut";             //出库
 
 
     String TYPE_IN_CONSIGN = "ConsignWareHouseIn"; //寄售入库

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.ConstantStatus;
-import com.glxp.sale.admin.constant.ConstantType;
 import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
 import com.glxp.sale.admin.dao.inout.CodesTempDao;
 import com.glxp.sale.admin.dao.inout.OrderDao;
@@ -791,14 +790,10 @@ public class OrderController {
         if (StrUtil.isEmpty(code) && StrUtil.isEmpty(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        List<OrderEntity> orderEntities = new ArrayList<>();
-
-        if (StrUtil.isNotEmpty(code)) {
-
+        Set<OrderEntity> orderEntities = new HashSet<>();
         //查询预验收单据类型
         BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
-            bussinessTypeFilterRequest.setPreIn(true);
-            bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
+        bussinessTypeFilterRequest.setCheckPreIn(true);
         List<BussinessTypResponse> bussinessTypResponses = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
 
         List<String> actions = new ArrayList<>();
@@ -820,15 +815,12 @@ public class OrderController {
             }
         }
 
+        ArrayList<OrderEntity> result = CollUtil.newArrayList(orderEntities);
 
-        } else {
-            orderEntities = orderService.filterPreInChange(billNo);
-        }
-
-        PageInfo<OrderEntity> pageInfo = new PageInfo<>(orderEntities);
+        PageInfo<OrderEntity> pageInfo = new PageInfo<>(result);
         PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(orderEntities);
+        pageSimpleResponse.setList(result);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 

api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java

@@ -27,4 +27,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private String ids;
     private List<String> actionList;
     private Boolean preIn;
+
+    private Boolean checkPreIn;
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -380,8 +380,9 @@ public class OrderServiceImpl implements OrderService {
             orderId = stockOrderEntity.getOrderIdFk();
         }
         OrderEntity orderEntity = orderDao.selectByBillNo(orderId);
+        if (null != orderEntity) {
             orderEntities.add(orderEntity);
-        if (StrUtil.isNotEmpty(orderEntity.getPreInBillNo())) {
+            if (StrUtil.isNotBlank(orderEntity.getPreInBillNo())) {
                 String[] priInNo = orderEntity.getPreInBillNo().split(";");
                 if (priInNo != null) {
                     for (int i = 0; i < priInNo.length; i++) {
@@ -400,7 +401,7 @@ public class OrderServiceImpl implements OrderService {
                     }
                 }
             }
-
+        }
         return orderEntities;
     }
 

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -115,6 +115,9 @@
             <if test="secCheckEnable != ''and secCheckEnable != null">
                 AND basic_bussiness_type.secCheckEnable =#{secCheckEnable}
             </if>
+            <if test="checkPreIn != null">
+                AND (basic_bussiness_type.scanPreIn = true or basic_bustype_local.preIn = true)
+            </if>
             <if test="actionList != null and actionList.size() >0">
                 <foreach collection="actionList" item="action" open="AND (" separator="AND" close=")">
                     basic_bussiness_type.action &lt;&gt; #{action,jdbcType=VARCHAR}