zengtx 3 gadi atpakaļ
vecāks
revīzija
a5072ecfbc
12 mainītis faili ar 776 papildinājumiem un 0 dzēšanām
  1. 167 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataController.java
  2. 167 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataItemController.java
  3. 169 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java
  4. 163 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java
  5. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/SyOrderDataItemMapper.java
  6. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/SyOrderDataMapper.java
  7. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml
  8. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataMapper.xml
  9. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/ISyOrderDataItemService.java
  10. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/ISyOrderDataService.java
  11. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataItemServiceImpl.java
  12. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

+ 167 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataController.java

@@ -0,0 +1,167 @@
+package org.jeecg.modules.documents.orderData.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.orderData.entity.SyOrderData;
+import org.jeecg.modules.documents.orderData.service.ISyOrderDataService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 订单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="订单主表")
+@RestController
+@RequestMapping("/orderData/syOrderData")
+public class SyOrderDataController extends JeecgController<SyOrderData, ISyOrderDataService> {
+	@Autowired
+	private ISyOrderDataService syOrderDataService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param syOrderData
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "订单主表-分页列表查询")
+	@ApiOperation(value="订单主表-分页列表查询", notes="订单主表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SyOrderData syOrderData,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SyOrderData> queryWrapper = QueryGenerator.initQueryWrapper(syOrderData, req.getParameterMap());
+		Page<SyOrderData> page = new Page<SyOrderData>(pageNo, pageSize);
+		IPage<SyOrderData> pageList = syOrderDataService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param syOrderData
+	 * @return
+	 */
+	@AutoLog(value = "订单主表-添加")
+	@ApiOperation(value="订单主表-添加", notes="订单主表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SyOrderData syOrderData) {
+		syOrderDataService.save(syOrderData);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param syOrderData
+	 * @return
+	 */
+	@AutoLog(value = "订单主表-编辑")
+	@ApiOperation(value="订单主表-编辑", notes="订单主表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody SyOrderData syOrderData) {
+		syOrderDataService.updateById(syOrderData);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单主表-通过id删除")
+	@ApiOperation(value="订单主表-通过id删除", notes="订单主表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		syOrderDataService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单主表-批量删除")
+	@ApiOperation(value="订单主表-批量删除", notes="订单主表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.syOrderDataService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单主表-通过id查询")
+	@ApiOperation(value="订单主表-通过id查询", notes="订单主表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SyOrderData syOrderData = syOrderDataService.getById(id);
+		return Result.OK(syOrderData);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param syOrderData
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, SyOrderData syOrderData) {
+      return super.exportXls(request, syOrderData, SyOrderData.class, "订单主表");
+  }
+
+  /**
+   * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      return super.importExcel(request, response, SyOrderData.class);
+  }
+
+}

+ 167 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataItemController.java

@@ -0,0 +1,167 @@
+package org.jeecg.modules.documents.orderData.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
+import org.jeecg.modules.documents.orderData.service.ISyOrderDataItemService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 订单子表信息
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="订单子表信息")
+@RestController
+@RequestMapping("/orderData/syOrderDataItem")
+public class SyOrderDataItemController extends JeecgController<SyOrderDataItem, ISyOrderDataItemService> {
+	@Autowired
+	private ISyOrderDataItemService syOrderDataItemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param syOrderDataItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "订单子表信息-分页列表查询")
+	@ApiOperation(value="订单子表信息-分页列表查询", notes="订单子表信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SyOrderDataItem syOrderDataItem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SyOrderDataItem> queryWrapper = QueryGenerator.initQueryWrapper(syOrderDataItem, req.getParameterMap());
+		Page<SyOrderDataItem> page = new Page<SyOrderDataItem>(pageNo, pageSize);
+		IPage<SyOrderDataItem> pageList = syOrderDataItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param syOrderDataItem
+	 * @return
+	 */
+	@AutoLog(value = "订单子表信息-添加")
+	@ApiOperation(value="订单子表信息-添加", notes="订单子表信息-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SyOrderDataItem syOrderDataItem) {
+		syOrderDataItemService.save(syOrderDataItem);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param syOrderDataItem
+	 * @return
+	 */
+	@AutoLog(value = "订单子表信息-编辑")
+	@ApiOperation(value="订单子表信息-编辑", notes="订单子表信息-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody SyOrderDataItem syOrderDataItem) {
+		syOrderDataItemService.updateById(syOrderDataItem);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单子表信息-通过id删除")
+	@ApiOperation(value="订单子表信息-通过id删除", notes="订单子表信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		syOrderDataItemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单子表信息-批量删除")
+	@ApiOperation(value="订单子表信息-批量删除", notes="订单子表信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.syOrderDataItemService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单子表信息-通过id查询")
+	@ApiOperation(value="订单子表信息-通过id查询", notes="订单子表信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SyOrderDataItem syOrderDataItem = syOrderDataItemService.getById(id);
+		return Result.OK(syOrderDataItem);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param syOrderDataItem
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, SyOrderDataItem syOrderDataItem) {
+      return super.exportXls(request, syOrderDataItem, SyOrderDataItem.class, "订单子表信息");
+  }
+
+  /**
+   * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      return super.importExcel(request, response, SyOrderDataItem.class);
+  }
+
+}

+ 169 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -0,0 +1,169 @@
+package org.jeecg.modules.documents.orderData.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 订单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_order_data")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="sy_order_data对象", description="订单主表")
+public class SyOrderData {
+    
+	/**主键id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id")
+	private java.lang.String id;
+	/**订单号*/
+	@Excel(name = "订单号", width = 15)
+    @ApiModelProperty(value = "订单号")
+	private java.lang.String orderNumber;
+	/**订单日期*/
+	@Excel(name = "订单日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "订单日期")
+	private java.util.Date orderDate;
+	/**业务类型*/
+	@Excel(name = "业务类型", width = 15)
+    @ApiModelProperty(value = "业务类型")
+	private java.lang.String businessTypeValue;
+	/**业务类型文本*/
+	@Excel(name = "业务类型文本", width = 15)
+    @ApiModelProperty(value = "业务类型文本")
+	private java.lang.String businessTypeText;
+	/**销售类型*/
+	@Excel(name = "销售类型", width = 15)
+    @ApiModelProperty(value = "销售类型")
+	private java.lang.String salesTypeValue;
+	/**销售类型文本*/
+	@Excel(name = "销售类型文本", width = 15)
+    @ApiModelProperty(value = "销售类型文本")
+	private java.lang.String salesTypeText;
+	/**客户简称*/
+	@Excel(name = "客户简称", width = 15)
+    @ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+	/**客户名称*/
+	@Excel(name = "客户名称", width = 15)
+    @ApiModelProperty(value = "客户名称")
+	private java.lang.String customerName;
+	/**汇率*/
+	@Excel(name = "汇率", width = 15)
+    @ApiModelProperty(value = "汇率")
+	private java.math.BigDecimal exchangeRate;
+	/**销售部门*/
+	@Excel(name = "销售部门", width = 15)
+    @ApiModelProperty(value = "销售部门")
+	private java.lang.String salesDepartment;
+	/**业务员*/
+	@Excel(name = "业务员", width = 15)
+    @ApiModelProperty(value = "业务员")
+	private java.lang.String salesman;
+	/**币种*/
+	@Excel(name = "币种", width = 15)
+    @ApiModelProperty(value = "币种")
+	private java.lang.String currencyValue;
+	/**币种文本*/
+	@Excel(name = "币种文本", width = 15)
+    @ApiModelProperty(value = "币种文本")
+	private java.lang.String currencyText;
+	/**品牌方*/
+	@Excel(name = "品牌方", width = 15)
+    @ApiModelProperty(value = "品牌方")
+	private java.lang.String brandSide;
+	/**第三方*/
+	@Excel(name = "第三方", width = 15)
+    @ApiModelProperty(value = "第三方")
+	private java.lang.String thirdParty;
+	/**定金比例*/
+	@Excel(name = "定金比例", width = 15)
+    @ApiModelProperty(value = "定金比例")
+	private java.lang.String depositRatio;
+	/**定金*/
+	@Excel(name = "定金", width = 15)
+    @ApiModelProperty(value = "定金")
+	private java.math.BigDecimal deposit;
+	/**协同路线*/
+	@Excel(name = "协同路线", width = 15)
+    @ApiModelProperty(value = "协同路线")
+	private java.lang.String collaborativeRoute;
+	/**订单备注*/
+	@Excel(name = "订单备注", width = 15)
+    @ApiModelProperty(value = "订单备注")
+	private java.lang.Object orderRemarks;
+	/**价格备注*/
+	@Excel(name = "价格备注", width = 15)
+    @ApiModelProperty(value = "价格备注")
+	private java.lang.Object priceRemarks;
+	/**客户订单号*/
+	@Excel(name = "客户订单号", width = 15)
+    @ApiModelProperty(value = "客户订单号")
+	private java.lang.String customerOrderNumber;
+	/**整单合计*/
+	@Excel(name = "整单合计", width = 15)
+    @ApiModelProperty(value = "整单合计")
+	private java.math.BigDecimal wholeOrderTotal;
+	/**最终客户*/
+	@Excel(name = "最终客户", width = 15)
+    @ApiModelProperty(value = "最终客户")
+	private java.lang.String endCustomer;
+	/**付款条件*/
+	@Excel(name = "付款条件", width = 15)
+    @ApiModelProperty(value = "付款条件")
+	private java.lang.String termOfPayment;
+	/**订单说明*/
+	@Excel(name = "订单说明", width = 15)
+    @ApiModelProperty(value = "订单说明")
+	private java.lang.Object orderChangeDescription;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+	private java.lang.String createBy;
+	/**创建日期*/
+	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
+	/**更新人*/
+	@Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+	private java.lang.String updateBy;
+	/**更新日期*/
+	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+	private java.util.Date updateTime;
+	/**组织*/
+	@Excel(name = "组织", width = 15)
+    @ApiModelProperty(value = "组织")
+	private java.lang.String pkOrg;
+	/**删除状态*/
+	@Excel(name = "删除状态", width = 15)
+    @ApiModelProperty(value = "删除状态")
+	private java.lang.String delFlag;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+	private java.lang.Object memo;
+}

+ 163 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -0,0 +1,163 @@
+package org.jeecg.modules.documents.orderData.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 订单子表信息
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_order_data_item")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="sy_order_data_item对象", description="订单子表信息")
+public class SyOrderDataItem {
+    
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+	private java.lang.String id;
+	/**订单数据主表id*/
+	@Excel(name = "订单数据主表id", width = 15)
+    @ApiModelProperty(value = "订单数据主表id")
+	private java.lang.String syOrderDataId;
+	/**款号*/
+	@Excel(name = "款号", width = 15)
+    @ApiModelProperty(value = "款号")
+	private java.lang.String itemNumber;
+	/**预发货日期*/
+	@Excel(name = "预发货日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "预发货日期")
+	private java.util.Date preDeliveryDate;
+	/**预完工日期*/
+	@Excel(name = "预完工日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "预完工日期")
+	private java.util.Date preCompletionDate;
+	/**PackId*/
+	@Excel(name = "PackId", width = 15)
+    @ApiModelProperty(value = "PackId")
+	private java.lang.String packId;
+	/**小po*/
+	@Excel(name = "小po", width = 15)
+    @ApiModelProperty(value = "小po")
+	private java.lang.String smallPo;
+	/**分销点*/
+	@Excel(name = "分销点", width = 15)
+    @ApiModelProperty(value = "分销点")
+	private java.lang.String distributionPoint;
+	/**存货编码*/
+	@Excel(name = "存货编码", width = 15)
+    @ApiModelProperty(value = "存货编码")
+	private java.lang.String inventoryCode;
+	/**存货名称*/
+	@Excel(name = "存货名称", width = 15)
+    @ApiModelProperty(value = "存货名称")
+	private java.lang.String inventoryName;
+	/**规格型号*/
+	@Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+	private java.lang.String specificationAndModel;
+	/**颜色*/
+	@Excel(name = "颜色", width = 15)
+    @ApiModelProperty(value = "颜色")
+	private java.lang.String colour;
+	/**尺码*/
+	@Excel(name = "尺码", width = 15)
+    @ApiModelProperty(value = "尺码")
+	private java.lang.String size;
+	/**配码规则*/
+	@Excel(name = "配码规则", width = 15)
+    @ApiModelProperty(value = "配码规则")
+	private java.lang.String codingRules;
+	/**光坯毛门幅CM*/
+	@Excel(name = "光坯毛门幅CM", width = 15)
+    @ApiModelProperty(value = "光坯毛门幅CM")
+	private java.math.BigDecimal guangpeiGateWidth;
+	/**箱数*/
+	@Excel(name = "箱数", width = 15)
+    @ApiModelProperty(value = "箱数")
+	private java.math.BigDecimal boxNumber;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+	private java.math.BigDecimal quantity;
+	/**主计量*/
+	@Excel(name = "主计量", width = 15)
+    @ApiModelProperty(value = "主计量")
+	private java.lang.String masterMetering;
+	/**含税单价*/
+	@Excel(name = "含税单价", width = 15)
+    @ApiModelProperty(value = "含税单价")
+	private java.math.BigDecimal unitPriceIncludingTax;
+	/**价税合计*/
+	@Excel(name = "价税合计", width = 15)
+    @ApiModelProperty(value = "价税合计")
+	private java.math.BigDecimal totalPriceAndTax;
+	/**税率*/
+	@Excel(name = "税率", width = 15)
+    @ApiModelProperty(value = "税率")
+	private java.math.BigDecimal taxRate;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+	private java.lang.Object remarks;
+	/**行关闭人*/
+	@Excel(name = "行关闭人", width = 15)
+    @ApiModelProperty(value = "行关闭人")
+	private java.lang.String bankClosedBy;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+	private java.lang.String createBy;
+	/**创建日期*/
+	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
+	/**更新人*/
+	@Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+	private java.lang.String updateBy;
+	/**更新日期*/
+	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+	private java.util.Date updateTime;
+	/**组织*/
+	@Excel(name = "组织", width = 15)
+    @ApiModelProperty(value = "组织")
+	private java.lang.String pkOrg;
+	/**删除状态*/
+	@Excel(name = "删除状态", width = 15)
+    @ApiModelProperty(value = "删除状态")
+	private java.lang.String delFlag;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+	private java.lang.Object memo;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+	private java.lang.Integer sort;
+}

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/SyOrderDataItemMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.documents.orderData.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单子表信息
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+public interface SyOrderDataItemMapper extends BaseMapper<SyOrderDataItem> {
+
+}

+ 17 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/SyOrderDataMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.documents.orderData.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.documents.orderData.entity.SyOrderData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+public interface SyOrderDataMapper extends BaseMapper<SyOrderData> {
+
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.documents.orderData.mapper.SyOrderDataItemMapper">
+
+</mapper>

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.documents.orderData.mapper.SyOrderDataMapper">
+
+</mapper>

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/ISyOrderDataItemService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.documents.orderData.service;
+
+import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单子表信息
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+public interface ISyOrderDataItemService extends IService<SyOrderDataItem> {
+
+}

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/ISyOrderDataService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.documents.orderData.service;
+
+import org.jeecg.modules.documents.orderData.entity.SyOrderData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+public interface ISyOrderDataService extends IService<SyOrderData> {
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataItemServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.documents.orderData.service.impl;
+
+import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
+import org.jeecg.modules.documents.orderData.mapper.SyOrderDataItemMapper;
+import org.jeecg.modules.documents.orderData.service.ISyOrderDataItemService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单子表信息
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+@Service
+public class SyOrderDataItemServiceImpl extends ServiceImpl<SyOrderDataItemMapper, SyOrderDataItem> implements ISyOrderDataItemService {
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.documents.orderData.service.impl;
+
+import org.jeecg.modules.documents.orderData.entity.SyOrderData;
+import org.jeecg.modules.documents.orderData.mapper.SyOrderDataMapper;
+import org.jeecg.modules.documents.orderData.service.ISyOrderDataService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-21
+ * @Version: V1.0
+ */
+@Service
+public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrderData> implements ISyOrderDataService {
+
+}