diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
index ee0d5b335c..277e4b038e 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
@@ -34,21 +34,21 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 视图数据详情", description = "付款信息管理 视图数据详情")
 public class FinPaymentDetailsVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
     private String remarks;
     @ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
+    private String companyCode;
     @ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
+    private String companyName;
     @ApiModelProperty("开户行")
-    private String bank; // 开户行
+    private String bank;
     @ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
+    private String receivingAccount;
     @ApiModelProperty("银行简称")
     private String bankShortName;
     @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
index 67e2af2957..a1127d3b68 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
@@ -34,21 +34,21 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 数据传输对象", description = "付款信息管理 数据传输对象")
 public class FinPaymentDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
     private String remarks;
     @ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
+    private String companyCode;
     @ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
+    private String companyName;
     @ApiModelProperty("开户行")
-    private String bank; // 开户行
+    private String bank;
     @ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
+    private String receivingAccount;
     @ApiModelProperty("银行简称")
     private String bankShortName;
     @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
index 63789bc85a..74fe94cfcd 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
@@ -35,19 +35,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-fin(付款信息管理) <br/>
- * File: FinPaymentFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentFeign <br/>
- * Description: 付款信息管理. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 14:27:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "付款信息管理")
 @FeignClient(
         contextId = "anrui-fin-FinPayment",
@@ -79,4 +66,9 @@ public interface FinPaymentFeign {
     @GetMapping("/selectByUseOrgSid")
     @ResponseBody
     public ResultBean<List<FinPaymentDetailsVo>> selectByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
+
+    @ApiOperation("修改平仓款开通日期")
+    @PostMapping("/updateOpenDate")
+    @ResponseBody
+    public ResultBean updateOpenDate(@RequestParam("sid") String sid, @RequestParam("openDate") String openDate);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
index f275105078..d905d0616b 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
@@ -25,26 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpayment;
 
-
 import com.yxt.common.core.query.Query;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-fin(付款信息管理) <br/>
- * File: FinPaymentQuery.java <br/>
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentQuery <br/>
- * Description: 付款信息管理 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 14:27:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "付款信息管理 查询条件", description = "付款信息管理 查询条件")
 public class FinPaymentQuery implements Query {
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
index d2f9be2589..f2fe853473 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
@@ -25,26 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpayment;
 
-
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-fin(付款信息管理) <br/>
- * File: FinPaymentVo.java <br/>
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentVo <br/>
- * Description: 付款信息管理 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 14:27:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "付款信息管理 视图数据对象", description = "付款信息管理 视图数据对象")
 public class FinPaymentVo implements Vo {
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
index b3025515c0..bf50978df7 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpayment;
 
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -32,29 +33,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
-
-import com.yxt.anrui.fin.api.finpayment.FinPayment;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
 
-/**
- * Project: anrui-fin(付款信息管理) <br/>
- * File: FinPaymentFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentRest <br/>
- * Description: 付款信息管理. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 14:27:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "付款信息管理")
 @RestController
 @RequestMapping("v1/finpayment")
@@ -62,6 +47,8 @@ public class FinPaymentRest implements FinPaymentFeign {
 
     @Autowired
     private FinPaymentService finPaymentService;
+    @Autowired
+    private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
 
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
@@ -103,4 +90,11 @@ public class FinPaymentRest implements FinPaymentFeign {
         List<FinPaymentDetailsVo> voList = finPaymentService.selectByUseOrgSid(useOrgSid);
         return rb.success().setData(voList);
     }
+
+    @Override
+    public ResultBean updateOpenDate(String sid, String openDate) {
+        ResultBean rb = ResultBean.fireFail();
+        finPaymentapplyDetailsBelowEveService.updateOpenDate(sid,openDate);
+        return rb.success();
+    }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
index c576bae76d..7a5f7f9aac 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
@@ -35,22 +35,9 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
-
+import org.apache.ibatis.annotations.Update;
 import java.util.List;
 
-/**
- * Project: anrui-fin(平仓) <br/>
- * File: FinPaymentapplyDetailsBelowEveMapper.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveMapper <br/>
- * Description: 付款申请明细-明细-平仓. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 10:03:07 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaymentapplyDetailsBelowEve> {
 
@@ -58,4 +45,7 @@ public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaym
 
     @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
     List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
+
+    @Update("update fin_paymentapply_details_below_eve set openDate = #{openDate} where sid = #{sid}")
+    void updateOpenDate(@Param("sid") String sid,@Param("openDate") String openDate);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
index 583e34d187..ed4c226ce4 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
@@ -224,4 +224,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
     public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
         return baseMapper.selByMainSid(mainSid);
     }
+
+    public void updateOpenDate(String sid, String openDate) {
+        baseMapper.updateOpenDate(sid, openDate);
+    }
 }
\ No newline at end of file
diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 92be4cc8a0..69416603ae 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -313,6 +313,11 @@ BEGIN
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
     -- 销售订单-待交车累计（销售订单已办结且库存状态为库存和在途的）
+/*    --待交车累计总订单台数统计规则：
+1.现车：销售订单总台数-未选车架号台数 2.需采购的销售订单：已选择采购渠道销售订单总台数
+      3.排产中的销售订单：销售订单总台数。
+      4.已出库台数+已退车台数。
+待交车累计总订单台数=1+2+3-4*/
     /* UPDATE daily_report r
          INNER JOIN (select count(bv.id) as scount, bv.useOrgSid, bv.modelSid, bv.modelConfigSid, bo.contractNo
                      from anrui_base.base_vehicle bv
@@ -352,7 +357,7 @@ BEGIN
                                           and bo.useOrgSid = a.useOrgSid
                                           and bm.modelSid = a.modelSid
                                           and bm.modelConfigSid = a.modelConfigSid
-                                          and bo.contractNo = a.contractNo) as ssscount1,
+                                          and bo.contractNo = a.contractNo and (bov.linkSid != '' or bov.linkSid != null)) as ssscount1,
                                        (SELECT count(bov.id) AS scount
                                         FROM anrui_base.base_vehicle bv
                                                  LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
@@ -444,7 +449,7 @@ BEGIN
                                                   d.modelSid,
                                                   d.modelConfigSid,
                                                   d.contractNo
-                                     ) a) b) c
+                                     ) a) b ) c
                     group by c.useOrgSid, c.modelSid, c.modelConfigSid
         ) AS s ON r.useOrgSid = s.useOrgSid
             AND r.vehModelSid = s.modelSid
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
index 79c38335fe..3d4b6f132c 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
@@ -26,15 +26,16 @@
 package com.yxt.pms.biz.pms.pmspurchasebill;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillService;
-import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.pms.biz.pms.pmspurchasebill.flowable.*;
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
@@ -48,7 +49,10 @@ import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
 import com.yxt.pms.biz.pms.pmssupplierinfo.PmsSupplierInfoDetailsVo;
 import com.yxt.pms.biz.pms.pmssupplierinfo.PmsSupplierInfoService;
 import com.yxt.pms.feign.base.Rule;
-import com.yxt.pms.feign.flowable.flow.*;
+import com.yxt.pms.feign.flowable.flow.BusinessVariables;
+import com.yxt.pms.feign.flowable.flow.FlowableFeign;
+import com.yxt.pms.feign.flowable.flow.ProcDefEnum;
+import com.yxt.pms.feign.flowable.flow.UpdateFlowFieldVo;
 import com.yxt.pms.feign.flowable.flow2.FlowDelegateQuery;
 import com.yxt.pms.feign.flowable.flow2.FlowFeign;
 import com.yxt.pms.feign.flowable.flowtask.FlowTaskFeign;
@@ -67,16 +71,10 @@ import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDetailDto;
 import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDto;
 import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillFeign;
 import org.apache.commons.lang3.StringUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
-
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -453,6 +451,9 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 WmsAnsBillDto wmsAnsBillDto = new WmsAnsBillDto();
+                if (StringUtils.isNotBlank(pmsPurchaseBill.getRemarks())) {
+                    wmsAnsBillDto.setRemarks(pmsPurchaseBill.getRemarks());
+                }
                 wmsAnsBillDto.setDeptName(pmsPurchaseBill.getDeptName());
                 wmsAnsBillDto.setDeptSid(pmsPurchaseBill.getDeptSid());
                 wmsAnsBillDto.setCreateBySid(pmsPurchaseBill.getCreateBySid());
@@ -506,6 +507,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                         wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getTaxPrice().toString());
                     }
                     wmsAnsBillDetailDto.setOrderCount(pmsPurchaseBillDetailDetailsVo.getCount().toString());
+                    wmsAnsBillDetailDto.setWaitInCount(pmsPurchaseBillDetailDetailsVo.getCount().toString());
+                    wmsAnsBillDetailDto.setActualInCount("0");
                     if (StringUtils.isNotBlank(taxRate)) {
                         wmsAnsBillDetailDto.setTaxAmount(taxRate);
                     }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java
index 7837eae389..f48773573e 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java
@@ -35,4 +35,8 @@ public class WmsAnsBillDetailDto {
     private String taxPrice;
     @ApiModelProperty("金额")
     private String amount;
+    @ApiModelProperty("待入库数量-根据收货单计算")
+    private String waitInCount;
+    @ApiModelProperty("实际入库数量-根据收货单计算")
+    private String actualInCount;
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java
index 84e269e372..93f6eb646e 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java
@@ -66,4 +66,5 @@ public class WmsAnsBillDto {
     private List<WmsAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
     @ApiModelProperty("采购单税率")
     private String taxRate;
+    private String remarks;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java
index aff5e4e142..f28820f947 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java
@@ -3,11 +3,8 @@ package com.yxt.wms.apiadmin.inventroy;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillQuery;
-import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillVo;
 import com.yxt.wms.biz.inventory.wmsreceiptbill.*;
 import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.ShelfListVo;
-import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +36,7 @@ public class WmsReceiptBillRest {
     @ApiOperation("新增修改保存")
     @PostMapping("/saveOrUpdate")
     ResultBean<String> saveOrUpdate(@RequestBody WmsReceiptBillDto2 dto) {
-        return wmsReceiptBillService.saveOrUpdateBill2(dto);
+        return wmsReceiptBillService.saveOrUpdateBill2(dto,0);
     }
 
     @ApiOperation("收货单终止")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
index eb1ec02242..1d259f92f5 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
@@ -4,7 +4,6 @@ import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -67,4 +66,5 @@ public class WmsAnsBillDto {
     private List<WmsAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
     @ApiModelProperty("采购单税率")
     private String taxRate;
+    private String remarks;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
index 4190052970..86101f0af8 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
@@ -51,7 +51,8 @@
                                   when 2 then '已收货' when 3 then '已收货(部分终止)'
                    end as billState,
                wab.reviewStatus,
-               wab.manufactorBillNo
+               wab.manufactorBillNo,
+               wab.remarks
         from wms_ans_bill wab
         where sid = #{sid}
     </select>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
index d317279d4e..4e8a935976 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java
@@ -202,7 +202,7 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
         ResultBean<WmsAnsDetailsVo> rb = ResultBean.fireFail();
         WmsAnsDetailsVo wmsAnsDetailsVo = baseMapper.details(sid);
         if (wmsAnsDetailsVo != null) {
-            List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sid);
+            List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectDetailsByBillSid(sid);
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
                 wmsAnsDetailsVo.setList(list);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java
index 50d0522f3f..6aafd77ae9 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsDetailsVo.java
@@ -53,7 +53,7 @@ public class WmsAnsDetailsVo {
     private String goodsOwnerSid;
     @ApiModelProperty("货主")
     private String goodsOwner;*/
-
+   private String remarks;
 
     private List<WmsAnsListDetailsVo> list = new ArrayList<>();
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java
index 16beecd80f..56f97e2147 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailDto.java
@@ -3,8 +3,6 @@ package com.yxt.wms.biz.inventory.wmsansbilldetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @description:
  * @author: dimengzhe
@@ -37,4 +35,8 @@ public class WmsAnsBillDetailDto {
     private String taxPrice;
     @ApiModelProperty("金额")
     private String amount;
+    @ApiModelProperty("待入库数量-根据收货单计算")
+    private String waitInCount;
+    @ApiModelProperty("实际入库数量-根据收货单计算")
+    private String actualInCount;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java
index 24fc92ee77..d5946992bb 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java
@@ -20,4 +20,6 @@ public interface WmsAnsBillDetailMapper extends BaseMapper<WmsAnsBillDetail> {
     String selGoodsCountBySpuSidAndSouceSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid);
 
     WmsAnsBillDetail fetchBySpuSidAndBillSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid);
+
+    List<WmsAnsListDetailsVo> selectDetailsByBillSid(String sid);
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml
index 83d2e34e7e..02815ce915 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml
@@ -23,7 +23,7 @@
                wd.goodsSkuSid,
                wd.goodsSpuSid
         from wms_ans_bill_detail wd
-        where billSid = #{sid}
+        where billSid = #{sid} and wd.waitInCount > 0
     </select>
     <select id="selGoodsCountBySpuSidAndSouceSid" resultType="java.lang.String">
         SELECT IFNULL(d.orderCount,0) FROM wms_ans_bill_detail as d
@@ -34,4 +34,23 @@
         SELECT * FROM wms_ans_bill_detail as d
         WHERE d.goodsSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
     </select>
+    <select id="selectDetailsByBillSid"
+            resultType="com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo">
+        select wd.goodsSkuTitle,
+               wd.goodsSkuCode,
+               wd.goodsSkuOwnSpec,
+               wd.goodsSpuName,
+               wd.unit,
+               wd.orderCount,
+               wd.waitInCount,
+               wd.actualInCount,
+               wd.cost,
+               wd.taxAmount,
+               wd.taxPrice,
+               wd.amount,
+               wd.goodsSkuSid,
+               wd.goodsSpuSid
+        from wms_ans_bill_detail wd
+        where billSid = #{sid}
+    </select>
 </mapper>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java
index 257ae0ff54..0accb555ef 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java
@@ -2,7 +2,6 @@ package com.yxt.wms.biz.inventory.wmsansbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -35,4 +34,8 @@ public class WmsAnsBillDetailService extends MybatisBaseService<WmsAnsBillDetail
     public WmsAnsBillDetail fetchBySpuSidAndBillSid(String goodsSpuSid, String sourceBillSid) {
         return baseMapper.fetchBySpuSidAndBillSid(goodsSpuSid,sourceBillSid);
     }
+
+    public List<WmsAnsListDetailsVo> selectDetailsByBillSid(String sid) {
+        return baseMapper.selectDetailsByBillSid(sid);
+    }
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java
index 10d235132a..c15d51003e 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java
@@ -31,4 +31,6 @@ public interface WmsReceiptBillMapper extends BaseMapper<WmsReceiptBill> {
     List<ShelfListVo> getUpShlefListBySid(@Param("sid") String sid);
 
     String selallotmentNumByReceiptDetailSid(String detailsSid);
+
+    int selAnsBillState(@Param("sourceBillSid") String sourceBillSid);
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
index 6986faf40f..41251702ac 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
@@ -93,4 +93,20 @@
         WHERE
             d.receiptDetailSid = #{detailsSid}
     </select>
+    <select id="selAnsBillState" resultType="java.lang.Integer">
+        SELECT
+            CASE
+                WHEN a.orderCount = a.waitInCount AND a.actualInCount = 0 THEN 0
+                WHEN a.orderCount > a.waitInCount AND a.actualInCount > 0 AND a.orderCount != a.actualInCount THEN 1
+                WHEN a.orderCount = a.actualInCount AND a.waitInCount = 0 THEN 2
+                END AS billState
+        FROM
+            (SELECT
+                 IFNULL(SUM(orderCount),0) orderCount,
+                 IFNULL(SUM(waitInCount),0) waitInCount,
+                 IFNULL(SUM(actualInCount),0) actualInCount
+             FROM
+                 wms_ans_bill_detail AS d
+             WHERE d.billSid = #{sourceBillSid}) a
+    </select>
 </mapper>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
index 421c9d0d9f..23e3dea6a3 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
@@ -181,7 +181,13 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         return billNo;
     }
 
-    public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto) {
+    /**
+     *
+     * @param dto
+     * @param type 0 保存，1确认
+     * @return
+     */
+    public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto,int type) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
@@ -198,49 +204,32 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                 for (WmsReceiptBillDetailDto2 detail : list) {
                     String goodsSpuSid = detail.getGoodsSpuSid();
                     String sourceBillSid = dto.getSourceBillSid();
-                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
+//                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
                     WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);
-                    BigDecimal count = new BigDecimal(goodsCount);
-                    if (null != goods) {
-                        BigDecimal orderCount = new BigDecimal(goods.getOrderCount());
-                        BigDecimal accCount = count.add(new BigDecimal(detail.getActualInCount()));
-                        goods.setActualInCount(accCount);
-                        goods.setWaitInCount(orderCount.subtract(accCount));
-                        wmsAnsBillDetailService.updateById(goods);
+//                    BigDecimal count = new BigDecimal(goodsCount);
+                    if (type == 1) {
+                        //确认时，统计预期到货通知单实收数量
+                        if (null != goods) {
+                            BigDecimal waitInCount = goods.getWaitInCount();
+                            BigDecimal actualInCount = goods.getActualInCount();
+                            BigDecimal accCount = actualInCount.add(new BigDecimal(detail.getActualInCount()));
+                            goods.setActualInCount(accCount);
+                            goods.setWaitInCount(waitInCount.subtract(new BigDecimal(detail.getActualInCount())));
+                            wmsAnsBillDetailService.updateById(goods);
+                        }
                     }
                     WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
                     BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
                     wmsReceiptBillDetail.setBillSid(sid);
                     wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
                 }
-                if (StringUtils.isNotBlank(dto.getSourceBillSid())) {
-                    WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
-                    List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
-                    if (!vos.isEmpty()) {
-                        HashSet<Integer> integers = new HashSet<>();
-                        for (WmsAnsListDetailsVo vo : vos) {
-                            BigDecimal count = new BigDecimal("0");
-                            if (StringUtils.isNotBlank(vo.getWaitInCount())) {
-                                count = new BigDecimal(vo.getWaitInCount());
-                            }
-                            if (count.compareTo(BigDecimal.ZERO) <= 0) {
-                                integers.add(2);
-                            } else {
-                                integers.add(1);
-                            }
-                        }
-                        if (integers.size() > 1) {
-                            wmsAnsBill.setBillState(1);
-                        } else {
-                            wmsAnsBill.setBillState(2);
-                            for (Integer integer : integers) {
-                                if (integer == 1) {
-                                    wmsAnsBill.setBillState(1);
-                                }
-                            }
-                        }
+                if (type == 1) {
+                    if (StringUtils.isNotBlank(dto.getSourceBillSid())) {
+                        WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
+                        int billState = selAnsBillState(dto.getSourceBillSid());
+                        wmsAnsBill.setBillState(billState);
+                        wmsAnsBillService.updateById(wmsAnsBill);
                     }
-                    wmsAnsBillService.updateById(wmsAnsBill);
                 }
             }
             wmsReceiptBill.setBillState("0");
@@ -271,49 +260,32 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                 for (WmsReceiptBillDetailDto2 detail : list) {
                     String goodsSpuSid = detail.getGoodsSpuSid();
                     String sourceBillSid = dto.getSourceBillSid();
-                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
+//                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
                     WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);
-                    BigDecimal count = new BigDecimal(goodsCount);
-                    if (null != goods) {
-                        BigDecimal orderCount = new BigDecimal(goods.getOrderCount());
-                        BigDecimal accCount = count.add(new BigDecimal(detail.getActualInCount()));
-                        goods.setActualInCount(accCount);
-                        goods.setWaitInCount(orderCount.subtract(accCount));
-                        wmsAnsBillDetailService.updateById(goods);
+//                    BigDecimal count = new BigDecimal(goodsCount);
+                    if (type == 1) {
+                        //确认时，统计预期到货通知单实收数量
+                        if (null != goods) {
+                            BigDecimal waitInCount = goods.getWaitInCount();
+                            BigDecimal actualInCount = goods.getActualInCount();
+                            BigDecimal accCount = actualInCount.add(new BigDecimal(detail.getActualInCount()));
+                            goods.setActualInCount(accCount);
+                            goods.setWaitInCount(waitInCount.subtract(new BigDecimal(detail.getActualInCount())));
+                            wmsAnsBillDetailService.updateById(goods);
+                        }
                     }
                     WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
                     BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
                     wmsReceiptBillDetail.setBillSid(sid);
                     wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
                 }
-                if (StringUtils.isNotBlank(dto.getSourceBillSid())) {
-                    WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
-                    List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
-                    if (!vos.isEmpty()) {
-                        HashSet<Integer> integers = new HashSet<>();
-                        for (WmsAnsListDetailsVo vo : vos) {
-                            BigDecimal count = new BigDecimal("0");
-                            if (StringUtils.isNotBlank(vo.getWaitInCount())) {
-                                count = new BigDecimal(vo.getWaitInCount());
-                            }
-                            if (count.compareTo(BigDecimal.ZERO) <= 0) {
-                                integers.add(2);
-                            } else {
-                                integers.add(1);
-                            }
-                        }
-                        if (integers.size() > 1) {
-                            wmsAnsBill.setBillState(1);
-                        } else {
-                            wmsAnsBill.setBillState(2);
-                            for (Integer integer : integers) {
-                                if (integer == 1) {
-                                    wmsAnsBill.setBillState(1);
-                                }
-                            }
-                        }
+                if (type == 1) {
+                    if (StringUtils.isNotBlank(dto.getSourceBillSid())) {
+                        WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
+                        int billState = selAnsBillState(dto.getSourceBillSid());
+                        wmsAnsBill.setBillState(billState);
+                        wmsAnsBillService.updateById(wmsAnsBill);
                     }
-                    wmsAnsBillService.updateById(wmsAnsBill);
                 }
 
             }
@@ -322,6 +294,11 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         return rb.success().setData(sid);
     }
 
+    private int selAnsBillState(String sourceBillSid) {
+        return baseMapper.selAnsBillState(sourceBillSid);
+
+    }
+
     public ResultBean<WmsReceiptBillVo> getInitDetails(String sourceSid) {
         ResultBean<WmsReceiptBillVo> rb = ResultBean.fireFail();
         WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo();
@@ -396,10 +373,17 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             for (int i = 0; i < list.size(); i++) {
                 WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
                 wmsReceiptBillDetailDto2.setState(1);
+                //判断确认时，实收数量不能大于待收货数量
+                WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(wmsReceiptBillDetailDto2.getGoodsSpuSid(), dto.getSourceBillSid());
+                BigDecimal waitInCount = goods.getWaitInCount();
+                String actualInCount = wmsReceiptBillDetailDto2.getActualInCount();
+                if (new BigDecimal(actualInCount).compareTo(waitInCount) > 0) {
+                    return rb.setMsg("实收数量请勿大于待收货数量！");
+                }
             }
         }
         dto.setList(list);
-        ResultBean<String> resultBean = saveOrUpdateBill2(dto);
+        ResultBean<String> resultBean = saveOrUpdateBill2(dto,1);
         String sid = resultBean.getData();
         WmsReceiptBill wmsReceiptBill = fetchBySid(sid);
         if (null != wmsReceiptBill) {