Merge remote-tracking branch 'origin/master'

11 months ago · 08a9a5a2a4
40 changed files with 558 additions and 122 deletions
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
@ -62,6 +62,8 @@ public class AppOrderDetailsVo implements Vo {
    private AppOrderPriceInfoVo priceInfo;
    @ApiModelProperty(value = "上装信息")
    private AppOrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "挂车信息")
+    private List<AppOrderTrailerInfoVo> trailerInfo = new ArrayList<>();
    @ApiModelProperty(value = "主车优惠")
    private List<AppOrderDiscountListVo> discountList = new ArrayList<>();
    @ApiModelProperty(value = "订金信息")
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java
@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class AppOrderTrailerInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
+}
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@ -104,6 +104,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
@ -3849,6 +3851,33 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper

            vo.setTopMessage(topMessage);
        }
+        /***************************挂车信息***************************************/
+        List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
+        List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
+        for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
+            BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile");
+                List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
+                List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
+                ArrayList<String> contractFileString = new ArrayList<>();
+                ArrayList<String> certFileString = new ArrayList<>();
+                for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
+                    contractFileString.add(busSalesOrderTrailerFile.getUrl());
+                }
+                for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
+                    certFileString.add(busSalesOrderTrailerFile.getUrl());
+                }
+            appOrderTrailerInfoVo.setContractFile(contractFileString);
+            appOrderTrailerInfoVo.setCertFile(certFileString);
+            appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m");
+            appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount())));
+            appOrderTrailerInfoVos.add(appOrderTrailerInfoVo);
+        }
+        for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
+            appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
+        }
+        vo.setTrailerInfo(appOrderTrailerInfoVos);
        /***************************主车优惠***************************************/
        List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
        discountList.removeAll(Collections.singleton(null));
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java
@ -76,6 +76,8 @@ public class SolutionssVo implements Vo {
    private String discountCar;
    @ApiModelProperty("是否勾选其它融")
    private boolean otherPolicyState;
+    @ApiModelProperty("是否修改挂车信息")
+    private boolean noEditTrailer = true;
    /**************************其他融*********************************/
    private boolean otherPolicyIsMain;
    @ApiModelProperty("其它融名称")
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@ -8,7 +8,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
@ -59,13 +62,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
    private LoanSolutionsDetailService loanSolutionsDetailService;
    @Autowired
    private BusSalesOrderFeign busSalesOrderFeign;
-
+    @Autowired
+    private BusSalesOrderModelFeign busSalesOrderModelFeign;
    @Autowired
    private FlowTaskFeign flowTaskFeign;
    @Autowired
    private LoanFinPolicyService loanFinPolicyService;
    @Autowired
    private LoanFinOtherPolicyService loanFinOtherPolicyService;
+    @Autowired
+    private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign;

    public ResultBean<SolutionsDetailsVo> selectDetails(String saleOrderSid) {
        ResultBean<SolutionsDetailsVo> rb = ResultBean.fireFail();
@ -1915,6 +1921,27 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
            solutionssVo.setFinanceForms(formList);
        }
        solutionssVo.setBusSid(busSid);
+        //挂车
+        BusSalesOrderModel busSalesOrderModel = busSalesOrderModelFeign.fetchByOrderSid(busSid).getData();
+        if (busSalesOrderModel != null){
+            if (busSalesOrderModel.getModelName().contains("牵引车")){
+                List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(busSid).getData();
+                if (data != null && data.size() > 0){
+                    BigDecimal total = new BigDecimal("0");
+                    for (BusSalesOrderTrailerDetailsVo datum : data) {
+                        total = total.add(datum.getSingleFinalPrice().multiply(new BigDecimal(datum.getTrailerCount())));
+                    }
+                    solutionssVo.setTrailerAmountCb(true);
+                    solutionssVo.setTrailerAmount(total.toString());
+                }else {
+                    solutionssVo.setTrailerAmountCb(false);
+                    solutionssVo.setTrailerAmount("");
+                }
+            }else {
+                solutionssVo.setTrailerAmountCb(false);
+                solutionssVo.setTrailerAmount("");
+            }
+        }
        return rb.success().setData(solutionssVo);
    }

--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
@ -1,6 +1,7 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;

 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@ -54,6 +55,8 @@ public class OrderDetailsVo implements Vo {
    private OrderPriceInfoVo priceInfo;
    @ApiModelProperty(value = "上装信息")
    private OrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "挂车信息")
+    private List<OrderTrailerInfoVo> trailerInfo;
    @ApiModelProperty(value = "主车优惠")
    private List<OrderDiscountListVo> discountList;
    @ApiModelProperty(value = "订金信息")
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java
@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class OrderTrailerInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
+}
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java
@ -67,6 +67,9 @@ public class AppSolutionVo {
    @ApiModelProperty("是否勾选其它融")
    private boolean otherPolicyState;

+    @ApiModelProperty("是否修改挂车信息")
+    private boolean noEditTrailer = true;
+
    @ApiModelProperty("首付款比例")
    private String downPayRatio;
    @ApiModelProperty("首付金额")
--- a/yxt-as-ui/src/api/Common/dictcommons.js
+++ b/yxt-as-ui/src/api/Common/dictcommons.js
@ -58,6 +58,14 @@ export function getButtonPermissions(data) {
  })
 }

+// 获取集团所有在职人员
+export function selectStaffListss() {
+  return request({
+    url: '/portal/v1/sysstaffinfo/selectStaffListss',
+    method: 'get'
+  })
+}
+
 // 根据当前登录用户的全路径查询相应部门下的所有人
 export function selAllByOrgSidPath(data) {
  return request({
--- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
+++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
@ -193,16 +193,16 @@ export default {
        if (res.success) {
          this.formobj.createOrgSid = res.data
          this.formobj.useOrgSid = res.data
-          choiceSupplierInfo({ orgSid: res.data }).then((resp) => {
-            if (resp.success) {
-              this.supplier_list = resp.data
-            }
-          })
+        }
+      })
+      choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+        if (resp.success) {
+          this.supplier_list = resp.data
        }
      })
    },
    showAdd() {
-      this.viewTitle = '【新增】采购单'
+      this.viewTitle = '【新增】索赔单开票申请'
      this.$nextTick(() => {
        this.$refs['form_obj'].clearValidate()
      })
@ -228,7 +228,7 @@ export default {
      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
    },
    showEdit(row) {
-      this.viewTitle = '【编辑】采购单'
+      this.viewTitle = '【编辑】索赔单开票申请'
      this.$nextTick(() => {
        this.$refs['form_obj'].clearValidate()
      })
--- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
@ -205,7 +205,9 @@ export default {
          payTypeValue: '',
          supplierName: '',
          isInvoicing: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
        }
      }
    }
@ -308,6 +310,8 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.menuUrl = this.$route.path
      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
      req.listPage(this.listQuery).then((response) => {
        this.listLoading = false
@ -345,7 +349,9 @@ export default {
          payTypeValue: '',
          supplierName: '',
          isInvoicing: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
        }
      }
      this.init()
--- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
@ -89,10 +89,14 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
              <div class="span-sty">备注</div>
              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.deliveryDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
          </el-row>
          <div v-if="formobj.payTypeValue == '单笔付款'">
            <div class="title">订金及付款申请</div>
@ -371,11 +375,11 @@ export default {
        if (res.success) {
          this.formobj.createOrgSid = res.data
          this.formobj.useOrgSid = res.data
-          choiceSupplierInfo({ orgSid: res.data }).then((resp) => {
-            if (resp.success) {
-              this.supplier_list = resp.data
-            }
-          })
+        }
+      })
+      choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+        if (resp.success) {
+          this.supplier_list = resp.data
        }
      })
    },
@ -490,7 +494,7 @@ export default {
    selectProducts() {
      this.viewState = 2
      const aa = []
-      this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
    },
    backData(value) {
      this.viewState = 1
@ -502,7 +506,7 @@ export default {
            goodSpuSid: e.goodsSpuSid,
            goodsSpuName: e.goodsSpuName,
            goodsSkuSid: e.goodsSkuSid,
-            goodsSkuTitle: '',
+            goodsSkuTitle: e.goodsSpuName,
            goodsSkuCode: e.goodsSkuCode,
            goodsSkuOwnSpec: e.indexes,
            unit: e.goodsUnitName,
--- a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
@ -66,10 +66,14 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
              <div class="span-sty">备注</div>
              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
          </el-row>
          <div v-if="formobj.payTypeValue == '单笔付款'">
            <div class="title">订金及付款申请</div>
--- a/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue
@ -76,7 +76,7 @@ export default {
        current: 1,
        size: 5,
        params: {
-          createOrgSid: '',
+          useOrgSid: '',
          goodsSpuName: '',
          goodsSkuCode: '',
          manufacturerName: ''
@ -129,7 +129,7 @@ export default {
    handleSelectionChange(row) {
      this.sids = row
    },
-    showData(value, createOrgSid) {
+    showData(value, useOrgSid) {
      // const aa = []
      // if (value.length > 0) {
      //   for (var i = 0; i < value.length; i++) {
@ -139,7 +139,7 @@ export default {
      // } else {
      //   this.listQuery.params.saleVehSids = []
      // }``
-      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.params.useOrgSid = useOrgSid
      this.listQuery.current = 1
      this.listQuery.size = 5
      this.listQuery.total = 0
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
@ -108,6 +108,10 @@
    <purchasereturnAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
    <!-- 详情 -->
    <purchasereturnInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 流程审批记录 -->
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
  </div>
 </template>

@ -189,7 +193,9 @@ export default {
          purchaseReasonValue: '',
          payTypeValue: '',
          supplierName: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
        }
      }
    }
@ -292,6 +298,8 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.menuUrl = this.$route.path
      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
      req.listPage(this.listQuery).then((response) => {
        this.listLoading = false
@ -329,7 +337,9 @@ export default {
          purchaseReasonValue: '',
          payTypeValue: '',
          supplierName: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
        }
      }
      this.init()
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
@ -71,7 +71,7 @@
              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
            </el-col>
            <el-col :span="8">
-              <div v-show="originalmessage.isInvoicing == '1'">
+              <div v-show="originalmessage.isInvoicing == '是'">
                <div class="span-sty">发票类型(税率)</div>
                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
              </div>
@ -123,12 +123,12 @@
          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
-            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
            <el-table-column prop="unit" label="单位" align="center" width="100" />
            <el-table-column prop="count" label="采购数量" align="center" width="100" />
-            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
-            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '是'" label="含税单价" align="center" width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
            <el-table-column label="退货数量" align="center" min-width="100">
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue
@ -68,7 +68,7 @@
              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
            </el-col>
            <el-col :span="8">
-              <div v-show="originalmessage.isInvoicing == '1'">
+              <div v-show="originalmessage.isInvoicing == '是'">
                <div class="span-sty">发票类型(税率)</div>
                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
              </div>
@ -118,12 +118,12 @@
          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
-            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
            <el-table-column prop="unit" label="单位" align="center" width="100" />
            <el-table-column prop="count" label="采购数量" align="center" width="100" />
-            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
-            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '是'" label="含税单价" align="center" width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
            <el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
@ -69,10 +69,14 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
              <div class="span-sty">备注</div>
              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
          </el-row>
          <div v-if="formobj.payTypeValue == '单笔付款'">
            <div class="title">订金及付款申请</div>
@ -201,6 +205,7 @@

 <script>
 import req from '@/api/purchase/procurement'
+import { selectStaffListss } from '@/api/Common/dictcommons'

 export default {
  name: 'ProcurementDaiBan',
@ -388,6 +393,11 @@ export default {
          }
        }
      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
    },
    // 加签
    openCountersign(val) {
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
@ -88,10 +88,14 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
              <div class="span-sty">备注</div>
              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.deliveryDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
          </el-row>
          <div v-if="formobj.payTypeValue == '单笔付款'">
            <div class="title">订金及付款申请</div>
@ -394,7 +398,7 @@ export default {
        if (res.success) {
          this.formobj = res.data
          this.formobj.instanceId = res.data.procInstId
-          choiceSupplierInfo({ orgSid: this.formobj.createOrgSid }).then((resp) => {
+          choiceSupplierInfo({ deptSid: this.formobj.deptSid }).then((resp) => {
            if (resp.success) {
              this.supplier_list = resp.data
            }
@ -481,7 +485,7 @@ export default {
    selectProducts() {
      this.viewState = 2
      const aa = []
-      this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
    },
    backData(value) {
      this.viewState = 1
@ -493,7 +497,7 @@ export default {
            goodSpuSid: e.goodsSpuSid,
            goodsSpuName: e.goodsSpuName,
            goodsSkuSid: e.goodsSkuSid,
-            goodsSkuTitle: '',
+            goodsSkuTitle: e.goodsSpuName,
            goodsSkuCode: e.goodsSkuCode,
            goodsSkuOwnSpec: e.indexes,
            unit: e.goodsUnitName,
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
@ -66,10 +66,14 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="24">
+            <el-col :span="16">
              <div class="span-sty">备注</div>
              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
          </el-row>
          <div v-if="formobj.payTypeValue == '单笔付款'">
            <div class="title">订金及付款申请</div>
--- a/yxt-as-ui/src/views/workFlow/caigouFlow/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/workFlow/caigouFlow/relation/chooseproducts.vue
@ -76,7 +76,7 @@ export default {
        current: 1,
        size: 5,
        params: {
-          createOrgSid: '',
+          useOrgSid: '',
          goodsSpuName: '',
          goodsSkuCode: '',
          manufacturerName: ''
@ -129,7 +129,7 @@ export default {
    handleSelectionChange(row) {
      this.sids = row
    },
-    showData(value, createOrgSid) {
+    showData(value, useOrgSid) {
      // const aa = []
      // if (value.length > 0) {
      //   for (var i = 0; i < value.length; i++) {
@ -139,7 +139,7 @@ export default {
      // } else {
      //   this.listQuery.params.saleVehSids = []
      // }``
-      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.params.useOrgSid = useOrgSid
      this.listQuery.current = 1
      this.listQuery.size = 5
      this.listQuery.total = 0
--- a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue
@ -71,7 +71,7 @@
              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
            </el-col>
            <el-col :span="8">
-              <div v-show="originalmessage.isInvoicing == '1'">
+              <div v-show="originalmessage.isInvoicing == '是'">
                <div class="span-sty">发票类型(税率)</div>
                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
              </div>
@ -121,12 +121,12 @@
          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
-            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
            <el-table-column prop="unit" label="单位" align="center" width="100" />
            <el-table-column prop="count" label="采购数量" align="center" width="100" />
-            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
-            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '是'" label="含税单价" align="center" width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
            <el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
@ -190,6 +190,7 @@

 <script>
 import req from '@/api/purchase/purchasereturn'
+import { selectStaffListss } from '@/api/Common/dictcommons'

 export default {
  name: 'PurchaseReturnDaiBan',
@ -368,6 +369,11 @@ export default {
          this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
        }
      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
    },
    // 加签
    openCountersign(val) {
--- a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue
@ -70,7 +70,7 @@
              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
            </el-col>
            <el-col :span="8">
-              <div v-show="originalmessage.isInvoicing == '1'">
+              <div v-show="originalmessage.isInvoicing == '是'">
                <div class="span-sty">发票类型(税率)</div>
                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
              </div>
@ -122,12 +122,12 @@
          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
-            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
            <el-table-column prop="unit" label="单位" align="center" width="100" />
            <el-table-column prop="count" label="采购数量" align="center" width="100" />
-            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
-            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '是'" label="含税单价" align="center" width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
            <el-table-column label="退货数量" align="center" min-width="100">
--- a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue
@ -68,7 +68,7 @@
              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
            </el-col>
            <el-col :span="8">
-              <div v-show="originalmessage.isInvoicing == '1'">
+              <div v-show="originalmessage.isInvoicing == '是'">
                <div class="span-sty">发票类型(税率)</div>
                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
              </div>
@ -118,12 +118,12 @@
          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
-            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
            <el-table-column prop="unit" label="单位" align="center" width="100" />
            <el-table-column prop="count" label="采购数量" align="center" width="100" />
-            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
-            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '是'" label="含税单价" align="center" width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
            <el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
--- a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
@ -178,6 +178,7 @@

 <script>
 import req from '@/api/operation/workslrsettlement'
+import { selectStaffListss } from '@/api/Common/dictcommons'

 export default {
  name: 'WorkSLRSettlementDaiBan',
@ -366,6 +367,11 @@ export default {
          }
        }
      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
    },
    // 加签
    openCountersign(val) {
--- a/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue
@ -126,6 +126,7 @@

 <script>
 import req from '@/api/operation/arrearsleavefactory'
+import { selectStaffListss } from '@/api/Common/dictcommons'

 export default {
  name: 'ArrearsLeaveFactoryDaiBan',
@ -251,6 +252,11 @@ export default {
          }
        }
      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
    },
    // 加签
    openCountersign(val) {
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
@ -112,6 +112,7 @@

 <script>
 import req from '@/api/operation/claimbilling'
+import { selectStaffListss } from '@/api/Common/dictcommons'

 export default {
  name: 'ClaimBillingDaiBan',
@ -228,6 +229,11 @@ export default {
          }
        }
      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
    },
    cellStyle({ row, column, rowIndex, columnIndex }) {
      // 定义样式变量
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
@ -205,7 +205,7 @@ export default {
  },
  methods: {
    showInfo(sid) {
-      this.viewTitle = '【编辑】采购单'
+      this.viewTitle = '【编辑】索赔单开票申请'
      this.$nextTick(() => {
        this.$refs['form_obj'].clearValidate()
      })
@ -213,7 +213,7 @@ export default {
        if (res.success) {
          this.formobj = res.data
          this.formobj.instanceId = res.data.procInstId
-          choiceSupplierInfo({ orgSid: this.formobj.createOrgSid }).then((resp) => {
+          choiceSupplierInfo({ deptSid: this.formobj.createDeptSid }).then((resp) => {
            if (resp.success) {
              this.supplier_list = resp.data
            }
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java
@ -89,9 +89,9 @@ public class PmsSupplierInfoRest {

 	@ApiOperation("选择供应商")
 	@PostMapping("/choiceSupplierInfo")
-	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("orgSid") String orgSid){
+	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("deptSid") String deptSid){
 		ResultBean rb = ResultBean.fireFail();
-		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(orgSid);
+		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(deptSid);
 		return rb.success().setData(baseSupplierInfoChoiceList);
 	}
 }
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
@ -27,6 +27,7 @@
 		ON ppb.`sourceBillSid` = pb.`sid`
 		LEFT JOIN pms_purchaseback_detail ppd
 		ON ppb.`sid` = ppd.`billSid`
+		LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
@ -80,4 +80,7 @@ public class PmsPurchasebackBillQuery implements Query {

    @ApiModelProperty("组织全路径")
    private String orgPath;
+    private String userSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
 }
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
@ -37,6 +37,7 @@ import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
 import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBill;
 import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillService;
+import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillVo;
 import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillDetailsVo;
 import com.yxt.pms.feign.base.Rule;
 import com.yxt.pms.feign.flowable.flow.*;
@ -51,6 +52,8 @@ import com.yxt.pms.feign.message.MessageFlowableQuery;
 import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.pms.feign.privilege.PrivilegeQuery;
+import com.yxt.pms.feign.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@ -96,13 +99,51 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 	private FlowFeign flowFeign;
 	@Autowired
 	private MessageFeign messageFeign;
+	@Autowired
+	private SysUserFeign sysUserFeign;
 	
 	public PagerVo<PmsPurchasebackBillVo> listPageVo(PagerQuery<PmsPurchasebackBillQuery> pq) {
 		PmsPurchasebackBillQuery query = pq.getParams();
 		QueryWrapper<PmsPurchasebackBill> qw = new QueryWrapper<>();
-		String orgPath = query.getOrgPath();
-		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-		qw.eq("ppb.createOrgSid", createOrgSid);
+		//========================================数据授权开始
+		if (StringUtils.isNotBlank(query.getMenuUrl())) {
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgPath());
+			privilegeQuery.setMenuUrl(query.getMenuUrl());
+			privilegeQuery.setUserSid(query.getUserSid());
+			ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+			if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+				//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+				String orgSidPath = query.getOrgPath();
+				orgSidPath = orgSidPath + "/";
+				int i1 = orgSidPath.indexOf("/");
+				int i2 = orgSidPath.indexOf("/", i1 + 1);
+				int i3 = orgSidPath.indexOf("/", i2 + 1);
+				int i4 = orgSidPath.indexOf("/", i3 + 1);
+				String orgLevelKey = defaultIdReltBean.getData();
+				if ("1".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i1);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("2".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i2);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("3".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i3);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("4".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i4);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("5".equals(orgLevelKey)) {
+					qw.eq("ppb.createBySid", query.getUserSid());
+				} else {
+					PagerVo<PmsPurchasebackBillVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<PmsPurchasebackBillVo> p = new PagerVo<>();
+				return p;
+			}
+		}
 		if (StringUtils.isNotBlank(query.getCreateOrgName())) {
 			qw.like("ppb.createOrgName", query.getCreateOrgName());
 		}
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
@ -109,10 +109,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
 	@ApiModelProperty("采购员姓名")
    private String purchaserName;
    @ApiModelProperty("预计到货日期")
-    @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss",
-            timezone = "GMT+8"
-    )
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date deliveryDate;
 	@ApiModelProperty("运费")
    private BigDecimal freight;
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
@ -99,10 +99,7 @@ public class PmsPurchaseBillDto implements Dto {
 	@ApiModelProperty("采购员姓名")
    private String purchaserName;
    @ApiModelProperty("预计到货日期")
-    @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss",
-            timezone = "GMT+8"
-    )
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date deliveryDate;
 	@ApiModelProperty("运费")
    private BigDecimal freight;
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
@ -27,6 +27,7 @@
 		ON ppbi.`billSid` = ppb.`sid`
 		LEFT JOIN pms_purchase_bill_detail ppbd
 		ON ppbd.`billSid` = ppb.`sid`
+		LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
@ -82,4 +82,7 @@ public class PmsPurchaseBillQuery implements Query {

    @ApiModelProperty("组织全路径")
    private String orgPath;
+    private String userSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
 }
--- 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
@ -31,6 +31,7 @@ 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.core.result.ResultBean;
 import com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillService;
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
@ -59,6 +60,8 @@ import com.yxt.pms.feign.message.MessageFlowableQuery;
 import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.pms.feign.privilege.PrivilegeQuery;
+import com.yxt.pms.feign.sysuser.SysUserFeign;
 import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDetailDto;
 import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDto;
 import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillFeign;
@ -68,11 +71,13 @@ 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;

 /**
@ -117,13 +122,52 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
    private MessageFeign messageFeign;
    @Autowired
    private WmsAnsBillFeign wmsAnsBillFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+

    public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) {
        PmsPurchaseBillQuery query = pq.getParams();
        QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
-        String orgPath = query.getOrgPath();
-        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        qw.eq("ppb.createOrgSid", createOrgSid);
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("ppb.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<PmsPurchaseBillVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<PmsPurchaseBillVo> p = new PagerVo<>();
+                return p;
+            }
+        }
        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
            qw.like("ppb.createOrgName", query.getCreateOrgName());
        }
@ -366,16 +410,31 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
            updateFlowFiled(BeanUtil.beanToMap(ufVo));
            //极光推送
            pmsPurchaseBill = fetchBySid(businessSid);
-            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-            MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(ufVo, messageFlowVo);
-            messageFlowableQuery.setUfVo(messageFlowVo);
-            messageFlowableQuery.setAppMap(appMap);
-            messageFlowableQuery.setBusinessSid(businessSid);
-            messageFlowableQuery.setModuleName("采购单申请");
-            messageFlowableQuery.setMsgContent(pmsPurchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-            messageFlowableQuery.setMsgTitle("采购单申请");
-            messageFeign.pushMessage(messageFlowableQuery);
+            //==================================添加线程
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                PmsPurchaseBill purchaseBill = pmsPurchaseBill;
+                Future future1 = pool.submit(() -> {
+                    //极光推送
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap(appMap);
+                    messageFlowableQuery.setBusinessSid(businessSid);
+                    messageFlowableQuery.setModuleName("采购单申请");
+                    messageFlowableQuery.setMsgContent(purchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("采购单申请");
+                    messageFeign.pushMessage(messageFlowableQuery);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //==================================添加线程
            return voResultBean;
        }
        if (r == 2) {
@ -494,18 +553,33 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
            } else {
                //极光推送
                pmsPurchaseBill = fetchBySid(businessSid);
-                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo, messageFlowVo);
-                ufVo.setProcDefId(pmsPurchaseBill.getProcDefId());
-                ufVo.setProcInsId(pmsPurchaseBill.getProcInstId());
-                messageFlowableQuery.setUfVo(messageFlowVo);
-                messageFlowableQuery.setAppMap(appMap);
-                messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("采购单申请");
-                messageFlowableQuery.setMsgContent(pmsPurchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                messageFlowableQuery.setMsgTitle("采购单申请");
-                messageFeign.pushMessage(messageFlowableQuery);
+                //==================================添加线程
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    PmsPurchaseBill purchaseBill = pmsPurchaseBill;
+                    Future future1 = pool.submit(() -> {
+                        //极光推送
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        ufVo.setProcDefId(purchaseBill.getProcDefId());
+                        ufVo.setProcInsId(purchaseBill.getProcInstId());
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap(appMap);
+                        messageFlowableQuery.setBusinessSid(businessSid);
+                        messageFlowableQuery.setModuleName("采购单申请");
+                        messageFlowableQuery.setMsgContent(purchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle("采购单申请");
+                        messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                //==================================添加线程
            }
            return rb.success().setData(resultBean.getData());
        } else {
@ -568,26 +642,41 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                updateFlowFiled(map);
                //极光推送
                pmsPurchaseBill = fetchBySid(businessSid);
-                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo, messageFlowVo);
-                String procId = pmsPurchaseBill.getProcInstId();
-                ufVo.setProcInsId(procId);
-                ufVo.setProcDefId(pmsPurchaseBill.getProcDefId());
-                messageFlowableQuery.setUfVo(messageFlowVo);
-                messageFlowableQuery.setAppMap(appMap);
-                messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("采购单申请");
-                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
-                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
-                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(pmsPurchaseBill.getCreateBySid())) {
-                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
-                } else {
-                    messageFlowableQuery.setMsgContent(pmsPurchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                //==================================添加线程
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    PmsPurchaseBill purchaseBill = pmsPurchaseBill;
+                    Future future1 = pool.submit(() -> {
+                        //极光推送
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        String procId = purchaseBill.getProcInstId();
+                        ufVo.setProcInsId(procId);
+                        ufVo.setProcDefId(purchaseBill.getProcDefId());
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap(appMap);
+                        messageFlowableQuery.setBusinessSid(businessSid);
+                        messageFlowableQuery.setModuleName("采购单申请");
+                        ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                        String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(purchaseBill.getCreateBySid())) {
+                            messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                        } else {
+                            messageFlowableQuery.setMsgContent(purchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        }
+                        messageFlowableQuery.setMsgTitle("采购单申请");
+                        messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
                }
-                messageFlowableQuery.setMsgTitle("采购单申请");
-                messageFeign.pushMessage(messageFlowableQuery);
+                //==================================添加线程
                return rb.success();
            }
        }
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java
@ -57,8 +57,8 @@ public interface PmsSupplierInfoMapper extends BaseMapper<PmsSupplierInfo> {
 	@Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}")
    int updateBySidIsDelete(String sid);

-	@Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'")
-    List<PmsSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
+	@Select("select * from yxt_base.base_supplier_info where useOrgSid = #{deptSid} and isDelete = '0'")
+    List<PmsSupplierInfoChoice> choiceSupplierInfo(String deptSid);

 	@Select("select * from yxt_base.base_supplier_info where sid = #{sid} and isDelete = '0'")
    PmsSupplierInfo selBySid(String sid);
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
@ -187,8 +187,8 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 		}
 	}

-	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String orgSid) {
-		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(orgSid);
+	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String deptSid) {
+		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(deptSid);
 		for (PmsSupplierInfoChoice pmsSupplierInfoChoice : pmsSupplierInfoChoiceList) {
 			List<PmsSupplierBankChoice> pmsSupplierBankChoices = new ArrayList<>();
 			List<PmsSupplierBankDetailsVo> pmsSupplierBankDetailsVos = pmsSupplierBankService.selectBySupplierSid(pmsSupplierInfoChoice.getSid());
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java
@ -31,7 +31,7 @@ public class WmsAnsBillDetail extends BaseEntity {
    @ApiModelProperty("计量单位")
    private String unit;
    @ApiModelProperty("单位成本（采购价）")
-    private String cost;
+    private BigDecimal cost;
    @ApiModelProperty("预约数量（采购订单数量）")
    private String orderCount;
    @ApiModelProperty("待入库数量-根据收货单计算")