Merge branch 'master' into test

2 years ago · fd41fcc4db
parent c85552a97a 94118141b5
commit fd41fcc4db
41 changed files with 561 additions and 133 deletions
--- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
+++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
@ -15,7 +15,7 @@ public enum BasicExportTypeEnum {
    /**
     * 国家库DI数据
     */
-    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
+//    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),

    /**
     * 单据类型
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@ -35,9 +35,7 @@ import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;

@ -108,6 +106,42 @@ public class IoOrderController extends BaseController {
        return ResultVOUtils.page(pageInfo);
    }

+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/order/filterList")
+    public BaseResponse filterOrderList(FilterOrderRequest filterOrderRequest) {
+
+
+        if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
+            orderService.setFilterStatus(filterOrderRequest);
+        }
+        if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
+            orderService.setActions(filterOrderRequest);
+        }
+
+        if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
+            orderService.setInvoiceFiltes(filterOrderRequest);
+        }
+
+        if (filterOrderRequest.getSourceLocalType() != null) {
+            if (filterOrderRequest.getSourceLocalType() == 1) {
+                filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));
+            } else {
+                filterOrderRequest.setSourceTypes(Arrays.asList(6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
+            }
+        }
+
+        String customerId = getCustomerId();
+        if (!customerId.equals("110")) {
+            filterOrderRequest.setFromCorp(customerId);
+        }
+        List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
+
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+
+

    @AuthRuleAnnotation("")
    @GetMapping("/udiwms/inout/preInorder/filter")
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;


 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@ -13,21 +14,24 @@ import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.controller.BaseController;
-import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
-import com.glxp.api.entity.basic.*;
+import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.entity.purchase.PurOrderEntity;
-import com.glxp.api.entity.purchase.SupProductEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
-import com.glxp.api.req.inout.*;
+import com.glxp.api.req.inout.AddBizProductReqeust;
+import com.glxp.api.req.inout.BizBindUpdateRequest;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
-import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
@ -45,12 +49,13 @@ import com.glxp.api.service.thrsys.ThrOrderService;
 import com.glxp.api.service.thrsys.ThrSystemBusApiService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
-import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;

 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@ -505,6 +510,15 @@ public class IoOrderDetailBizController extends BaseController {
        return ResultVOUtils.page(pageInfo);
    }

+    @GetMapping("/udiwms/inout/bizDetail/filterListInv")
+    public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
+        ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
+        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
    @GetMapping("/udiwms/inout/bizDetail/filterListInvoice")
    public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) {
        List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(orderDetailBizRequest);
@ -535,14 +549,33 @@ public class IoOrderDetailBizController extends BaseController {
    /**
     * 删除发票表
     *
-     * @param id
+     * @param
     * @return
     */
-    @GetMapping("/udiwms/inout/biz/deleteById")
+    @PostMapping("/udiwms/inout/biz/deleteById")
    @Log(title = "发票管理", businessType = BusinessType.DELETE)
-    public BaseResponse deleteById(Integer id) {
+    public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
+
+        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId());
+        //更改 登记状态
+        IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
+
+        FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
+
+        filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
+
+        ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
+
+        ioOrderDetailBizEntity.setId(ioOrderInvoiceEntity.getRegId());
+
+        List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest);
+        if(list == null && list.size()==0){
+            ioOrderDetailBizEntity.setRegStatus(false);
+        }
+        orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+        return ResultVOUtils.success();
+

-        return ResultVOUtils.success(ioOrderInvoiceService.deleteByInvId(id));

    }

@ -575,12 +608,22 @@ public class IoOrderDetailBizController extends BaseController {
        ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
        ioOrderInvoiceEntity.setCreateTime(new Date());
        ioOrderInvoiceEntity.setUpdateTime(new Date());
+        ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
        boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);

        return ResultVOUtils.success("成功");

    }

+    @PostMapping("/udiwms/inout/biz/updateorderBiz")
+    public BaseResponse updateorderBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+        ioOrderDetailBizEntity.setRegStatus(true);
+        orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+
+        return ResultVOUtils.success("成功");
+
+    }
+
    /**
     * 查询单据业务详情列表
     *
@ -592,7 +635,7 @@ public class IoOrderDetailBizController extends BaseController {
        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
        for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) {
            String msg = "";
-            IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
+            IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk());
            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
            for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
@ -0,0 +1,62 @@
+package com.glxp.api.controller.inout;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
+import com.glxp.api.http.sync.SpGetHttpClient;
+import com.glxp.api.idc.service.FileService;
+import com.glxp.api.req.inout.AddBizProductReqeust;
+import com.glxp.api.req.inout.RefreshInoiceRequest;
+import com.glxp.api.service.inout.IoOrderInvoiceService;
+import com.glxp.api.service.inout.IoOrderService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+public class IoOrderInvoiceController {
+    @Resource
+    IoOrderInvoiceMapper orderInvoiceMapper;
+    @Resource
+    SpGetHttpClient spGetHttpClient;
+    @Resource
+    FileService fileService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/order/refrshInvoice")
+    @Log(title = "发票", businessType = BusinessType.INSERT)
+    public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
+        BaseResponse<List<IoOrderInvoiceEntity>> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
+        if (baseResponse.getCode() == 20000) {
+            List<IoOrderInvoiceEntity> orderInvoiceEntities = baseResponse.getData();
+            if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
+                List<String> syncFiles = new ArrayList<>();
+                for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+                    if (StrUtil.isNotEmpty(orderInvoiceEntity.getLicenseUrl())) {
+                        syncFiles.add(orderInvoiceEntity.getLicenseUrl());
+                    }
+                    orderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
+                }
+
+                if (CollUtil.isNotEmpty(syncFiles)) {
+                    fileService.download(syncFiles);
+                }
+            }
+
+            return ResultVOUtils.success("更新成功！");
+        } else
+            return baseResponse;
+
+
+    }
+}
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
@ -20,6 +20,8 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
     */
    List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest);

+    List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
+
    /**
     * 查询单据实体列表
     *
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
@ -19,6 +19,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
     */
    List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);

+    List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+
    List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);

    /**
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java
@ -3,6 +3,7 @@ package com.glxp.api.dao.inout;

 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
+import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import org.apache.ibatis.annotations.Mapper;

 import java.util.List;
@ -12,5 +13,6 @@ public interface IoOrderInvoiceMapper extends BaseMapperPlus<IoOrderInvoiceMappe

    boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);

-    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
+    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceEntity);
+
 }
--- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
@ -197,4 +197,7 @@ public class IoOrderDetailBizEntity {
    @TableField(exist = false)
    private String errMsg;

+    @TableField(value = "regStatus")
+    private boolean regStatus;
+
 }
--- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java
@ -4,16 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;

 import java.util.Date;

-import lombok.Data;
-
@Data
@TableName(value = "io_order_invoice")
 public class IoOrderInvoiceEntity {
    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;

    /**
     * 订单号外键
@ -106,6 +105,9 @@ public class IoOrderInvoiceEntity {
    @TableField(value = "bizIdFk")
    private Integer bizIdFk;

+    @TableField(exist = false)
+    private Integer  regId;
+
    public static final String COL_ID = "id";

    public static final String COL_ORDERIDFK = "orderIdFk";
--- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java
+++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java
@ -67,6 +67,6 @@ public class SyncDataSetEntity {
    private int companyCert;
    private int manufacturerCert;
    private int productCert;
-
+    private int orderInvoice;       //发票信息

 }
--- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
+++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
@ -10,11 +10,13 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BasicExportTypeEnum;
 import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.IOOrderStatusEntity;
 import com.glxp.api.entity.system.SyncDataSetEntity;
 import com.glxp.api.idc.service.FileService;
 import com.glxp.api.req.basic.ProductInfoFilterRequest;
+import com.glxp.api.req.inout.RefreshInoiceRequest;
 import com.glxp.api.req.inout.ReviewFinishRequest;
 import com.glxp.api.req.inout.ReviewSpmsRequest;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
@ -122,6 +124,16 @@ public class SpGetHttpClient {
        return response;
    }

+
+    public BaseResponse<List<IoOrderInvoiceEntity>> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) {
+        String json = JSONUtil.toJsonStr(refreshInoiceRequest);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader());
+        BaseResponse<List<IoOrderInvoiceEntity>> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<List<IoOrderInvoiceEntity>>>() {
+                });
+        return response;
+    }
+
    //验收自助平台单据--直连接口
    public BaseResponse<String> reviewOrder(ReviewFinishRequest reviewFinishRequest) {
        String json = JSONUtil.toJsonStr(reviewFinishRequest);
@ -214,7 +226,7 @@ public class SpGetHttpClient {
    }


-    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type,String status) {
+    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type, String status) {
        Map<String, String> paramMap = new HashMap<>(16);
        paramMap.put("type", type);
        paramMap.put("status", status);
--- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java
@ -33,6 +33,7 @@ public class FilterReceiveRequest extends ListPageRequest {
    private Integer status;
    private String corpName;
    private String billAction;
+    private String targetInvCode;

    private Integer type;

--- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
@ -19,7 +19,7 @@ import java.util.List;
@Data
 public class IoOrderInvoiceRequest {

-    private Integer id;
+    private Long id;


    private String orderIdFk;
--- a/src/main/java/com/glxp/api/req/inout/RefreshInoiceRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/RefreshInoiceRequest.java
@ -0,0 +1,11 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+@Data
+public class RefreshInoiceRequest {
+    private Long id;
+    private String orderIdFk;
+    private Long bizIdFk;
+
+}
--- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
@ -8,7 +8,7 @@ import java.util.Date;
@Data
@TableName(value = "io_order_invoice")
 public class IoOrderInvoiceResponse {
-    private Integer id;
+    private Long id;

    /**
     * 订单号外键
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@ -108,7 +108,7 @@ public class IoOrderResponse {
    /**
     * ID
     */
-    private Long customerId;
+    private String customerId;

    /**
     * 部门编码
--- a/src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java
+++ b/src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java
@ -2,6 +2,7 @@ package com.glxp.api.res.sync;

 import com.glxp.api.entity.inout.IoCodeLostEntity;
 import com.glxp.api.entity.inout.IoCodeRelEntity;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import lombok.Data;

 import java.util.List;
@ -12,4 +13,5 @@ public class SpsSyncOtherDataResponse extends BaseSyncResponse {

    List<IoCodeLostEntity> ioCodeLostList;
    List<IoCodeRelEntity> ioCodeRelList;
+    List<IoOrderInvoiceEntity> ioOrderInvoiceEntities;
 }
--- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java
+++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java
@ -58,4 +58,5 @@ public class SyncDataSetResponse {
    private int companyCert;
    private int manufacturerCert;
    private int productCert;
+    private int orderInvoice;       //发票信息
 }
--- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
@ -238,7 +238,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                break;
            case Constant.ORDER_ACTION_SUP_INVOICE:
                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                        .eq("mainAction", ConstantType.TYPE_PUT)
                        .gt("spUse", 0).eq("actionType", 1).eq("enable", true));
                break;

@ -255,7 +255,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                break;
            case Constant.ORDER_ACTION_SUP_PREIN:
                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2));
+                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
+                        .eq("inStock", true));

            default:
                break;
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@ -119,7 +119,7 @@ public class IoAddInoutService {
                    basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
                    basicCorpEntity.setName(orderEntity.getFromCorp());
                    basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
-                    basicCorpService.insertBasicUnitMaintain(basicCorpEntity);
+                    basicCorpService.insert(basicCorpEntity);
                }
                orderEntity.setFromCorp(basicCorpEntity.getErpId());
                orderEntity.setUpdateTime(new Date());
--- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java
@ -2,6 +2,7 @@ package com.glxp.api.service.inout;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
@ -156,7 +157,7 @@ public class IoChangeInoutService {
        Map<String, List<IoCodeEntity>> filterSupMaps = new HashMap<>();
        BasicBussinessTypeEntity targetBustypeEntity = basicBussinessTypeService.findByAction(bussinessChangeTypeEntity.getAction());
        //过滤供应商
-        if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
+        if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT || bussinessChangeTypeEntity.getCreateType() == 3 || bussinessChangeTypeEntity.getCreateType() == 4) {
            for (IoCodeEntity warehouseEntity : useInList) {
                if (warehouseEntity.getSupId() != null) {
                    if (filterSupMaps.get(warehouseEntity.getSupId()) == null) {
@ -259,9 +260,9 @@ public class IoChangeInoutService {
                if (CollUtil.isNotEmpty(invoiceEntities)) {
                    for (IoOrderInvoiceEntity orderInvoiceEntity : invoiceEntities) {
                        orderInvoiceEntity.setOrderIdFk(outOrder.getBillNo());
-                        orderInvoiceEntity.setId(null);
                        orderInvoiceEntity.setBizIdFk(null);
                        orderInvoiceEntity.setUpdateTime(new Date());
+                        orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
                        ioOrderInvoiceService.insertInvoice(orderInvoiceEntity);
                    }
                }
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@ -720,6 +720,10 @@ public class IoCheckInoutService {
                    if (!bussinessTypeEntity.isThrCheckCopy()) {
                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
                    }
+                } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
+                    if (!bussinessTypeEntity.isThrCheckSp()) {
+                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
+                    }
                }
            } else {
                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
@ -773,6 +777,10 @@ public class IoCheckInoutService {
                    if (!bussinessTypeEntity.isSecCheckCopy()) {
                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
                    }
+                } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
+                    if (!bussinessTypeEntity.isSecCheckSp()) {
+                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
+                    }
                }
            } else {
                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
--- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java
@ -101,6 +101,7 @@ public class IoGenInvService {
            BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
            invProductDetailEntity.setRelId(codeEntity.getRelId());
            invProductDetailEntity.setUpdateTime(new Date());
+            invProductDetailEntity.setId(null);
            invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
            if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());
@ -171,6 +172,7 @@ public class IoGenInvService {
            BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
            invProductDetailEntity.setRelId(codeEntity.getRelId());
            invProductDetailEntity.setUpdateTime(new Date());
+            invProductDetailEntity.setId(null);
            invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
            if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());
@ -252,6 +254,7 @@ public class IoGenInvService {
            BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
            invProductDetailEntity.setRelId(codeEntity.getRelId());
            invProductDetailEntity.setUpdateTime(new Date());
+            invProductDetailEntity.setId(null);
            invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
            if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());
--- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
@ -35,6 +35,8 @@ public interface IoOrderDetailBizService {

    List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);

+    List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+
    IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);

    List<IoOrderDetailBizEntity> checkOrderList(String orderId);
--- a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java
@ -1,11 +1,13 @@
 package com.glxp.api.service.inout;

+import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;

 import java.util.List;

-public interface IoOrderInvoiceService {
+public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {


    List<IoOrderInvoiceEntity> findByBillNo(String billNo);
@ -16,7 +18,7 @@ public interface IoOrderInvoiceService {

    boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);

-    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
+    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest);


 }
--- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
@ -57,6 +57,8 @@ public interface IoOrderService {
     */
    List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest);

+    List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
+
    /**
     * 查询单据列表
     *
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
@ -115,6 +115,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
        return ioOrderDetailBizDao.filterList(orderDetailBizRequest);
    }

+    @Override
+    public List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        if (null == orderDetailBizRequest) {
+            return Collections.emptyList();
+        }
+        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.getfilterList(orderDetailBizRequest);
+    }
+
    @Override
    public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) {
        QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java
@ -1,7 +1,10 @@
 package com.glxp.api.service.inout.impl;

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.inout.IoCodeRelMapper;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
+import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import org.springframework.beans.BeanUtils;
@ -16,7 +19,7 @@ import java.util.List;

@Service
@Transactional(rollbackFor = Exception.class)
-public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
+public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper, IoOrderInvoiceEntity> implements IoOrderInvoiceService {
    @Resource
    IoOrderInvoiceMapper ioOrderInvoiceMapper;

@ -45,7 +48,7 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
    }

    @Override
-    public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
-        return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceEntity);
+    public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
+        return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest);
    }
 }
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@ -546,6 +546,17 @@ public class IoOrderServiceImpl implements IoOrderService {
        return orderDao.filterList(filterOrderRequest);
    }

+    @Override
+    public List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest) {
+        if (null == filterOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        }
+        return orderDao.getfilterList(filterOrderRequest);
+    }
+
    @Override
    public List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest) {
        if (null == filterOrderRequest) {
@ -672,9 +683,10 @@ public class IoOrderServiceImpl implements IoOrderService {

    @Override
    public void setInvoiceFiltes(FilterOrderRequest filterOrderRequest) {
+//        .eq("corpType", ConstantStatus.CORP_TYPE_OUT)
        List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                .eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("inStock", false)
+                .eq("mainAction", ConstantType.TYPE_PUT)
+                .eq("inStock", false)
                .gt("spUse", 1).eq("actionType", 1).eq("enable", true));
        List<String> actions1 = null;
        actions1 = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
@ -682,7 +694,7 @@ public class IoOrderServiceImpl implements IoOrderService {
            filterOrderRequest.setInvoiceActions1(actions1);

        List<BasicBussinessTypeEntity> bussinessTypeEntities2 = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                .eq("mainAction", ConstantType.TYPE_PUT)
                .eq("inStock", true)
                .gt("spUse", 0).eq("actionType", 1).eq("enable", true));
        List<String> actions2 = null;
@ -691,6 +703,7 @@ public class IoOrderServiceImpl implements IoOrderService {
            filterOrderRequest.setInvoiceActions2(actions2);
    }

+
    @Override
    public List<IoOrderEntity> filterOrderTrace(String billNo) {
        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));
--- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java
@ -154,6 +154,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
        response.setActionName(busType.getName());
        //设置单据日期
        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
+        if (order != null)
            response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
    }

--- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
@ -149,6 +149,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
        response.setActionName(busType.getName());
        //设置单据日期
        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
+        if (order != null)
            response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
    }

@ -177,7 +178,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
    @Override
    public InvPreProductDetailEntity findUseOneByCode(String code) {
        List<InvPreProductDetailEntity> invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("code", code)
-                .eq("status", ConstantStatus.INVIN_IN).last("limit 1"));
+                .last("limit 1"));
        if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
            return invPreinDetailEntities.get(0);
        }
--- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
@ -163,6 +163,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
        response.setActionName(busType.getName());
        //设置单据日期
        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
+        if (order != null)
            response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
    }

--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@ -15,6 +15,7 @@ import com.glxp.api.constant.*;
 import com.glxp.api.dao.basic.*;
 import com.glxp.api.dao.inout.IoCodeLostMapper;
 import com.glxp.api.dao.inout.IoCodeRelMapper;
+import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.dao.purchase.*;
 import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
 import com.glxp.api.dto.RelaySyncDto;
@ -1414,6 +1415,14 @@ public class HeartService {
                        basicDownloadStatusEntity.setUpdateTime(new Date());
                        basicDownloadStatusEntity.setEndTime(new Date());
                        basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
+
+                        try {
+                            String fileFullPath = writeFile(filePrefix, NEW_ALL_ORDER, response.getData());
+                            basicDownloadStatusEntity.setCacheFilePath(fileFullPath);
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+
                        basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);


@ -1634,6 +1643,8 @@ public class HeartService {

    private final IoCodeLostMapper ioCodeLostMapper;
    private final IoCodeRelMapper ioCodeRelMapper;
+    @Resource
+    private final IoOrderInvoiceMapper ioOrderInvoiceMapper;

    /**
     * 设置嵌套事物
@ -1645,12 +1656,22 @@ public class HeartService {
        cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
        List<IoCodeLostEntity> ioCodeLostList = JSONUtil.toList(jsonObject.getJSONArray(IoCodeLostEntity.class.getSimpleName()), IoCodeLostEntity.class);
        List<IoCodeRelEntity> ioCodeRelList = JSONUtil.toList(jsonObject.getJSONArray(IoCodeRelEntity.class.getSimpleName()), IoCodeRelEntity.class);
+        List<IoOrderInvoiceEntity> ioOrderInvoiceEntities = JSONUtil.toList(jsonObject.getJSONArray(IoOrderInvoiceEntity.class.getSimpleName()), IoOrderInvoiceEntity.class);
+
        if (CollectionUtil.isNotEmpty(ioCodeLostList)) {
            ioCodeLostMapper.insertOrUpdateBatch(ioCodeLostList);
        }
        if (CollectionUtil.isNotEmpty(ioCodeRelList)) {
            ioCodeRelMapper.insertOrUpdateBatch(ioCodeRelList);
        }
+        if (CollUtil.isNotEmpty(ioOrderInvoiceEntities)) {
+            ioOrderInvoiceMapper.insertOrUpdateBatch(ioOrderInvoiceEntities);
+        }
+
+        List<String> syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class);
+        if (CollUtil.isNotEmpty(syncFiles)) {
+            fileService.download(syncFiles);
+        }
    }


@ -1798,6 +1819,11 @@ public class HeartService {
        if (CollectionUtil.isNotEmpty(bean.getIoCodeRelList())) {
            ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList());
        }
+
+
+//        if (CollectionUtil.isNotEmpty(bean.getI())) {
+//            ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList());
+//        }
    }

    public void insetOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) {
@ -1853,7 +1879,7 @@ public class HeartService {
            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    orderInvoiceEntity.setId(null);
+                    orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
                    orderInvoiceService.insertInvoice(orderInvoiceEntity);
                }
            }
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@ -100,7 +100,7 @@

            <if test="supInoivceSearch != null">
                <if test="invoiceActions1 != null and invoiceActions2 == null">
-                    AND ((`action` in
+                    AND (`action` in
                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                        #{item}
                    </foreach>
@ -108,13 +108,155 @@
                </if>

                <if test="invoiceActions1 == null and invoiceActions2 != null">
+                    and (
+                    `action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 7
+                    )
+                </if>
+
+                <if test="invoiceActions1 != null and invoiceActions2 != null">
+                    AND ((`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 10)
                    or (
                    `action` in
                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                        #{item}
                    </foreach>
+                    and status = 7)
+                    )
+                </if>
+            </if>
+        </where>
+        order by createTime desc
+    </select>
+
+
+    <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        select io.*,
+        (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+        (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+        (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+        (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+        (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+        (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+        (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
+        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+        (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
+        (select name from basic_corp bc where bc.erpId = io.customerId)          customerName,
+        (SELECT count(*) FROM io_order_detail_biz  WHERE io_order_detail_biz.orderIdFk = io.billNo
+        and io_order_detail_biz.regStatus = 1
+        ) AS allCout,
+        (SELECT count(*) FROM io_order_detail_biz  WHERE io_order_detail_biz.orderIdFk = io.billNo
+        and io_order_detail_biz.regStatus = 0
+        ) As partCount
+        from io_order as io
+        <where>
+            <if test="id != null and id != ''">
+                AND id = #{id}
+            </if>
+            <if test="corpName != null and corpName != ''">
+                AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
+                concat('%', #{corpName}, '%')
+            </if>
+            <if test="action != null and action != ''">
+                AND action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND mainAction = #{mainAction}
+            </if>
+            <if test="billNo != null and billNo != ''">
+                AND billNo like concat('%', #{billNo}, '%')
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND corpOrderId = #{corpOrderId}
+            </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND fromCorp = #{fromCorp}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND invCode = #{invCode}
+            </if>
+            <if test="busType != null">
+                AND busType = #{busType}
+            </if>
+            <if test="inCodeStatus != null">
+                AND inCodeStatus = #{inCodeStatus}
+            </if>
+            <if test="relKey != null">
+                AND relKey = #{relKey}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+            <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
+                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
+            </if>
+            <if test="actions != null and actions.size() != 0">
+                AND `action` in
+                <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="sourceTypes != null and sourceTypes.size() != 0">
+                AND fromType in
+                <foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="statuses != null and statuses.size() != 0">
+                AND status in
+                <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dealStatuses != null and dealStatuses.size() != 0">
+                AND dealStatus in
+                <foreach collection="dealStatuses" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="orderIds != null and orderIds.size() != 0">
+                AND io.billNo in
+                <foreach collection="orderIds" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="orderType != null">
+                AND orderType = #{orderType}
+            </if>
+
+            <if test="supInoivceSearch != null">
+                <if test="invoiceActions1 != null and invoiceActions2 == null">
+                    AND (`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 10)
+                </if>
+
+                <if test="invoiceActions1 == null and invoiceActions2 != null">
+                    and (
+                    `action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
                    and status = 7
-                        ))
+                    )
                </if>

                <if test="invoiceActions1 != null and invoiceActions2 != null">
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@ -23,6 +23,30 @@
        group by io_order_detail_biz.id
    </select>

+
+    <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
+        select io_order_detail_biz.*,
+        (select count(*) FROM io_order_invoice where io_order_invoice.orderIdFk=io_order_detail_biz.orderIdFk) as sucCount
+        from io_order_detail_biz
+        left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+        left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relId != null">
+                AND bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="productName != null and productName != ''">
+                AND bp.cpmctymc like concat('%', #{productName}, '%')
+            </if>
+        </where>
+        group by io_order_detail_biz.id
+    </select>
+
    <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
        SELECT ic.*,
        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
--- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
@ -10,11 +10,17 @@
                #{expireDate})
    </insert>

-    <select id="selectOrderInvoice" parameterType="com.glxp.api.entity.inout.IoOrderInvoiceEntity"
+    <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
            resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
        select *
        from io_order_invoice
        <where>
+            <if test="id != null">
+                AND id = #{id}
+            </if>
+            <if test="bizIdFk != null">
+                AND bizIdFk = #{bizIdFk}
+            </if>
            <if test="orderIdFk != null and orderIdFk != ''">
                AND orderIdFk = #{orderIdFk}
            </if>
--- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
@ -28,6 +28,9 @@
            <if test="invCode != null and invCode != ''">
                AND invCode = #{invCode}
            </if>
+            <if test="targetInvCode != null and targetInvCode != ''">
+                AND targetInvCode = #{targetInvCode}
+            </if>
            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
            </if>
--- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml
+++ b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml
@ -9,15 +9,14 @@
    </select>


-
-    <insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity">
+    <insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity" useGeneratedKeys="true">
        insert INTO sync_data_bustypes
-                (`action`, `name`, outChange, orderStatus, direct)
+                (id, `action`, `name`, outChange, orderStatus, direct)
                values

        <foreach collection="syncDataBustypeEntities" item="item" index="index"
                 separator=",">
-            (#{item.action}, #{item.name},
+            (#{item.id}, #{item.action}, #{item.name},
             #{item.outChange}, #{item.orderStatus}, #{item.direct})
        </foreach>
    </insert>
--- a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml
+++ b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml
@ -22,7 +22,7 @@
                                  , unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept
                                  , systemConfig
                                  , printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig
-        , udiCodeLost, udiCodeRel)
+                                  , udiCodeLost, udiCodeRel, orderInvoice)
        values (#{id},
                #{typeBus},
                #{typeScan},
@ -51,6 +51,6 @@
                #{unCheckCert},
                #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept},
                #{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig},
-        #{udiCodeLost}, #{udiCodeRel})
+                #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice})
    </insert>
 </mapper>
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@ -391,3 +391,5 @@ CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
 CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
 CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);