diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java
new file mode 100644
index 0000000..670e1ed
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.smssalesbill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillFeignFallback.java
+ * Class: com.yxt.sales.apiadmin.biz.smssalesbill.SmsSalesBillRest
+ * Description: 销售订单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单")
+@RestController("com.yxt.sales.apiadmin.biz.smssalesbill.SmsSalesBillRest")
+@RequestMapping("v1/smssalesbill")
+public class SmsSalesBillRest {
+
+ @Autowired
+ private SmsSalesBillService smsSalesBillService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ return smsSalesBillService.listPage(pq);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody SmsSalesBillDto dto){
+ return smsSalesBillService.saveOrUpdateDto(dto);
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ return smsSalesBillService.deleteBySids(sids);
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ return smsSalesBillService.fetchDetailsVoBySid(sid);
+ }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBill.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBill.java
new file mode 100644
index 0000000..42348f3
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBill.java
@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBill.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbill.SmsSalesBill
+ * Description: 销售订单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单", description = "销售订单")
+@TableName("sms_sales_bill")
+public class SmsSalesBill extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("制单部门sid")
+ private String deptSid; // 制单部门sid
+ @ApiModelProperty("制单部门")
+ private String deptName; // 制单部门
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("销售用户sid单选)(销售用户sid)")
+ private String salesUserSid; // 销售用户sid单选)(销售用户sid)
+ @ApiModelProperty("销售姓名")
+ private String salesName; // 销售姓名
+ @ApiModelProperty("备注(打印)")
+ private String printRemarks; // 备注(打印)
+ @ApiModelProperty("单据类型key(线下订单/预售订单等)")
+ private String billTypeKey; // 单据类型key(线下订单/预售订单等)
+ @ApiModelProperty("单据类型value")
+ private String billTypeValue; // 单据类型value
+ @ApiModelProperty("开单价格Key(标准售价、吊牌价、批发价、上次购买价)")
+ private String billPriceTypeKey; // 开单价格Key(标准售价、吊牌价、批发价、上次购买价)
+ @ApiModelProperty("开单价格value")
+ private String billPriceTypeValue; // 开单价格value
+ @ApiModelProperty("客户sid")
+ private String customerSid; // 客户sid
+ @ApiModelProperty("客户名称")
+ private String customerName; // 客户名称
+ @ApiModelProperty("联系电话")
+ private String mobile; // 联系电话
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
new file mode 100644
index 0000000..515d236
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillDetailVo.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbilldetail.SmsSalesBillDetailVo
+ * Description: 销售订单-商品清单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-商品清单 视图数据详情", description = "销售订单-商品清单 视图数据详情")
+public class SmsSalesBillDetailDetailsVo implements Vo {
+
+
+
+ @ApiModelProperty("商品基础信息Sid")
+ private String goodSpuSid; // 商品基础信息Sid
+ @ApiModelProperty("商品名称")
+ private String goodsSpuName; // 商品名称
+ @ApiModelProperty("商品Skusid")
+ private String goodsSkuSid; // 商品Skusid
+ @ApiModelProperty("商品Sku名称")
+ private String goodsSkuTitle; // 商品Sku名称
+ @ApiModelProperty("商品编码")
+ private String goodsSkuCode; // 商品编码
+ @ApiModelProperty("规格型号")
+ private String goodsSkuOwnSpec; // 规格型号
+ @ApiModelProperty("重量(kg)")
+ private String weight; // 重量(kg)
+ @ApiModelProperty("体积(立方米)")
+ private String volume; // 体积(立方米)
+ @ApiModelProperty("计量单位")
+ private String unit; // 计量单位
+ @ApiModelProperty("辅单位数量")
+ private String auxiliaryUnit; // 辅单位数量
+ @ApiModelProperty("销售单价")
+ private String price; // 销售单价
+ @ApiModelProperty("数量")
+ private String count; // 数量
+ @ApiModelProperty("折扣率")
+ private String discountRtate; // 折扣率
+ @ApiModelProperty("折后单价")
+ private String discountPrice; // 折后单价
+ @ApiModelProperty("应收款")
+ private String dueAmount; // 应收款
+ @ApiModelProperty("商品成本")
+ private String cost; // 商品成本
+ @ApiModelProperty("分摊优惠")
+ private String discountAmount; // 分摊优惠
+ @ApiModelProperty("惠后金额")
+ private String amount; // 惠后金额
+ @ApiModelProperty("库存数量")
+ private String inventoryCount; // 库存数量
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
new file mode 100644
index 0000000..3434082
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
@@ -0,0 +1,164 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillVo.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbill.SmsSalesBillVo
+ * Description: 销售订单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单 视图数据详情", description = "销售订单 视图数据详情")
+public class SmsSalesBillDetailsVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("制单人sid")
+ private String createBySid; // 制单人姓名
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("制单部门sid")
+ private String deptSid; // 制单部门sid
+ @ApiModelProperty("制单部门")
+ private String deptName; // 制单部门
+ @ApiModelProperty("制单日期")
+ private String createTime; // 制单日期
+ @ApiModelProperty("单据类型key(线下订单/预售订单等)")
+ private String billTypeKey; // 单据类型key(线下订单/预售订单等)
+ @ApiModelProperty("单据类型value")
+ private String billTypeValue; // 单据类型value
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("配送方式Key")
+ private String deliveryTypeKey; // 配送方式Key
+ @ApiModelProperty("配送方式Value")
+ private String deliveryTypeValue; // 配送方式Value
+ @ApiModelProperty("物流公司")
+ private String logisticsName; // 物流公司
+ @ApiModelProperty("销售用户sid单选)(销售用户sid)")
+ private String salesUserSid; // 销售用户sid单选)(销售用户sid)
+ @ApiModelProperty("销售姓名")
+ private String salesName; // 销售姓名
+ @ApiModelProperty("是否货到付款(1是,0否)")
+ private String isFirstPay; // 是否货到付款(1是,0否)
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("开单价格Key(标准售价、吊牌价、批发价、上次购买价)")
+ private String billPriceTypeKey; // 开单价格Key(标准售价、吊牌价、批发价、上次购买价)
+ @ApiModelProperty("开单价格value")
+ private String billPriceTypeValue; // 开单价格value
+ //-------------- 客户信息 --------------------
+ @ApiModelProperty("客户sid")
+ private String customerSid; // 客户sid
+ @ApiModelProperty("客户名称")
+ private String customerName; // 客户名称
+ @ApiModelProperty("收货人姓名")
+ private String shipperName; // 收货人姓名
+ @ApiModelProperty("收货人手机")
+ private String shipperMob; // 收货人手机
+ @ApiModelProperty("收货省sid")
+ private String deliveryProvinceSid; // 收货省sid
+ @ApiModelProperty("收货省")
+ private String deliveryProvince; // 收货省
+ @ApiModelProperty("收货市sid")
+ private String deliveryCitySid; // 收货市sid
+ @ApiModelProperty("收货市")
+ private String deliveryCity; // 收货市
+ @ApiModelProperty("收货县区sid")
+ private String deliveryCountySid; // 收货县区sid
+ @ApiModelProperty("收货县区")
+ private String deliveryCounty; // 收货县区
+ @ApiModelProperty("收货详细地址")
+ private String deliveryAddress; // 收货详细地址
+ @ApiModelProperty("邮编 ")
+ private String postCode; // 邮编
+ //---------------发票信息------------
+ @ApiModelProperty("是否需要开发票(是1,否0)")
+ private String isInvoicing; // 是否需要开发票(是1,否0)
+ @ApiModelProperty("发票类型Key")
+ private String invoiceTypeKey; // 发票类型Key
+ @ApiModelProperty("发票类型")
+ private String invoiceType; // 发票类型
+ @ApiModelProperty("开票名称")
+ private String invoiceTitle; // 开票名称
+ @ApiModelProperty("税号")
+ private String taxpayerNo; // 税号
+ @ApiModelProperty("税率")
+ private String taxRate; // 税率
+ //商品信息
+ @ApiModelProperty("商品列表")
+ private List goodsList; // 商品列表
+
+ //费用信息
+ @ApiModelProperty("折扣率")
+ private String discountRate; // 折扣率
+ @ApiModelProperty("整体优惠券")
+ private String coupon; // 整体优惠券
+ @ApiModelProperty("整体优惠金额")
+ private String discountAmount; // 整体优惠金额
+ @ApiModelProperty("优惠后金额")
+ private String amount; // 优惠后金额
+ @ApiModelProperty("应收合计")
+ private String dueAmount; // 应收合计
+ @ApiModelProperty("运费")
+ private String freight; // 运费
+ @ApiModelProperty("本次收款")
+ private String thisPay; // 本次收款
+ @ApiModelProperty("本次欠款")
+ private String thisDebt; // 本次欠款
+ @ApiModelProperty("总欠款")
+ private String totalDebt; // 总欠款
+ @ApiModelProperty("预收款余额")
+ private String advanceBalance; // 预收款余额
+ //结算
+ @ApiModelProperty("结算账户")
+ private String bankAccount; // 结算账户
+ @ApiModelProperty("结算金额")
+ private String settleAmount; // 结算金额
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
new file mode 100644
index 0000000..b9d73cb
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
@@ -0,0 +1,168 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillDto.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbill.SmsSalesBillDto
+ * Description: 销售订单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单 数据传输对象", description = "销售订单 数据传输对象")
+public class SmsSalesBillDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("制单人sid")
+ private String createBySid; // 制单人姓名
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("制单部门sid")
+ private String deptSid; // 制单部门sid
+ @ApiModelProperty("制单部门")
+ private String deptName; // 制单部门
+ @ApiModelProperty("制单日期")
+ private String createTime; // 制单日期
+ @ApiModelProperty("单据类型key(线下订单/预售订单等)")
+ private String billTypeKey; // 单据类型key(线下订单/预售订单等)
+ @ApiModelProperty("单据类型value")
+ private String billTypeValue; // 单据类型value
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("配送方式Key")
+ private String deliveryTypeKey; // 配送方式Key
+ @ApiModelProperty("配送方式Value")
+ private String deliveryTypeValue; // 配送方式Value
+ @ApiModelProperty("物流公司")
+ private String logisticsName; // 物流公司
+ @ApiModelProperty("销售用户sid单选)(销售用户sid)")
+ private String salesUserSid; // 销售用户sid单选)(销售用户sid)
+ @ApiModelProperty("销售姓名")
+ private String salesName; // 销售姓名
+ @ApiModelProperty("是否货到付款(1是,0否)")
+ private String isFirstPay; // 是否货到付款(1是,0否)
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("开单价格Key(标准售价、吊牌价、批发价、上次购买价)")
+ private String billPriceTypeKey; // 开单价格Key(标准售价、吊牌价、批发价、上次购买价)
+ @ApiModelProperty("开单价格value")
+ private String billPriceTypeValue; // 开单价格value
+ //-------------- 客户信息 --------------------
+ @ApiModelProperty("客户sid")
+ private String customerSid; // 客户sid
+ @ApiModelProperty("客户名称")
+ private String customerName; // 客户名称
+ @ApiModelProperty("收货人姓名")
+ private String shipperName; // 收货人姓名
+ @ApiModelProperty("收货人手机")
+ private String shipperMob; // 收货人手机
+ @ApiModelProperty("收货省sid")
+ private String deliveryProvinceSid; // 收货省sid
+ @ApiModelProperty("收货省")
+ private String deliveryProvince; // 收货省
+ @ApiModelProperty("收货市sid")
+ private String deliveryCitySid; // 收货市sid
+ @ApiModelProperty("收货市")
+ private String deliveryCity; // 收货市
+ @ApiModelProperty("收货县区sid")
+ private String deliveryCountySid; // 收货县区sid
+ @ApiModelProperty("收货县区")
+ private String deliveryCounty; // 收货县区
+ @ApiModelProperty("收货详细地址")
+ private String deliveryAddress; // 收货详细地址
+ @ApiModelProperty("邮编 ")
+ private String postCode; // 邮编
+ //---------------发票信息------------
+ @ApiModelProperty("是否需要开发票(是1,否0)")
+ private String isInvoicing; // 是否需要开发票(是1,否0)
+ @ApiModelProperty("发票类型Key")
+ private String invoiceTypeKey; // 发票类型Key
+ @ApiModelProperty("发票类型")
+ private String invoiceType; // 发票类型
+ @ApiModelProperty("开票名称")
+ private String invoiceTitle; // 开票名称
+ @ApiModelProperty("税号")
+ private String taxpayerNo; // 税号
+ @ApiModelProperty("税率")
+ private String taxRate; // 税率
+ //商品信息
+ @ApiModelProperty("商品列表")
+ private List goodsList; // 商品列表
+
+ //费用信息
+ @ApiModelProperty("折扣率")
+ private String discountRate; // 折扣率
+ @ApiModelProperty("整体优惠券")
+ private String coupon; // 整体优惠券
+ @ApiModelProperty("整体优惠金额")
+ private String discountAmount; // 整体优惠金额
+ @ApiModelProperty("优惠后金额")
+ private String amount; // 优惠后金额
+ @ApiModelProperty("应收合计")
+ private String dueAmount; // 应收合计
+ @ApiModelProperty("运费")
+ private String freight; // 运费
+ @ApiModelProperty("本次收款")
+ private String thisPay; // 本次收款
+ @ApiModelProperty("本次欠款")
+ private String thisDebt; // 本次欠款
+ @ApiModelProperty("总欠款")
+ private String totalDebt; // 总欠款
+ @ApiModelProperty("预收款余额")
+ private String advanceBalance; // 预收款余额
+ //结算
+ @ApiModelProperty("结算账户")
+ private String bankAccount; // 结算账户
+ @ApiModelProperty("结算金额")
+ private String settleAmount; // 结算金额
+
+
+
+
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillMapper.java
new file mode 100644
index 0000000..025bf7d
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillMapper.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillMapper.java
+ * Class: com.yxt.sales.apiadmin.biz.smssalesbill.SmsSalesBillMapper
+ * Description: 销售订单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SmsSalesBillMapper extends BaseMapper {
+
+ //@Update("update sms_sales_bill set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from sms_sales_bill")
+ List selectListVo();
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillMapper.xml
new file mode 100644
index 0000000..67ce82a
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java
new file mode 100644
index 0000000..559d559
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillQuery.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbill.SmsSalesBillQuery
+ * Description: 销售订单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单 查询条件", description = "销售订单 查询条件")
+public class SmsSalesBillQuery implements Query {
+
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("制单部门")
+ private String deptName; // 制单部门
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("制单开始日期")
+ private String startDate; // 制单开始日期
+ @ApiModelProperty("制单结束日期")
+ private String endDate; // 制单结束日期
+ @ApiModelProperty("销售姓名")
+ private String salesName; // 销售姓名
+ @ApiModelProperty("单据类型key(线下订单/预售订单等)")
+ private String billTypeKey; // 单据类型key(线下订单/预售订单等)
+ @ApiModelProperty("配送方式")
+ private String deliveryTypeKey; // 配送方式
+ @ApiModelProperty("客户名称")
+ private String customerName; // 客户名称
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
new file mode 100644
index 0000000..2f5d8b5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillService.java
+ * Class: com.yxt.sales.apiadmin.biz.smssalesbill.SmsSalesBillService
+ * Description: 销售订单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SmsSalesBillService extends MybatisBaseService {
+
+ @Resource
+ private SmsSalesBillFeign smsSalesBillFeign;
+
+ private QueryWrapper createQueryWrapper(SmsSalesBillQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ SmsSalesBillQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public ResultBean saveOrUpdateDto(SmsSalesBillDto dto) {
+ return smsSalesBillFeign.save(dto);
+ }
+
+ public void insertByDto(SmsSalesBillDto dto) {
+ SmsSalesBill entity = new SmsSalesBill();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(SmsSalesBillDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ SmsSalesBill entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public ResultBean fetchDetailsVoBySid(String sid) {
+ return smsSalesBillFeign.fetchDetailsBySid(sid);
+ }
+
+ public ResultBean> listPage(PagerQuery pq) {
+ return smsSalesBillFeign.listPage(pq);
+ }
+
+ public ResultBean deleteBySids(String[] sids) {
+ return smsSalesBillFeign.delBySids(sids);
+ }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillVo.java
new file mode 100644
index 0000000..1ba66ab
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillVo.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillVo.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbill.SmsSalesBillVo
+ * Description: 销售订单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单 视图数据对象", description = "销售订单 视图数据对象")
+public class SmsSalesBillVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("制单部门")
+ private String deptName; // 制单部门
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("制单日期")
+ private String createTime; // 制单日期
+ @ApiModelProperty("单据类型value")
+ private String billTypeValue; // 单据类型value
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("配送方式Value")
+ private String deliveryTypeValue; // 配送方式Value
+ @ApiModelProperty("客户名称")
+ private String customerName; // 客户名称
+ @ApiModelProperty("实付")
+ private String thisPay; // 实付
+ @ApiModelProperty("整体优惠金额")
+ private String discountAmount; // 整体优惠金额
+ @ApiModelProperty("应收合计")
+ private String dueAmount; // 应收合计
+ @ApiModelProperty("运费")
+ private String freight; // 运费
+ @ApiModelProperty("业务员")
+ private String salesName; // 业务员
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java
new file mode 100644
index 0000000..cda8a50
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java
@@ -0,0 +1,51 @@
+package com.yxt.oms.feign.sales.smssalesbill;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBill;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillDto;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillQuery;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillVo;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo;
+import com.yxt.oms.utils.OrgPathQuery;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2024/7/4
+ **/
+@FeignClient(
+ contextId = "ss-common-sales-SmsSalesBill",
+ name = "ss-common-smssalesbill",
+ path = "/v1/smssalesbill",
+ fallback = SmsSalesBillFeignFallback.class)
+public interface SmsSalesBillFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody SmsSalesBillDto dto);
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java
new file mode 100644
index 0000000..2e241c3
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java
@@ -0,0 +1,46 @@
+package com.yxt.oms.feign.sales.smssalesbill;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBill;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillDto;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillQuery;
+import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillVo;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery;
+import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo;
+import com.yxt.oms.utils.OrgPathQuery;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2024/7/4
+ **/
+@Component
+public class SmsSalesBillFeignFallback implements SmsSalesBillFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ return null;
+ }
+
+ @Override
+ public ResultBean save(SmsSalesBillDto dto) {
+ return null;
+ }
+
+ @Override
+ public ResultBean delBySids(String[] sids) {
+ return null;
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid) {
+ return null;
+ }
+}