[feat] 销售管理

新增出货资料实体类
新增出货资料Controller
新增出货资料Mapper
新增出货资料Mapper.XML
新增出货资料Service接口
新增出货资料ServiceImpl实现类
新增出货资料前端列表页面

ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesShippingInformationController.java

@@ -0,0 +1,151 @@
+package com.ruoyi.sales.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.sales.domain.SalesShippingInformation;
+import com.ruoyi.sales.service.ISalesShippingInformationService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 销售出货资料Controller
+ * 
+ * @author 刘晓旭
+ * @date 2024-09-02
+ */
+@Controller
+@RequestMapping("/sales/salesShippingInformation")
+public class SalesShippingInformationController extends BaseController
+{
+    private String prefix = "sales/salesShippingInformation";
+
+    @Autowired
+    private ISalesShippingInformationService salesShippingInformationService;
+
+    @RequiresPermissions("sales:salesShippingInformation:view")
+    @GetMapping()
+    public String salesShippingInformation()
+    {
+        return prefix + "/salesShippingInformation";
+    }
+
+    /**
+     * 查询销售出货资料列表
+     */
+    @RequiresPermissions("sales:salesShippingInformation:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SalesShippingInformation salesShippingInformation)
+    {
+        startPage();
+        List<SalesShippingInformation> list = salesShippingInformationService.selectSalesShippingInformationList(salesShippingInformation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出销售出货资料列表
+     */
+    @RequiresPermissions("sales:salesShippingInformation:export")
+    @Log(title = "销售出货资料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SalesShippingInformation salesShippingInformation)
+    {
+        List<SalesShippingInformation> list = salesShippingInformationService.selectSalesShippingInformationList(salesShippingInformation);
+        ExcelUtil<SalesShippingInformation> util = new ExcelUtil<SalesShippingInformation>(SalesShippingInformation.class);
+        return util.exportExcel(list, "销售出货资料数据");
+    }
+
+    /**
+     * 新增销售出货资料
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存销售出货资料
+     */
+    @RequiresPermissions("sales:salesShippingInformation:add")
+    @Log(title = "销售出货资料", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SalesShippingInformation salesShippingInformation)
+    {
+        return toAjax(salesShippingInformationService.insertSalesShippingInformation(salesShippingInformation));
+    }
+
+    /**
+     * 修改销售出货资料
+     */
+    @GetMapping("/edit/{shippingInformationId}")
+    public String edit(@PathVariable("shippingInformationId") Long shippingInformationId, ModelMap mmap)
+    {
+        SalesShippingInformation salesShippingInformation = salesShippingInformationService.selectSalesShippingInformationById(shippingInformationId);
+        mmap.put("salesShippingInformation", salesShippingInformation);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存销售出货资料
+     */
+    @RequiresPermissions("sales:salesShippingInformation:edit")
+    @Log(title = "销售出货资料", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SalesShippingInformation salesShippingInformation)
+    {
+        return toAjax(salesShippingInformationService.updateSalesShippingInformation(salesShippingInformation));
+    }
+
+    /**
+     * 删除销售出货资料
+     */
+    @RequiresPermissions("sales:salesShippingInformation:remove")
+    @Log(title = "销售出货资料", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(salesShippingInformationService.deleteSalesShippingInformationByIds(ids));
+    }
+
+    /**
+     * 作废销售出货资料
+     */
+    @RequiresPermissions("sales:salesShippingInformation:cancel")
+    @Log(title = "销售出货资料", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(salesShippingInformationService.cancelSalesShippingInformationById(id));
+    }
+
+    /**
+     * 恢复销售出货资料
+     */
+    @RequiresPermissions("sales:salesShippingInformation:restore")
+    @Log(title = "销售出货资料", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(salesShippingInformationService.restoreSalesShippingInformationById(id));
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesShippingInformation.java

@@ -0,0 +1,465 @@
+package com.ruoyi.sales.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 销售出货资料对象 sales_shipping_information
+ * 
+ * @author 刘晓旭
+ * @date 2024-09-02
+ */
+public class SalesShippingInformation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 出货资料单id */
+    private Long shippingInformationId;
+
+    /** 出货资料单单号 */
+    @Excel(name = "出货资料单单号")
+    private String shippingInformationCode;
+
+    /** 关联销售订单号 */
+    @Excel(name = "关联销售订单号")
+    private String salesOrderCode;
+
+    /** 关联出库单号 */
+    @Excel(name = "关联出库单号")
+    private String outOrderCode;
+
+    /** 出货资料类型(0出货箱单、1出货发票、2销售出货单) */
+    @Excel(name = "出货资料类型(0出货箱单、1出货发票、2销售出货单)")
+    private String shippingInformationType;
+
+    /** 模板类型 */
+    @Excel(name = "模板类型")
+    private String shippingTemplateType;
+
+    /** 出库订单类型（0销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单） */
+    @Excel(name = "出库订单类型", readConverterExp = "0=销售订单、1生产订单、2请购订单、3委外订单、4退换货订单、5开发修改单")
+    private String warehouseOrderType;
+
+    /** 出库类型（0销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料） */
+    @Excel(name = "出库类型", readConverterExp = "0=销售出库、1生产领料、2员工领料、3委外领料、4公司退货、5工程领料")
+    private String warehouseOutType;
+
+    /** 业务人员 */
+    @Excel(name = "业务人员")
+    private String businessMembers;
+
+    /** 客户代码/id */
+    @Excel(name = "客户代码/id")
+    private String customerId;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    /** 客户订单号 */
+    @Excel(name = "客户订单号")
+    private String salesOrderNumber;
+
+    /** 发货日期 */
+    private String deliveryDate;
+
+    /** 客户订单号 */
+    private String customerNumber;
+
+    /** 物料合计 */
+    @Excel(name = "物料合计")
+    private Long materialSum;
+
+    /** 数量合计 */
+    @Excel(name = "数量合计")
+    private Long enterpriseSum;
+
+    /** 不含税总价（RMB） */
+    @Excel(name = "不含税总价", readConverterExp = "R=MB")
+    private BigDecimal allPriceExcludingTaxRmb;
+
+    /** 不含税总价（美元） */
+    @Excel(name = "不含税总价", readConverterExp = "美=元")
+    private BigDecimal allPriceExcludingTaxDollar;
+
+    /** 含税总价（RMB） */
+    @Excel(name = "含税总价", readConverterExp = "R=MB")
+    private BigDecimal allPriceIncludesTax;
+
+    /** 计划交付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date plannedDeliveryTime;
+
+    /** 客户验收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "客户验收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date acceptanceTime;
+
+    /** 付款条件 */
+    @Excel(name = "付款条件")
+    private String paymentCondition;
+
+    /** 交付条件 */
+    @Excel(name = "交付条件")
+    private String deliveryCondition;
+
+    /** 送货日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliverTime;
+
+    /** 收货联系人(Ship to) */
+    @Excel(name = "收货联系人(Ship to)")
+    private String customerContact;
+
+    /** 联系电话(Ship to) */
+    @Excel(name = "联系电话(Ship to)")
+    private String contactNumber;
+
+    /** 收货地址(Ship to) */
+    @Excel(name = "收货地址(Ship to)")
+    private String customerContactAddress;
+
+    /** 收货联系人(Bill to) */
+    @Excel(name = "收货联系人(Bill to)")
+    private String customerContactBillto;
+
+    /** 联系电话(Bill to) */
+    @Excel(name = "联系电话(Bill to)")
+    private String contactNumberBillto;
+
+    /** 收货地址(Bill to) */
+    @Excel(name = "收货地址(Bill to)")
+    private String contactAddressBillto;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setShippingInformationId(Long shippingInformationId) 
+    {
+        this.shippingInformationId = shippingInformationId;
+    }
+
+    public Long getShippingInformationId() 
+    {
+        return shippingInformationId;
+    }
+    public void setShippingInformationCode(String shippingInformationCode) 
+    {
+        this.shippingInformationCode = shippingInformationCode;
+    }
+
+    public String getShippingInformationCode() 
+    {
+        return shippingInformationCode;
+    }
+    public void setSalesOrderCode(String salesOrderCode) 
+    {
+        this.salesOrderCode = salesOrderCode;
+    }
+
+    public String getSalesOrderCode() 
+    {
+        return salesOrderCode;
+    }
+    public void setOutOrderCode(String outOrderCode) 
+    {
+        this.outOrderCode = outOrderCode;
+    }
+
+    public String getOutOrderCode() 
+    {
+        return outOrderCode;
+    }
+    public void setShippingInformationType(String shippingInformationType) 
+    {
+        this.shippingInformationType = shippingInformationType;
+    }
+
+    public String getShippingInformationType() 
+    {
+        return shippingInformationType;
+    }
+    public void setShippingTemplateType(String shippingTemplateType) 
+    {
+        this.shippingTemplateType = shippingTemplateType;
+    }
+
+    public String getShippingTemplateType() 
+    {
+        return shippingTemplateType;
+    }
+    public void setWarehouseOrderType(String warehouseOrderType) 
+    {
+        this.warehouseOrderType = warehouseOrderType;
+    }
+
+    public String getWarehouseOrderType() 
+    {
+        return warehouseOrderType;
+    }
+    public void setWarehouseOutType(String warehouseOutType) 
+    {
+        this.warehouseOutType = warehouseOutType;
+    }
+
+    public String getWarehouseOutType() 
+    {
+        return warehouseOutType;
+    }
+    public void setBusinessMembers(String businessMembers) 
+    {
+        this.businessMembers = businessMembers;
+    }
+
+    public String getBusinessMembers() 
+    {
+        return businessMembers;
+    }
+    public void setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerId() 
+    {
+        return customerId;
+    }
+    public void setCustomerName(String customerName) 
+    {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerName() 
+    {
+        return customerName;
+    }
+    public void setSalesOrderNumber(String salesOrderNumber) 
+    {
+        this.salesOrderNumber = salesOrderNumber;
+    }
+
+    public String getSalesOrderNumber() 
+    {
+        return salesOrderNumber;
+    }
+    public void setDeliveryDate(String deliveryDate) 
+    {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public String getDeliveryDate() 
+    {
+        return deliveryDate;
+    }
+    public void setCustomerNumber(String customerNumber) 
+    {
+        this.customerNumber = customerNumber;
+    }
+
+    public String getCustomerNumber() 
+    {
+        return customerNumber;
+    }
+    public void setMaterialSum(Long materialSum) 
+    {
+        this.materialSum = materialSum;
+    }
+
+    public Long getMaterialSum() 
+    {
+        return materialSum;
+    }
+    public void setEnterpriseSum(Long enterpriseSum) 
+    {
+        this.enterpriseSum = enterpriseSum;
+    }
+
+    public Long getEnterpriseSum() 
+    {
+        return enterpriseSum;
+    }
+    public void setAllPriceExcludingTaxRmb(BigDecimal allPriceExcludingTaxRmb) 
+    {
+        this.allPriceExcludingTaxRmb = allPriceExcludingTaxRmb;
+    }
+
+    public BigDecimal getAllPriceExcludingTaxRmb() 
+    {
+        return allPriceExcludingTaxRmb;
+    }
+    public void setAllPriceExcludingTaxDollar(BigDecimal allPriceExcludingTaxDollar) 
+    {
+        this.allPriceExcludingTaxDollar = allPriceExcludingTaxDollar;
+    }
+
+    public BigDecimal getAllPriceExcludingTaxDollar() 
+    {
+        return allPriceExcludingTaxDollar;
+    }
+    public void setAllPriceIncludesTax(BigDecimal allPriceIncludesTax) 
+    {
+        this.allPriceIncludesTax = allPriceIncludesTax;
+    }
+
+    public BigDecimal getAllPriceIncludesTax() 
+    {
+        return allPriceIncludesTax;
+    }
+    public void setPlannedDeliveryTime(Date plannedDeliveryTime) 
+    {
+        this.plannedDeliveryTime = plannedDeliveryTime;
+    }
+
+    public Date getPlannedDeliveryTime() 
+    {
+        return plannedDeliveryTime;
+    }
+    public void setAcceptanceTime(Date acceptanceTime) 
+    {
+        this.acceptanceTime = acceptanceTime;
+    }
+
+    public Date getAcceptanceTime() 
+    {
+        return acceptanceTime;
+    }
+    public void setPaymentCondition(String paymentCondition) 
+    {
+        this.paymentCondition = paymentCondition;
+    }
+
+    public String getPaymentCondition() 
+    {
+        return paymentCondition;
+    }
+    public void setDeliveryCondition(String deliveryCondition) 
+    {
+        this.deliveryCondition = deliveryCondition;
+    }
+
+    public String getDeliveryCondition() 
+    {
+        return deliveryCondition;
+    }
+    public void setDeliverTime(Date deliverTime) 
+    {
+        this.deliverTime = deliverTime;
+    }
+
+    public Date getDeliverTime() 
+    {
+        return deliverTime;
+    }
+    public void setCustomerContact(String customerContact) 
+    {
+        this.customerContact = customerContact;
+    }
+
+    public String getCustomerContact() 
+    {
+        return customerContact;
+    }
+    public void setContactNumber(String contactNumber) 
+    {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getContactNumber() 
+    {
+        return contactNumber;
+    }
+    public void setCustomerContactAddress(String customerContactAddress) 
+    {
+        this.customerContactAddress = customerContactAddress;
+    }
+
+    public String getCustomerContactAddress() 
+    {
+        return customerContactAddress;
+    }
+    public void setCustomerContactBillto(String customerContactBillto) 
+    {
+        this.customerContactBillto = customerContactBillto;
+    }
+
+    public String getCustomerContactBillto() 
+    {
+        return customerContactBillto;
+    }
+    public void setContactNumberBillto(String contactNumberBillto) 
+    {
+        this.contactNumberBillto = contactNumberBillto;
+    }
+
+    public String getContactNumberBillto() 
+    {
+        return contactNumberBillto;
+    }
+    public void setContactAddressBillto(String contactAddressBillto) 
+    {
+        this.contactAddressBillto = contactAddressBillto;
+    }
+
+    public String getContactAddressBillto() 
+    {
+        return contactAddressBillto;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shippingInformationId", getShippingInformationId())
+            .append("shippingInformationCode", getShippingInformationCode())
+            .append("salesOrderCode", getSalesOrderCode())
+            .append("outOrderCode", getOutOrderCode())
+            .append("shippingInformationType", getShippingInformationType())
+            .append("shippingTemplateType", getShippingTemplateType())
+            .append("warehouseOrderType", getWarehouseOrderType())
+            .append("warehouseOutType", getWarehouseOutType())
+            .append("businessMembers", getBusinessMembers())
+            .append("customerId", getCustomerId())
+            .append("customerName", getCustomerName())
+            .append("salesOrderNumber", getSalesOrderNumber())
+            .append("deliveryDate", getDeliveryDate())
+            .append("customerNumber", getCustomerNumber())
+            .append("materialSum", getMaterialSum())
+            .append("enterpriseSum", getEnterpriseSum())
+            .append("allPriceExcludingTaxRmb", getAllPriceExcludingTaxRmb())
+            .append("allPriceExcludingTaxDollar", getAllPriceExcludingTaxDollar())
+            .append("allPriceIncludesTax", getAllPriceIncludesTax())
+            .append("plannedDeliveryTime", getPlannedDeliveryTime())
+            .append("acceptanceTime", getAcceptanceTime())
+            .append("paymentCondition", getPaymentCondition())
+            .append("deliveryCondition", getDeliveryCondition())
+            .append("deliverTime", getDeliverTime())
+            .append("customerContact", getCustomerContact())
+            .append("contactNumber", getContactNumber())
+            .append("customerContactAddress", getCustomerContactAddress())
+            .append("customerContactBillto", getCustomerContactBillto())
+            .append("contactNumberBillto", getContactNumberBillto())
+            .append("contactAddressBillto", getContactAddressBillto())
+            .append("remarks", getRemarks())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesShippingInformationMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.sales.mapper;
+
+import java.util.List;
+import com.ruoyi.sales.domain.SalesShippingInformation;
+
+/**
+ * 销售出货资料Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-09-02
+ */
+public interface SalesShippingInformationMapper 
+{
+    /**
+     * 查询销售出货资料
+     * 
+     * @param shippingInformationId 销售出货资料ID
+     * @return 销售出货资料
+     */
+    public SalesShippingInformation selectSalesShippingInformationById(Long shippingInformationId);
+
+    /**
+     * 查询销售出货资料列表
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 销售出货资料集合
+     */
+    public List<SalesShippingInformation> selectSalesShippingInformationList(SalesShippingInformation salesShippingInformation);
+
+    /**
+     * 新增销售出货资料
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 结果
+     */
+    public int insertSalesShippingInformation(SalesShippingInformation salesShippingInformation);
+
+    /**
+     * 修改销售出货资料
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 结果
+     */
+    public int updateSalesShippingInformation(SalesShippingInformation salesShippingInformation);
+
+    /**
+     * 删除销售出货资料
+     * 
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    public int deleteSalesShippingInformationById(Long shippingInformationId);
+
+    /**
+     * 批量删除销售出货资料
+     * 
+     * @param shippingInformationIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSalesShippingInformationByIds(String[] shippingInformationIds);
+
+    /**
+     * 作废销售出货资料
+     *
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    public int cancelSalesShippingInformationById(Long shippingInformationId);
+
+    /**
+     * 恢复销售出货资料
+     *
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    public int restoreSalesShippingInformationById(Long shippingInformationId);
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesShippingInformationService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.sales.service;
+
+import java.util.List;
+import com.ruoyi.sales.domain.SalesShippingInformation;
+
+/**
+ * 销售出货资料Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-09-02
+ */
+public interface ISalesShippingInformationService 
+{
+    /**
+     * 查询销售出货资料
+     * 
+     * @param shippingInformationId 销售出货资料ID
+     * @return 销售出货资料
+     */
+    public SalesShippingInformation selectSalesShippingInformationById(Long shippingInformationId);
+
+    /**
+     * 查询销售出货资料列表
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 销售出货资料集合
+     */
+    public List<SalesShippingInformation> selectSalesShippingInformationList(SalesShippingInformation salesShippingInformation);
+
+    /**
+     * 新增销售出货资料
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 结果
+     */
+    public int insertSalesShippingInformation(SalesShippingInformation salesShippingInformation);
+
+    /**
+     * 修改销售出货资料
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 结果
+     */
+    public int updateSalesShippingInformation(SalesShippingInformation salesShippingInformation);
+
+    /**
+     * 批量删除销售出货资料
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSalesShippingInformationByIds(String ids);
+
+    /**
+     * 删除销售出货资料信息
+     * 
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    public int deleteSalesShippingInformationById(Long shippingInformationId);
+
+    /**
+     * 作废销售出货资料
+     * @param shippingInformationId 销售出货资料ID
+     * @return
+     */
+    int cancelSalesShippingInformationById(Long shippingInformationId);
+
+    /**
+     * 恢复销售出货资料
+     * @param shippingInformationId 销售出货资料ID
+     * @return
+     */
+    int restoreSalesShippingInformationById(Long shippingInformationId);
+}

ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.sales.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.sales.mapper.SalesShippingInformationMapper;
+import com.ruoyi.sales.domain.SalesShippingInformation;
+import com.ruoyi.sales.service.ISalesShippingInformationService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 销售出货资料Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-09-02
+ */
+@Service
+public class SalesShippingInformationServiceImpl implements ISalesShippingInformationService 
+{
+    @Autowired
+    private SalesShippingInformationMapper salesShippingInformationMapper;
+
+    /**
+     * 查询销售出货资料
+     * 
+     * @param shippingInformationId 销售出货资料ID
+     * @return 销售出货资料
+     */
+    @Override
+    public SalesShippingInformation selectSalesShippingInformationById(Long shippingInformationId)
+    {
+        return salesShippingInformationMapper.selectSalesShippingInformationById(shippingInformationId);
+    }
+
+    /**
+     * 查询销售出货资料列表
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 销售出货资料
+     */
+    @Override
+    public List<SalesShippingInformation> selectSalesShippingInformationList(SalesShippingInformation salesShippingInformation)
+    {
+        return salesShippingInformationMapper.selectSalesShippingInformationList(salesShippingInformation);
+    }
+
+    /**
+     * 新增销售出货资料
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 结果
+     */
+    @Override
+    public int insertSalesShippingInformation(SalesShippingInformation salesShippingInformation)
+    {
+        salesShippingInformation.setCreateTime(DateUtils.getNowDate());
+        String loginName = ShiroUtils.getLoginName();
+        salesShippingInformation.setCreateBy(loginName);
+        return salesShippingInformationMapper.insertSalesShippingInformation(salesShippingInformation);
+    }
+
+    /**
+     * 修改销售出货资料
+     * 
+     * @param salesShippingInformation 销售出货资料
+     * @return 结果
+     */
+    @Override
+    public int updateSalesShippingInformation(SalesShippingInformation salesShippingInformation)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        salesShippingInformation.setUpdateBy(loginName);
+        salesShippingInformation.setUpdateTime(DateUtils.getNowDate());
+        return salesShippingInformationMapper.updateSalesShippingInformation(salesShippingInformation);
+    }
+
+    /**
+     * 删除销售出货资料对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSalesShippingInformationByIds(String ids)
+    {
+        return salesShippingInformationMapper.deleteSalesShippingInformationByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除销售出货资料信息
+     * 
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSalesShippingInformationById(Long shippingInformationId)
+    {
+        return salesShippingInformationMapper.deleteSalesShippingInformationById(shippingInformationId);
+    }
+
+    /**
+     * 作废销售出货资料
+     *
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    @Override
+    public int cancelSalesShippingInformationById(Long shippingInformationId)
+    {
+        return salesShippingInformationMapper.cancelSalesShippingInformationById(shippingInformationId);
+    }
+
+    /**
+     * 恢复销售出货资料信息
+     *
+     * @param shippingInformationId 销售出货资料ID
+     * @return 结果
+     */
+    @Override
+    public int restoreSalesShippingInformationById(Long shippingInformationId)
+    {
+        return salesShippingInformationMapper.restoreSalesShippingInformationById(shippingInformationId);
+    }
+}

ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml

@@ -0,0 +1,204 @@
+<?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="com.ruoyi.sales.mapper.SalesShippingInformationMapper">
+    
+    <resultMap type="SalesShippingInformation" id="SalesShippingInformationResult">
+        <result property="shippingInformationId"    column="shipping_information_id"    />
+        <result property="shippingInformationCode"    column="shipping_information_code"    />
+        <result property="salesOrderCode"    column="sales_order_code"    />
+        <result property="outOrderCode"    column="out_order_code"    />
+        <result property="shippingInformationType"    column="shipping_information_type"    />
+        <result property="shippingTemplateType"    column="shipping_template_type"    />
+        <result property="warehouseOrderType"    column="warehouse_order_type"    />
+        <result property="warehouseOutType"    column="warehouse_out_type"    />
+        <result property="businessMembers"    column="business_members"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="salesOrderNumber"    column="sales_order_number"    />
+        <result property="deliveryDate"    column="delivery_date"    />
+        <result property="customerNumber"    column="customer_number"    />
+        <result property="materialSum"    column="material_sum"    />
+        <result property="enterpriseSum"    column="enterprise_sum"    />
+        <result property="allPriceExcludingTaxRmb"    column="all_price_excluding_tax_rmb"    />
+        <result property="allPriceExcludingTaxDollar"    column="all_price_excluding_tax_dollar"    />
+        <result property="allPriceIncludesTax"    column="all_price_includes_tax"    />
+        <result property="plannedDeliveryTime"    column="planned_delivery_time"    />
+        <result property="acceptanceTime"    column="acceptance_time"    />
+        <result property="paymentCondition"    column="payment_condition"    />
+        <result property="deliveryCondition"    column="delivery_condition"    />
+        <result property="deliverTime"    column="deliver_time"    />
+        <result property="customerContact"    column="customer_contact"    />
+        <result property="contactNumber"    column="contact_number"    />
+        <result property="customerContactAddress"    column="customer_contact_address"    />
+        <result property="customerContactBillto"    column="customer_contact_billto"    />
+        <result property="contactNumberBillto"    column="contact_number_billto"    />
+        <result property="contactAddressBillto"    column="contact_address_billto"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectSalesShippingInformationVo">
+        select shipping_information_id, shipping_information_code, sales_order_code, out_order_code, shipping_information_type, shipping_template_type, warehouse_order_type, warehouse_out_type, business_members, customer_id, customer_name, sales_order_number, delivery_date, customer_number, material_sum, enterprise_sum, all_price_excluding_tax_rmb, all_price_excluding_tax_dollar, all_price_includes_tax, planned_delivery_time, acceptance_time, payment_condition, delivery_condition, deliver_time, customer_contact, contact_number, customer_contact_address, customer_contact_billto, contact_number_billto, contact_address_billto, remarks, create_time, create_by, update_by, update_time from sales_shipping_information
+    </sql>
+
+    <select id="selectSalesShippingInformationList" parameterType="SalesShippingInformation" resultMap="SalesShippingInformationResult">
+        <include refid="selectSalesShippingInformationVo"/>
+        <where>  
+            <if test="shippingInformationCode != null  and shippingInformationCode != ''"> and shipping_information_code = #{shippingInformationCode}</if>
+            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if>
+            <if test="outOrderCode != null  and outOrderCode != ''"> and out_order_code = #{outOrderCode}</if>
+            <if test="shippingInformationType != null  and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
+            <if test="warehouseOrderType != null  and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
+            <if test="warehouseOutType != null  and warehouseOutType != ''"> and warehouse_out_type = #{warehouseOutType}</if>
+            <if test="businessMembers != null  and businessMembers != ''"> and business_members = #{businessMembers}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectSalesShippingInformationById" parameterType="Long" resultMap="SalesShippingInformationResult">
+        <include refid="selectSalesShippingInformationVo"/>
+        where shipping_information_id = #{shippingInformationId}
+    </select>
+        
+    <insert id="insertSalesShippingInformation" parameterType="SalesShippingInformation" useGeneratedKeys="true" keyProperty="shippingInformationId">
+        insert into sales_shipping_information
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="shippingInformationCode != null">shipping_information_code,</if>
+            <if test="salesOrderCode != null">sales_order_code,</if>
+            <if test="outOrderCode != null">out_order_code,</if>
+            <if test="shippingInformationType != null">shipping_information_type,</if>
+            <if test="shippingTemplateType != null">shipping_template_type,</if>
+            <if test="warehouseOrderType != null">warehouse_order_type,</if>
+            <if test="warehouseOutType != null">warehouse_out_type,</if>
+            <if test="businessMembers != null">business_members,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="customerName != null">customer_name,</if>
+            <if test="salesOrderNumber != null">sales_order_number,</if>
+            <if test="deliveryDate != null">delivery_date,</if>
+            <if test="customerNumber != null">customer_number,</if>
+            <if test="materialSum != null">material_sum,</if>
+            <if test="enterpriseSum != null">enterprise_sum,</if>
+            <if test="allPriceExcludingTaxRmb != null">all_price_excluding_tax_rmb,</if>
+            <if test="allPriceExcludingTaxDollar != null">all_price_excluding_tax_dollar,</if>
+            <if test="allPriceIncludesTax != null">all_price_includes_tax,</if>
+            <if test="plannedDeliveryTime != null">planned_delivery_time,</if>
+            <if test="acceptanceTime != null">acceptance_time,</if>
+            <if test="paymentCondition != null">payment_condition,</if>
+            <if test="deliveryCondition != null">delivery_condition,</if>
+            <if test="deliverTime != null">deliver_time,</if>
+            <if test="customerContact != null">customer_contact,</if>
+            <if test="contactNumber != null">contact_number,</if>
+            <if test="customerContactAddress != null">customer_contact_address,</if>
+            <if test="customerContactBillto != null">customer_contact_billto,</if>
+            <if test="contactNumberBillto != null">contact_number_billto,</if>
+            <if test="contactAddressBillto != null">contact_address_billto,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="shippingInformationCode != null">#{shippingInformationCode},</if>
+            <if test="salesOrderCode != null">#{salesOrderCode},</if>
+            <if test="outOrderCode != null">#{outOrderCode},</if>
+            <if test="shippingInformationType != null">#{shippingInformationType},</if>
+            <if test="shippingTemplateType != null">#{shippingTemplateType},</if>
+            <if test="warehouseOrderType != null">#{warehouseOrderType},</if>
+            <if test="warehouseOutType != null">#{warehouseOutType},</if>
+            <if test="businessMembers != null">#{businessMembers},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="customerName != null">#{customerName},</if>
+            <if test="salesOrderNumber != null">#{salesOrderNumber},</if>
+            <if test="deliveryDate != null">#{deliveryDate},</if>
+            <if test="customerNumber != null">#{customerNumber},</if>
+            <if test="materialSum != null">#{materialSum},</if>
+            <if test="enterpriseSum != null">#{enterpriseSum},</if>
+            <if test="allPriceExcludingTaxRmb != null">#{allPriceExcludingTaxRmb},</if>
+            <if test="allPriceExcludingTaxDollar != null">#{allPriceExcludingTaxDollar},</if>
+            <if test="allPriceIncludesTax != null">#{allPriceIncludesTax},</if>
+            <if test="plannedDeliveryTime != null">#{plannedDeliveryTime},</if>
+            <if test="acceptanceTime != null">#{acceptanceTime},</if>
+            <if test="paymentCondition != null">#{paymentCondition},</if>
+            <if test="deliveryCondition != null">#{deliveryCondition},</if>
+            <if test="deliverTime != null">#{deliverTime},</if>
+            <if test="customerContact != null">#{customerContact},</if>
+            <if test="contactNumber != null">#{contactNumber},</if>
+            <if test="customerContactAddress != null">#{customerContactAddress},</if>
+            <if test="customerContactBillto != null">#{customerContactBillto},</if>
+            <if test="contactNumberBillto != null">#{contactNumberBillto},</if>
+            <if test="contactAddressBillto != null">#{contactAddressBillto},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSalesShippingInformation" parameterType="SalesShippingInformation">
+        update sales_shipping_information
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="shippingInformationCode != null">shipping_information_code = #{shippingInformationCode},</if>
+            <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
+            <if test="shippingInformationType != null">shipping_information_type = #{shippingInformationType},</if>
+            <if test="shippingTemplateType != null">shipping_template_type = #{shippingTemplateType},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="warehouseOutType != null">warehouse_out_type = #{warehouseOutType},</if>
+            <if test="businessMembers != null">business_members = #{businessMembers},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
+            <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
+            <if test="customerNumber != null">customer_number = #{customerNumber},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
+            <if test="allPriceExcludingTaxRmb != null">all_price_excluding_tax_rmb = #{allPriceExcludingTaxRmb},</if>
+            <if test="allPriceExcludingTaxDollar != null">all_price_excluding_tax_dollar = #{allPriceExcludingTaxDollar},</if>
+            <if test="allPriceIncludesTax != null">all_price_includes_tax = #{allPriceIncludesTax},</if>
+            <if test="plannedDeliveryTime != null">planned_delivery_time = #{plannedDeliveryTime},</if>
+            <if test="acceptanceTime != null">acceptance_time = #{acceptanceTime},</if>
+            <if test="paymentCondition != null">payment_condition = #{paymentCondition},</if>
+            <if test="deliveryCondition != null">delivery_condition = #{deliveryCondition},</if>
+            <if test="deliverTime != null">deliver_time = #{deliverTime},</if>
+            <if test="customerContact != null">customer_contact = #{customerContact},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
+            <if test="customerContactAddress != null">customer_contact_address = #{customerContactAddress},</if>
+            <if test="customerContactBillto != null">customer_contact_billto = #{customerContactBillto},</if>
+            <if test="contactNumberBillto != null">contact_number_billto = #{contactNumberBillto},</if>
+            <if test="contactAddressBillto != null">contact_address_billto = #{contactAddressBillto},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where shipping_information_id = #{shippingInformationId}
+    </update>
+
+    <delete id="deleteSalesShippingInformationById" parameterType="Long">
+        delete from sales_shipping_information where shipping_information_id = #{shippingInformationId}
+    </delete>
+
+    <delete id="deleteSalesShippingInformationByIds" parameterType="String">
+        delete from sales_shipping_information where shipping_information_id in 
+        <foreach item="shippingInformationId" collection="array" open="(" separator="," close=")">
+            #{shippingInformationId}
+        </foreach>
+    </delete>
+
+    <update id="cancelSalesShippingInformationById" parameterType="Long">
+        update sales_shipping_information set del_flag = '1' where shipping_information_id = #{shippingInformationId}
+    </update>
+
+    <update id="restoreSalesShippingInformationById" parameterType="Long">
+        update sales_shipping_information set del_flag = '0' where shipping_information_id = #{shippingInformationId}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/add.html

@@ -0,0 +1,231 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增销售出货资料')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-salesShippingInformation-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出货资料单单号：</label>
+                <div class="col-sm-8">
+                    <input name="shippingInformationCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联销售订单号：</label>
+                <div class="col-sm-8">
+                    <input name="salesOrderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关联出库单号：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出货资料类型(0出货箱单、1出货发票、2销售出货单)：</label>
+                <div class="col-sm-8">
+                    <select name="shippingInformationType" class="form-control m-b" th:with="type=${@dict.getType('shipping_information_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">模板类型：</label>
+                <div class="col-sm-8">
+                    <select name="shippingTemplateType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库订单类型：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">出库类型：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseOutType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_out_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务人员：</label>
+                <div class="col-sm-8">
+                    <input name="businessMembers" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户代码/id：</label>
+                <div class="col-sm-8">
+                    <input name="customerId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="customerName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户订单号：</label>
+                <div class="col-sm-8">
+                    <input name="salesOrderNumber" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料合计：</label>
+                <div class="col-sm-8">
+                    <input name="materialSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量合计：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseSum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceExcludingTaxRmb" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">不含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceExcludingTaxDollar" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">含税总价：</label>
+                <div class="col-sm-8">
+                    <input name="allPriceIncludesTax" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">计划交付时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="plannedDeliveryTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">客户验收时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="acceptanceTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">付款条件：</label>
+                <div class="col-sm-8">
+                    <input name="paymentCondition" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">交付条件：</label>
+                <div class="col-sm-8">
+                    <input name="deliveryCondition" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">送货日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="deliverTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收货联系人(Ship to)：</label>
+                <div class="col-sm-8">
+                    <input name="customerContact" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话(Ship to)：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumber" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收货地址(Ship to)：</label>
+                <div class="col-sm-8">
+                    <input name="customerContactAddress" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收货联系人(Bill to)：</label>
+                <div class="col-sm-8">
+                    <input name="customerContactBillto" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话(Bill to)：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumberBillto" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">收货地址(Bill to)：</label>
+                <div class="col-sm-8">
+                    <input name="contactAddressBillto" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "sales/salesShippingInformation"
+        $("#form-salesShippingInformation-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-salesShippingInformation-add').serialize());
+            }
+        }
+
+        $("input[name='plannedDeliveryTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='acceptanceTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='deliverTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/edit.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改销售出货资料')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-salesShippingInformation-edit" th:object="${salesShippingInformation}">
+            <input name="shippingInformationId" th:field="*{shippingInformationId}" type="hidden">
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "sales/salesShippingInformation";
+        $("#form-salesShippingInformation-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-salesShippingInformation-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html

@@ -0,0 +1,270 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('销售出货资料列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>出货资料单单号：</label>
+                                <input type="text" name="shippingInformationCode"/>
+                            </li>
+                            <li>
+                                <label>关联销售订单号：</label>
+                                <input type="text" name="salesOrderCode"/>
+                            </li>
+                            <li>
+                                <label>关联出库单号：</label>
+                                <input type="text" name="outOrderCode"/>
+                            </li>
+                            <li>
+                                <label>出货资料类型(0出货箱单、1出货发票、2销售出货单)：</label>
+                                <select name="shippingInformationType" th:with="type=${@dict.getType('shipping_information_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>出库订单类型：</label>
+                                <select name="warehouseOrderType" th:with="type=${@dict.getType('warehouse_order_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>出库类型：</label>
+                                <select name="warehouseOutType" th:with="type=${@dict.getType('warehouse_out_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>业务人员：</label>
+                                <input type="text" name="businessMembers"/>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="sales:salesShippingInformation:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="sales:salesShippingInformation:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sales:salesShippingInformation:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="sales:salesShippingInformation:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('sales:salesShippingInformation:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('sales:salesShippingInformation:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('sales:salesShippingInformation:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('sales:salesShippingInformation:restore')}]];
+        var shippingInformationTypeDatas = [[${@dict.getType('shipping_information_type')}]];
+        var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
+        var warehouseOutTypeDatas = [[${@dict.getType('warehouse_out_type')}]];
+        var prefix = ctx + "sales/salesShippingInformation";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "销售出货资料",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    title: '出货资料单id',
+                    field: 'shippingInformationId',
+                    visible: false
+                },
+                {
+                    title: '出货资料单单号',
+                    field: 'shippingInformationCode',
+                },
+                {
+                    title: '关联销售订单号',
+                    field: 'salesOrderCode',
+                },
+                {
+                    title: '关联出库单号',
+                    field: 'outOrderCode',
+                },
+                {
+                    title: '出货资料类型(0出货箱单、1出货发票、2销售出货单)',
+                    field: 'shippingInformationType',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(shippingInformationTypeDatas, value);
+                    }
+                },
+                {
+                    title: '模板类型',
+                    field: 'shippingTemplateType',
+                },
+                {
+                    title: '出库订单类型',
+                    field: 'warehouseOrderType',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
+                    }
+                },
+                {
+                    title: '出库类型',
+                    field: 'warehouseOutType',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseOutTypeDatas, value);
+                    }
+                },
+                {
+                    title: '业务人员',
+                    field: 'businessMembers',
+                },
+                {
+                    title: '客户代码/id',
+                    field: 'customerId',
+                },
+                {
+                    title: '客户名称',
+                    field: 'customerName',
+                },
+                {
+                    title: '客户订单号',
+                    field: 'salesOrderNumber',
+                },
+                {
+                    title: '物料合计',
+                    field: 'materialSum',
+                },
+                {
+                    title: '数量合计',
+                    field: 'enterpriseSum',
+                },
+                {
+                    title: '不含税总价',
+                    field: 'allPriceExcludingTaxRmb',
+                },
+                {
+                    title: '不含税总价',
+                    field: 'allPriceExcludingTaxDollar',
+                },
+                {
+                    title: '含税总价',
+                    field: 'allPriceIncludesTax',
+                },
+                {
+                    title: '计划交付时间',
+                    field: 'plannedDeliveryTime',
+                },
+                {
+                    title: '客户验收时间',
+                    field: 'acceptanceTime',
+                },
+                {
+                    title: '付款条件',
+                    field: 'paymentCondition',
+                },
+                {
+                    title: '交付条件',
+                    field: 'deliveryCondition',
+                },
+                {
+                    title: '送货日期',
+                    field: 'deliverTime',
+                },
+                {
+                    title: '收货联系人(Ship to)',
+                    field: 'customerContact',
+                },
+                {
+                    title: '联系电话(Ship to)',
+                    field: 'contactNumber',
+                },
+                {
+                    title: '收货地址(Ship to)',
+                    field: 'customerContactAddress',
+                },
+                {
+                    title: '收货联系人(Bill to)',
+                    field: 'customerContactBillto',
+                },
+                {
+                    title: '联系电话(Bill to)',
+                    field: 'contactNumberBillto',
+                },
+                {
+                    title: '收货地址(Bill to)',
+                    field: 'contactAddressBillto',
+                },
+                {
+                    title: '备注',
+                    field: 'remarks',
+                },
+                {
+                    title: '录入时间',
+                    field: 'createTime',
+                },
+                {
+                    title: '录入人',
+                    field: 'createBy',
+                },
+                {
+                    title: '更新人',
+                    field: 'updateBy',
+                },
+                {
+                    title: '上次更新时间',
+                    field: 'updateTime',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.shippingInformationId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.shippingInformationId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        if(row.delFlag == '0'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>