1.同步bug修复

2.解决预验收单据查询出多条的问题

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

@@ -788,6 +788,12 @@ public class OrderController {
         if (StrUtil.isEmpty(code) && StrUtil.isEmpty(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+
+        StockOrderEntity stockOrder = stockOrderService.findByBillNo(billNo);
+        if (null == stockOrder) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "单号错误，数据不存在！");
+        }
+
         Set<OrderEntity> orderEntities = new HashSet<>();
         //查询预验收单据类型
         BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
@@ -800,6 +806,7 @@ public class OrderController {
                 actions.add(bussinessTypResponse.getAction());
             }
             WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+            warehouseQueryRequest.setOrderId(stockOrder.getOrderIdFk());
             warehouseQueryRequest.setCode(code);
             warehouseQueryRequest.setActions(actions);
             List<WarehouseEntity> warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest);

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -124,8 +124,9 @@
         inv_prein_product.batchNo
         ,inv_prein_product.productionDate,inv_prein_product.expireDate,
         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
-        inv_prein_product.inCount,inv_prein_product.outCount
-        ,inv_prein_product.reCount,inv_prein_product.customerId,
+        sum(inv_prein_product.inCount) as inCount,
+        sum(inv_prein_product.outCount) as outCount,
+        sum(inv_prein_product.reCount) as reCount,inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
         invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name
         invSubStorageName,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk