要货列表

suishenbang-order/src/main/java/com/dgtly/order/controller/SalesOrderBaseController.java

@@ -0,0 +1,77 @@
+package com.dgtly.order.controller;
+
+import java.util.List;
+
+import com.dgtly.order.domain.SalesOrderBase;
+import com.dgtly.order.service.ISalesOrderBaseService;
+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.dgtly.common.annotation.Log;
+import com.dgtly.common.enums.BusinessType;
+
+
+import com.dgtly.common.core.controller.BaseController;
+import com.dgtly.common.core.domain.AjaxResult;
+import com.dgtly.common.utils.poi.ExcelUtil;
+import com.dgtly.common.core.page.TableDataInfo;
+
+/**
+ * 要货查询 Controller
+ * 
+ * @author chenyn
+ * @date 2023-05-23
+ */
+@Controller
+@RequestMapping("/order/salesOrderBase")
+public class SalesOrderBaseController extends BaseController
+{
+    private String prefix = "/order/salesOrderBase";
+
+    @Autowired
+    private ISalesOrderBaseService salesOrderBaseService;
+
+    @RequiresPermissions("order:salesOrderBase:view")
+    @GetMapping()
+    public String group()
+    {
+        return prefix + "/test";
+    }
+//    public String group()
+//    {
+//        return prefix + "/groupList";
+//    }
+
+    /**
+     * 查询【要货查询】 列表
+     */
+    @RequiresPermissions("order:salesOrderBase:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SalesOrderBase salesOrderBase)
+    {
+        startPage();
+            List<SalesOrderBase> list = salesOrderBaseService.selectSalesOrderBaseList(salesOrderBase);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【要货查询】 列表
+     */
+    @RequiresPermissions("oder:salesOrderBase:export")
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SalesOrderBase salesOrderBase)
+    {
+        List<SalesOrderBase> list = salesOrderBaseService.selectSalesOrderBaseList(salesOrderBase);
+        ExcelUtil<SalesOrderBase> util = new ExcelUtil<SalesOrderBase>(SalesOrderBase.class);
+        return util.exportExcel(list, "要货查询");
+    }
+
+}

suishenbang-order/src/main/java/com/dgtly/order/domain/SalesOrderBase.java

@@ -0,0 +1,166 @@
+package com.dgtly.order.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 订单基础 对象 sales_order_base
+ *
+ * @author dgtly
+ * @date 2023-05-23
+ */
+public class SalesOrderBase extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private String isDelete;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    /** 订单生成时间 */
+    @Excel(name = "订单生成时间")
+    private String orderCreationTime;
+
+    /** 确认人 */
+    @Excel(name = "确认人")
+    private String confirmBy;
+
+    /** 期望到货时间 */
+    @Excel(name = "期望到货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expectedTime;
+
+    /** 订单所属 */
+    @Excel(name = "订单所属")
+    private String belongTo;
+
+    /** 期望到货时间是否通知 */
+    @Excel(name = "期望到货时间是否通知")
+    private String expectedTimeNotice;
+
+    @NotBlank(message = "经销商名称")
+    private String customerName;
+
+    @NotBlank(message = "经销商代码")
+    private String customerCode;
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setIsDelete(String isDelete)
+    {
+        this.isDelete = isDelete;
+    }
+
+    public String getIsDelete()
+    {
+        return isDelete;
+    }
+    public void setOrderNumber(String orderNumber)
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber()
+    {
+        return orderNumber;
+    }
+    public void setOrderCreationTime(String orderCreationTime)
+    {
+        this.orderCreationTime = orderCreationTime;
+    }
+
+    public String getOrderCreationTime()
+    {
+        return orderCreationTime;
+    }
+    public void setConfirmBy(String confirmBy)
+    {
+        this.confirmBy = confirmBy;
+    }
+
+    public String getConfirmBy()
+    {
+        return confirmBy;
+    }
+    public void setExpectedTime(Date expectedTime)
+    {
+        this.expectedTime = expectedTime;
+    }
+
+    public Date getExpectedTime()
+    {
+        return expectedTime;
+    }
+    public void setBelongTo(String belongTo)
+    {
+        this.belongTo = belongTo;
+    }
+
+    public String getBelongTo()
+    {
+        return belongTo;
+    }
+    public void setExpectedTimeNotice(String expectedTimeNotice)
+    {
+        this.expectedTimeNotice = expectedTimeNotice;
+    }
+
+    public String getExpectedTimeNotice()
+    {
+        return expectedTimeNotice;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDelete", getIsDelete())
+            .append("orderNumber", getOrderNumber())
+            .append("orderCreationTime", getOrderCreationTime())
+            .append("confirmBy", getConfirmBy())
+                .append("customerName",getCustomerName())
+                .append("customerCode",getCustomerCode())
+            .append("expectedTime", getExpectedTime())
+            .append("belongTo", getBelongTo())
+            .append("expectedTimeNotice", getExpectedTimeNotice())
+            .toString();
+    }
+}

suishenbang-order/src/main/java/com/dgtly/order/mapper/SalesOrderBaseMapper.java

@@ -0,0 +1,32 @@
+package com.dgtly.order.mapper;
+
+
+import com.dgtly.order.domain.SalesOrderBase;
+
+import java.util.List;
+
+/**
+ * 订单基础 Mapper接口
+ * 
+ * @author dgtly
+ * @date 2023-05-23
+ */
+public interface SalesOrderBaseMapper 
+{
+    /**
+     * 查询订单基础 
+     * 
+     * @param id 订单基础 ID
+     * @return 订单基础 
+     */
+    public SalesOrderBase selectSalesOrderBaseById(Long id);
+
+    /**
+     * 查询订单基础 列表
+     * 
+     * @param salesOrderBase 订单基础 
+     * @return 订单基础 集合
+     */
+    public List<SalesOrderBase> selectSalesOrderBaseList(SalesOrderBase salesOrderBase);
+
+}

suishenbang-order/src/main/java/com/dgtly/order/service/ISalesOrderBaseService.java

@@ -0,0 +1,32 @@
+package com.dgtly.order.service;
+
+
+import com.dgtly.order.domain.SalesOrderBase;
+
+import java.util.List;
+
+/**
+ * 订单基础 Service接口
+ * 
+ * @author dgtly
+ * @date 2023-05-23
+ */
+public interface ISalesOrderBaseService 
+{
+    /**
+     * 查询订单基础 
+     * 
+     * @param id 订单基础 ID
+     * @return 订单基础 
+     */
+    public SalesOrderBase selectSalesOrderBaseById(Long id);
+
+    /**
+     * 查询订单基础 列表
+     * 
+     * @param salesOrderBase 订单基础 
+     * @return 订单基础 集合
+     */
+    public List<SalesOrderBase> selectSalesOrderBaseList(SalesOrderBase salesOrderBase);
+
+}

suishenbang-order/src/main/java/com/dgtly/order/service/impl/SalesOrderBaseServiceImpl.java

@@ -0,0 +1,49 @@
+package com.dgtly.order.service.impl;
+
+import java.util.List;
+import com.dgtly.common.utils.DateUtils;
+import com.dgtly.order.domain.SalesOrderBase;
+import com.dgtly.order.mapper.SalesOrderBaseMapper;
+import com.dgtly.order.service.ISalesOrderBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.dgtly.common.core.text.Convert;
+
+/**
+ * 订单基础 Service业务层处理
+ * 
+ * @author dgtly
+ * @date 2023-05-23
+ */
+@Service
+public class SalesOrderBaseServiceImpl implements ISalesOrderBaseService
+{
+    @Autowired
+    private SalesOrderBaseMapper salesOrderBaseMapper;
+
+    /**
+     * 查询订单基础 
+     * 
+     * @param id 订单基础 ID
+     * @return 订单基础 
+     */
+    @Override
+    public SalesOrderBase selectSalesOrderBaseById(Long id)
+    {
+        return salesOrderBaseMapper.selectSalesOrderBaseById(id);
+    }
+
+    /**
+     * 查询订单基础 列表
+     * 
+     * @param salesOrderBase 订单基础 
+     * @return 订单基础 
+     */
+    @Override
+    public List<SalesOrderBase> selectSalesOrderBaseList(SalesOrderBase salesOrderBase)
+    {
+        return salesOrderBaseMapper.selectSalesOrderBaseList(salesOrderBase);
+    }
+
+
+}

suishenbang-order/src/main/resources/mapper/order/SalesOrderBaseMapper.xml

@@ -0,0 +1,121 @@
+<?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.dgtly.order.mapper.SalesOrderBaseMapper">
+    
+    <resultMap type="SalesOrderBase" id="SalesOrderBaseResult">
+        <result property="id"    column="id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDelete"    column="is_delete"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="orderCreationTime"    column="order_creation_time"    />
+        <result property="confirmBy"    column="confirm_by"    />
+        <result property="expectedTime"    column="expected_time"    />
+        <result property="belongTo"    column="belong_to"    />
+        <result property="expectedTimeNotice"    column="expected_time_notice"    />
+
+    </resultMap>
+
+    <sql id="selectSalesOrderBaseVo">
+        SELECT
+            s.id,
+            s.create_by,
+            s.create_time,
+            s.update_by,
+            s.update_time,
+            s.is_delete,
+            s.order_number,
+            s.order_creation_time,
+            s.confirm_by,
+            s.expected_time,
+            s.belong_to,
+            s.expected_time_notice,
+            CustomerCode,
+            CustomerName
+        FROM
+            sales_order_base s
+                LEFT JOIN data_master_customer d ON d.CustomerCode = s.belong_to
+    </sql>
+
+    <select id="selectSalesOrderBaseList" parameterType="SalesOrderBase" resultMap="SalesOrderBaseResult">
+        <include refid="selectSalesOrderBaseVo"/>
+        <where>  
+            <if test="isDelete != null  and isDelete != ''"> and is_delete = #{isDelete}</if>
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''"> and order_creation_time = #{orderCreationTime}</if>
+            <if test="confirmBy != null  and confirmBy != ''"> and confirm_by = #{confirmBy}</if>
+            <if test="expectedTime != null "> and expected_time = #{expectedTime}</if>
+            <if test="belongTo != null  and belongTo != ''"> and belong_to = #{belongTo}</if>
+            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''"> and expected_time_notice = #{expectedTimeNotice}</if>
+        </where>
+    </select>
+    
+    <select id="selectSalesOrderBaseById" parameterType="Long" resultMap="SalesOrderBaseResult">
+        <include refid="selectSalesOrderBaseVo"/>
+        where id = #{id}
+    </select>
+        
+    <!--<insert id="insertSalesOrderBase" parameterType="SalesOrderBase" useGeneratedKeys="true" keyProperty="id">
+        insert into sales_order_base
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createTime != null ">create_time,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateTime != null ">update_time,</if>
+            <if test="isDelete != null  and isDelete != ''">is_delete,</if>
+            <if test="orderNumber != null  and orderNumber != ''">order_number,</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''">order_creation_time,</if>
+            <if test="confirmBy != null  and confirmBy != ''">confirm_by,</if>
+            <if test="expectedTime != null ">expected_time,</if>
+            <if test="belongTo != null  and belongTo != ''">belong_to,</if>
+            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">expected_time_notice,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createTime != null ">#{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null ">#{updateTime},</if>
+            <if test="isDelete != null  and isDelete != ''">#{isDelete},</if>
+            <if test="orderNumber != null  and orderNumber != ''">#{orderNumber},</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''">#{orderCreationTime},</if>
+            <if test="confirmBy != null  and confirmBy != ''">#{confirmBy},</if>
+            <if test="expectedTime != null ">#{expectedTime},</if>
+            <if test="belongTo != null  and belongTo != ''">#{belongTo},</if>
+            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">#{expectedTimeNotice},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSalesOrderBase" parameterType="SalesOrderBase">
+        update sales_order_base
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null ">update_time = #{updateTime},</if>
+            <if test="isDelete != null  and isDelete != ''">is_delete = #{isDelete},</if>
+            <if test="orderNumber != null  and orderNumber != ''">order_number = #{orderNumber},</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''">order_creation_time = #{orderCreationTime},</if>
+            <if test="confirmBy != null  and confirmBy != ''">confirm_by = #{confirmBy},</if>
+            <if test="expectedTime != null ">expected_time = #{expectedTime},</if>
+            <if test="belongTo != null  and belongTo != ''">belong_to = #{belongTo},</if>
+            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">expected_time_notice = #{expectedTimeNotice},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSalesOrderBaseById" parameterType="Long">
+        delete from sales_order_base where id = #{id}
+    </delete>
+
+    <delete id="deleteSalesOrderBaseByIds" parameterType="String">
+        delete from sales_order_base where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+    
+</mapper>

suishenbang-order/src/main/resources/templates/order/salesOrderBase/test.html

@@ -0,0 +1,109 @@
+<!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>
+                            <p>经销商编码：</p>
+                            <input type="text" name="customerCode"/>
+                        </li>
+                        <li>
+                            <p>经销商名称：</p>
+                            <input type="text" name="customerName"/>
+                        </li>
+                        <li class="select-time">
+                            <p>创建时间：</p>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginExpectedTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endExpectedTime]"/>
+                        </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-warning" onclick="$.table.exportExcel()"
+               shiro:hasPermission="order:salesOrderBaseTest: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('order:salesOrderBaseTest:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('order:salesOrderBaseTest:remove')}]];
+    var prefix = ctx + "order/salesOrderBase";
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            exportUrl: prefix + "/export",
+            modalName: "要货查询",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'orderNumber',
+                    title: '订单号'
+                },
+                {
+                    field: 'customerCode',
+                    title: '经销商编码'
+                },
+                {
+                    field: 'customerName',
+                    title: '经销商名称'
+                },
+                {
+                    field: 'expectedTime',
+                    title: '期望到货时间'
+                },
+                {
+                    field: 'confirmBy',
+                    title: '确认人（操作用户）'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间（操作时间）'
+                },
+                {
+                    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.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>