Merge remote-tracking branch 'origin/master'

5 months ago · f8a37f5cbc
25 changed files with 199 additions and 72 deletions
--- a/yxt-as-ui/src/api/operation/salesInvoice.js
+++ b/yxt-as-ui/src/api/operation/salesInvoice.js
@ -4,7 +4,7 @@ export default {
  // 查询分页列表
  listPage: function(params) {
    return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
      url: '/as/v1/salesInvoice/listPage',
      method: 'post',
      data: params,
@ -15,7 +15,7 @@ export default {
  },
  saveOrUpdate: function(data) {
    return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
      url: '/as/v1/salesInvoice/saveOrUpdate',
      method: 'post',
      data: data,
@ -26,14 +26,14 @@ export default {
  },
  fetchBySid: function(data) {
    return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
      url: '/as/v1/salesInvoice/fetchDetailsBySid/' + data,
      method: 'get'
    })
  },
  deleteBySids: function(data) {
    return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
      url: '/as/v1/salesInvoice/delBySids',
      method: 'DELETE',
      data: data,
@ -44,7 +44,7 @@ export default {
  },
  submit: function(data) {
    return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
      url: '/as/v1/salesInvoice/submit',
      method: 'post',
      data: data,
@ -56,8 +56,8 @@ export default {

  salesOrderListPage: function(params) {
    return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
-      url: '/as/v1/salesInvoice/salesOrderListPage',
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/sms/apiadmin/v1/smssalesbill/salesInvChoiceBill',
      method: 'post',
      data: params,
      headers: {
--- a/yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
+++ b/yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
@ -20,7 +20,7 @@
                <el-input v-model="listQuery.params.salePerson" placeholder="" clearable />
              </el-form-item>
              <el-form-item label="客户名称" class="searchlist">
-                <el-input v-model="listQuery.params.cusmoterName" placeholder="" clearable />
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
              </el-form-item>
              <el-form-item label="车牌号" class="searchlist">
                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
@ -56,7 +56,7 @@
            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center" />
            <el-table-column prop="saleOrderNo" label="单据编号" align="center" width="170" />
            <el-table-column prop="salePerson" label="配件销售人" align="center" width="120" />
-            <el-table-column prop="cusmoterName" label="客户名称" align="center" min-width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
            <el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
            <el-table-column prop="vinNo" label="车架号" align="center" width="130" />
            <el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
@ -104,7 +104,7 @@
            "deptSid": "",
            "billNo": "",
            "salePerson": "",
-            "cusmoterName": "",
+            "customerName": "",
            "vehMark": "",
            "settleDateStart": "",
            "settleDateEnd": "",
@ -156,7 +156,7 @@
        this.listQuery.total = 0
        this.listQuery.params.billNo = ''
        this.listQuery.params.salePerson = ''
-        this.listQuery.params.cusmoterName = ''
+        this.listQuery.params.customerName = ''
        this.listQuery.params.vehMark = ''
        this.listQuery.params.settleDateStart = ''
        this.listQuery.params.settleDateEnd = ''
--- a/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
+++ b/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
@ -89,7 +89,7 @@
            </el-table-column>
            <el-table-column label="销售单号" prop="saleOrderNo" align="center" />
            <el-table-column label="配件销售人" prop="salePerson" align="center" />
-            <el-table-column label="客户名称" prop="cusmoterName" align="center" />
+            <el-table-column label="客户名称" prop="customerName" align="center" />
            <el-table-column label="车牌号" prop="vehMark" align="center" />
            <el-table-column label="车架号" prop="vinNo" align="center" />
            <el-table-column label="材料费" prop="goodsAmount" align="center" />
--- a/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
+++ b/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
@ -64,7 +64,7 @@
            <el-table-column fixed width="60" label="序号" type="index" :index="index+1" align="center" />
            <el-table-column label="销售单号" prop="saleOrderNo" align="center" />
            <el-table-column label="配件销售人" prop="salePerson" align="center" />
-            <el-table-column label="客户名称" prop="cusmoterName" align="center" />
+            <el-table-column label="客户名称" prop="customerName" align="center" />
            <el-table-column label="车牌号" prop="vehMark" align="center" />
            <el-table-column label="车架号" prop="vinNo" align="center" />
            <el-table-column label="材料费" prop="goodsAmount" align="center" />
--- a/yxt-as-ui/src/views/storage/adjustment/index.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/index.vue
@ -299,7 +299,7 @@
            finishEndTime: '',
          }
        }
-        this.init()
+        this.getList()
      },
      toAdd() {
        this.viewState = 3
--- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
@ -329,9 +329,9 @@
                    type: 'success',
                    message: resp.msg
                  })
-                  this.$confirm('是否继续添加仓库区域信息?', '温馨提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                  this.$confirm('是否继续添加库位信息?', '温馨提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
                    type: 'warning'
                  }).then(() => {
                    // 点击确定进行的操作
--- a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
+++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
@ -15,27 +15,28 @@
              <el-form-item label="库位编码">
                <el-input v-model="queryParams.params.code" placeholder="" clearable />
              </el-form-item>
-              <el-form-item label="所属库区">
-                <el-select v-model="queryParams.params.warehouseAreaName" placeholder="所属库区"
-                  class="addinputw addinputInfo" @change="selectWrehouseAreaChange">
-                  <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName"
+              <el-form-item label="所属仓库">
+                <el-select v-model="queryParams.params.warehouseName" placeholder="所属仓库" class="addinputw addinputInfo"
+                  @change="selectWarehouseChange">
+                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
                    :value="item.sid" />
                </el-select>
              </el-form-item>
+
              <el-form-item label="所属区域">
                <el-select v-model="queryParams.params.zoneSid" placeholder="所属区域" @change="selectWarehouseZoneChange">
                  <el-option v-for="item in warehouseZoneList" :key="item.sid" :label="item.zoneName"
                    :value="item.sid" />
                </el-select>
              </el-form-item>
-              <el-form-item label="所属仓库">
-                <el-select v-model="queryParams.params.warehouseName" placeholder="所属仓库" class="addinputw addinputInfo"
-                  @change="selectWarehouseChange">
-                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
+
+              <el-form-item label="所属库区">
+                <el-select v-model="queryParams.params.warehouseAreaName" placeholder="所属库区"
+                  class="addinputw addinputInfo" @change="selectWrehouseAreaChange">
+                  <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName"
                    :value="item.sid" />
                </el-select>
              </el-form-item>
-
              <el-form-item label="所属仓库类型">
                <el-select v-model="queryParams.params.warehouseTypeValue" placeholder="请选择所属仓库类型">
                  <el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue"
--- a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
@ -311,8 +311,8 @@
                    message: resp.msg
                  })
                  this.$confirm('是否继续添加仓库信息?', '温馨提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
                    type: 'warning'
                  }).then(() => {
                    // 点击确定进行的操作
--- a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
@ -22,7 +22,13 @@
                <el-form-item label="库区编码">
                  <el-input v-model="queryParams.params.code" placeholder="" clearable />
                </el-form-item>
-
+                <el-form-item label="所属仓库">
+                  <el-select v-model="queryParams.params.warehouseName" placeholder="所属仓库"
+                    @change="selectWarehouseChange">
+                    <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
+                      :value="item.sid" />
+                  </el-select>
+                </el-form-item>
                <el-form-item label="所属区域">
                  <el-select v-model="queryParams.params.zoneSid" placeholder="所属区域"
                    @change="selectWarehouseZoneChange">
@ -31,14 +37,6 @@
                  </el-select>
                </el-form-item>
              </el-form-item>
-              <el-form-item label="所属仓库">
-                <el-select v-model="queryParams.params.warehouseName" placeholder="所属仓库"
-                  @change="selectWarehouseChange">
-                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
-                    :value="item.sid" />
-                </el-select>
-              </el-form-item>
-
              <el-form-item label="所属仓库类型">
                <el-select v-model="queryParams.params.warehouseTypeValue" placeholder="所属仓库类型">
                  <el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue"
--- a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue
@ -73,7 +73,8 @@
          <el-col :span="8">
            <div class="span-sty"><span class="must">*</span> 库区名称</div>
            <el-form-item prop="areaName">
-              <el-input v-model="formobj.areaName" placeholder="按配件类型命名" class="addinputw addinputInfo" clearable />
+              <el-input v-model="formobj.areaName" placeholder="按配件类别命名,例:富康发动机" class="addinputw addinputInfo"
+                clearable />
            </el-form-item>
          </el-col>

@ -231,9 +232,9 @@
                    type: 'success',
                    message: resp.msg
                  })
-                  this.$confirm('是否继续添加仓库区域信息?', '温馨提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                  this.$confirm('是否继续添加库区信息?', '温馨提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
                    type: 'warning'
                  }).then(() => {
                    // 点击确定进行的操作
--- a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue
@ -181,9 +181,9 @@
                    type: 'success',
                    message: resp.msg
                  })
-                  this.$confirm('是否继续添加仓库区域信息?', '温馨提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                  this.$confirm('是否继续添加区域信息?', '温馨提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
                    type: 'warning'
                  }).then(() => {
                    // 点击确定进行的操作
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
@ -20,7 +20,7 @@
                <el-input v-model="listQuery.params.salePerson" placeholder="" clearable />
              </el-form-item>
              <el-form-item label="客户名称" class="searchlist">
-                <el-input v-model="listQuery.params.cusmoterName" placeholder="" clearable />
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
              </el-form-item>
              <el-form-item label="车牌号" class="searchlist">
                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
@ -56,7 +56,7 @@
            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center" />
            <el-table-column prop="saleOrderNo" label="单据编号" align="center" width="170" />
            <el-table-column prop="salePerson" label="配件销售人" align="center" width="120" />
-            <el-table-column prop="cusmoterName" label="客户名称" align="center" min-width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
            <el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
            <el-table-column prop="vinNo" label="车架号" align="center" width="130" />
            <el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
@ -104,7 +104,7 @@
            "deptSid": "",
            "billNo": "",
            "salePerson": "",
-            "cusmoterName": "",
+            "customerName": "",
            "vehMark": "",
            "settleDateStart": "",
            "settleDateEnd": "",
@ -156,7 +156,7 @@
        this.listQuery.total = 0
        this.listQuery.params.billNo = ''
        this.listQuery.params.salePerson = ''
-        this.listQuery.params.cusmoterName = ''
+        this.listQuery.params.customerName = ''
        this.listQuery.params.vehMark = ''
        this.listQuery.params.settleDateStart = ''
        this.listQuery.params.settleDateEnd = ''
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
@ -67,7 +67,7 @@
            <el-table-column fixed width="60" label="序号" type="index" :index="index+1" align="center" />
            <el-table-column label="销售单号" prop="saleOrderNo" align="center" />
            <el-table-column label="配件销售人" prop="salePerson" align="center" />
-            <el-table-column label="客户名称" prop="cusmoterName" align="center" />
+            <el-table-column label="客户名称" prop="customerName" align="center" />
            <el-table-column label="车牌号" prop="vehMark" align="center" />
            <el-table-column label="车架号" prop="vinNo" align="center" />
            <el-table-column label="材料费" prop="goodsAmount" align="center" />
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
@ -88,7 +88,7 @@
            </el-table-column>
            <el-table-column label="销售单号" prop="saleOrderNo" align="center" />
            <el-table-column label="配件销售人" prop="salePerson" align="center" />
-            <el-table-column label="客户名称" prop="cusmoterName" align="center" />
+            <el-table-column label="客户名称" prop="customerName" align="center" />
            <el-table-column label="车牌号" prop="vehMark" align="center" />
            <el-table-column label="车架号" prop="vinNo" align="center" />
            <el-table-column label="材料费" prop="goodsAmount" align="center" />
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue
@ -64,7 +64,7 @@
            <el-table-column fixed width="60" label="序号" type="index" :index="index+1" align="center" />
            <el-table-column label="销售单号" prop="saleOrderNo" align="center" />
            <el-table-column label="配件销售人" prop="salePerson" align="center" />
-            <el-table-column label="客户名称" prop="cusmoterName" align="center" />
+            <el-table-column label="客户名称" prop="customerName" align="center" />
            <el-table-column label="车牌号" prop="vehMark" align="center" />
            <el-table-column label="车架号" prop="vinNo" align="center" />
            <el-table-column label="材料费" prop="goodsAmount" align="center" />
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDetailsVo.java
@ -107,7 +107,7 @@ public class AsSaleinvoiceapplyDetailsVo implements Vo {
 	@ApiModelProperty("流程状态")
    private String nodeState; // 流程状态
    @ApiModelProperty("列表")
-    private List<AsSaleinvoiceapplyDetailDetailsVo> saleinvoiceapplyDetailList;
+    private List<AsSaleinvoiceapplyDetailDetailsVo> saleOrderList;
    @ApiModelProperty("附件")
    private List<AsSaleinvoiceapplyFile> files = new ArrayList<>();
 }
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDto.java
@ -103,7 +103,7 @@ public class AsSaleinvoiceapplyDto implements Dto {
 	@ApiModelProperty("流程状态")
    private String nodeState; // 流程状态
    @ApiModelProperty("列表")
-    private List<AsSaleinvoiceapplyDetailDto> saleinvoiceapplyDetailList;
+    private List<AsSaleinvoiceapplyDetailDto> saleOrderList;
    @ApiModelProperty("附件")
    private List<AsSaleinvoiceapplyFile> files = new ArrayList<>();
 }
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java
@ -48,7 +48,7 @@ import java.util.List;

@Api(tags = "销售单开票申请")
@RestController
-@RequestMapping("v1/assaleinvoiceapply")
+@RequestMapping("v1/salesInvoice")
 public class AsSaleinvoiceapplyRest {

 	@Autowired
@ -63,7 +63,7 @@ public class AsSaleinvoiceapplyRest {
 	}

 	@ApiOperation("新增或修改")
-	@PostMapping("/save")
+	@PostMapping("/saveOrUpdate")
 	public ResultBean save(@RequestBody AsSaleinvoiceapplyDto dto){
 		ResultBean rb = ResultBean.fireFail();
 		asSaleinvoiceapplyService.saveOrUpdateDto(dto);
@ -85,7 +85,7 @@ public class AsSaleinvoiceapplyRest {
 	}

 	@ApiOperation("提交")
-	@PostMapping("/submitApply")
+	@PostMapping("/submit")
 	public ResultBean submitApply(@Valid @RequestBody SubmitSaleinvoiceapplyDto dto) {
 		return asSaleinvoiceapplyService.submitApply(dto);
 	}
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
@ -83,6 +83,14 @@ public class SmsSalesBillRest {
        return rb.success().setData(pv);
    }

+    @ApiOperation("销售单开票选择销售单")
+    @PostMapping("/salesInvChoiceBill")
+    public ResultBean<PagerVo<SalesInvChoiceBillVo>> salesInvChoiceBill(@RequestBody PagerQuery<SalesInvChoiceBillQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<SalesInvChoiceBillVo> pv = smsSalesBillService.salesInvChoiceBill(pq);
+        return rb.success().setData(pv);
+    }
+
    @ApiOperation("销售价趋势报表")
    @PostMapping("/goodsTrendReport")
    public ResultBean<PagerVo<SmsSalesTrendVo>> goodsTrendReport(@RequestBody PagerQuery<SmsSalesTrendQuery> pq) {
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillQuery.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillQuery.java
@ -0,0 +1,24 @@
+package com.yxt.sms.biz.smssalesbill;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/6/21 14:02
+ */
+@Data
+public class SalesInvChoiceBillQuery implements Query {
+
+
+    private String deptSid; //部门sid
+    private String salePerson; //配件销售人
+    private String billNo;//工单编号
+    private String customerName;//客户
+    private String vehMark;//车牌号
+    private String settleDateStart; //结算日期
+    private String settleDateEnd;
+    private String createDateStart; // 制单日期
+    private String createDateEnd;
+}
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillVo.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillVo.java
@ -0,0 +1,40 @@
+package com.yxt.sms.biz.smssalesbill;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/6/21 14:02
+ */
+@Data
+public class SalesInvChoiceBillVo implements Vo {
+
+    private String saleOrderSid;
+    private String saleOrderNo;//工单编号
+    @ApiModelProperty("销售姓名")
+    private String salePerson;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("材料费")
+    private String goodsAmount;
+    @ApiModelProperty("附加费")
+    private String addAmount;
+    @ApiModelProperty("优惠")
+    private String discountAmount;
+    @ApiModelProperty("结算日期")
+    private String settleDate;
+    @ApiModelProperty("结算金额合计")
+    private String settleAmount;
+    @ApiModelProperty("制单人")
+    private String createByName;
+    @ApiModelProperty("制单日期")
+    private String createDate;
+}
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java
@ -57,29 +57,31 @@ import java.util.List;
@Mapper
 public interface SmsSalesBillMapper extends BaseMapper<SmsSalesBill> {

-	//@Update("update sms_sales_bill set name=#{msg} where id=#{id}")
-	//IPage<SmsSalesBillVo> voPage(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);
+    //@Update("update sms_sales_bill set name=#{msg} where id=#{id}")
+    //IPage<SmsSalesBillVo> voPage(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);

-	IPage<SmsSalesBillVo> selectPageVo(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) Wrapper<SmsSalesBill> qw);
+    IPage<SmsSalesBillVo> selectPageVo(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) Wrapper<SmsSalesBill> qw);

-	List<SmsSalesBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SmsSalesBill> qw);
+    List<SmsSalesBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SmsSalesBill> qw);

-	@Select("select * from sms_sales_bill")
-	List<SmsSalesBillVo> selectListVo();
+    @Select("select * from sms_sales_bill")
+    List<SmsSalesBillVo> selectListVo();

-	List<SmsSalesBillExportVo> listExcel(@Param(Constants.WRAPPER)QueryWrapper<SmsSalesBill> qw);
+    List<SmsSalesBillExportVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);

-    IPage<SmsSalesBillGoodsDetailsReportVo> goodsDetailsReport(IPage<SmsSalesBill> page,@Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);
+    IPage<SmsSalesBillGoodsDetailsReportVo> goodsDetailsReport(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);

-	IPage<SmsSalesGoodsTotalsVo> goodsTotalsReport(IPage<SmsSalesBill> page,@Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);
+    IPage<SmsSalesGoodsTotalsVo> goodsTotalsReport(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);

-	IPage<SmsSalesTrendVo> goodsTrendReport(IPage<SmsSalesBill> page,@Param(Constants.WRAPPER)  QueryWrapper<SmsSalesBill> qw);
+    IPage<SmsSalesTrendVo> goodsTrendReport(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);

-	int selectNum(String bill);
+    int selectNum(String bill);

-	IPage<SmsWmsInventorySalesVo> listPageSalesGoods(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER)QueryWrapper<SmsGoods> qw);
+    IPage<SmsWmsInventorySalesVo> listPageSalesGoods(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsGoods> qw);

-	int selectBySid(String join);
+    int selectBySid(String join);

-    IPage<SmsBillListReturnGoodsVo> listReturnGoods(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER)QueryWrapper<SmsSalesBill> qw);
+    IPage<SmsBillListReturnGoodsVo> listReturnGoods(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);
+
+    IPage<SalesInvChoiceBillVo> salesInvChoiceBill(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);
 }
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
@ -148,4 +148,23 @@
        sms_sales_bill AS s
        <where>${ew.sqlSegment}</where>
    </select>
+
+    <select id="salesInvChoiceBill" resultType="com.yxt.sms.biz.smssalesbill.SalesInvChoiceBillVo">
+        SELECT
+            s.sid as saleOrderSid,
+            s.billNo as saleOrderNo,
+            date_format(s.createTime, '%Y-%m-%d') as createDate,
+            s.createByName,
+            s.salesName as salePerson,
+            s.customerName,
+            s.vinNo,
+            s.vehMark,
+            s.goodsAmount,
+            s.addAmount,
+            s.discountAmount,
+            date_format(s.settleTime, '%Y-%m-%d') as settleDate
+        from
+            sms_sales_bill AS s
+        <where>${ew.sqlSegment}</where>
+    </select>
 </mapper>
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
@ -110,6 +110,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
    private SysOrganizationFeign sysOrganizationFeign;
    @Autowired
    private DocPdfComponent docPdfComponent;
+
    private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
        // todo: 这里根据具体业务调整查询条件
        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -654,6 +655,40 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
        return p;
    }

+    public PagerVo<SalesInvChoiceBillVo> salesInvChoiceBill(PagerQuery<SalesInvChoiceBillQuery> pq) {
+        SalesInvChoiceBillQuery query = pq.getParams();
+        QueryWrapper<SmsSalesBill> qw = new QueryWrapper<>();
+        qw.eq("s.deptSid", query.getDeptSid());
+        if (StringUtils.isNotBlank(query.getSalePerson())) {
+            qw.like("s.salesName", query.getSalePerson());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("s.billNo", query.getBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("s.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("s.vehMark", query.getVehMark());
+        }
+        String settleDateStart = query.getSettleDateStart();
+        String settleDateEnd = query.getSettleDateEnd();
+        qw.apply(StringUtils.isNotEmpty(settleDateStart), "date_format (s.settleTime,'%Y-%m-%d') >= date_format('" + settleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(settleDateEnd), "date_format (s.settleTime,'%Y-%m-%d') <= date_format('" + settleDateEnd + "','%Y-%m-%d')"
+                );
+        String startDate = query.getCreateDateStart();
+        String endDate = query.getCreateDateEnd();
+        qw.apply(StringUtils.isNotEmpty(startDate), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(endDate), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
+                );
+        qw.eq("s.state", "0");
+        qw.orderByDesc("s.id");
+        IPage<SmsSalesBill> page = PagerUtil.queryToPage(pq);
+        IPage<SalesInvChoiceBillVo> pagging = baseMapper.salesInvChoiceBill(page, qw);
+        PagerVo<SalesInvChoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
    public ResultBean<String> printSmsBill(PrintPdfQuery query) {
        ResultBean rb = ResultBean.fireFail();
        PrintPdfVo vo = new PrintPdfVo();
@ -828,5 +863,4 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
            return sb.toString();
        }
    }
-
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
@ -39,7 +39,7 @@
        select a.*
        from wms_warehouse_area_type a
        where a.useOrgSid = #{useOrgSid}
-          and a.isDelete = 0
+          and a.isDelete = 0 and a.isEnable = 1
    </select>
    <update id="updateBySidIsDelete">
        UPDATE wms_warehouse_area_type