Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalOrderInfo.java

@@ -0,0 +1,156 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 审批订单信息表
+ * Created by Administrator on 2018/9/18.
+ */
+public class ApprovalOrderInfo implements Serializable {
+    private static final long serialVersionUID = -6637217889680405558L;
+    private Integer approvalId;//
+    private String applicantName;//申请人姓名
+    private String orderName;//订单名称
+    private Integer companyName;//客户公司名称
+    private String contactName;//客户联系人姓名
+    private String contactTel;//客户联系人电话
+    private Date deliveryTime;//期望交付时间
+    private String deliveryWay;//交付方式
+    private String contractName;//合同名称
+    private String contractImg;//合同图片
+    private String attachmentImg;//附件图片
+    private Integer approvalState;//审核状态1.待审核2.已审核.待入库 3.已入库 4.已拒绝5.已删除
+    private Integer currentAdminId;//当前审核人id（管理员id）
+    private String approvalDesc;//备注信息
+    private Date approvalCreateTime;//创建时间
+    private Date approvalUpdateTime;//修改时间
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public Integer getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(Integer companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactTel() {
+        return contactTel;
+    }
+
+    public void setContactTel(String contactTel) {
+        this.contactTel = contactTel;
+    }
+
+    public Date getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(Date deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getDeliveryWay() {
+        return deliveryWay;
+    }
+
+    public void setDeliveryWay(String deliveryWay) {
+        this.deliveryWay = deliveryWay;
+    }
+
+    public String getContractName() {
+        return contractName;
+    }
+
+    public void setContractName(String contractName) {
+        this.contractName = contractName;
+    }
+
+    public String getContractImg() {
+        return contractImg;
+    }
+
+    public void setContractImg(String contractImg) {
+        this.contractImg = contractImg;
+    }
+
+    public String getAttachmentImg() {
+        return attachmentImg;
+    }
+
+    public void setAttachmentImg(String attachmentImg) {
+        this.attachmentImg = attachmentImg;
+    }
+
+    public Integer getApprovalState() {
+        return approvalState;
+    }
+
+    public void setApprovalState(Integer approvalState) {
+        this.approvalState = approvalState;
+    }
+
+    public Integer getCurrentAdminId() {
+        return currentAdminId;
+    }
+
+    public void setCurrentAdminId(Integer currentAdminId) {
+        this.currentAdminId = currentAdminId;
+    }
+
+    public String getApprovalDesc() {
+        return approvalDesc;
+    }
+
+    public void setApprovalDesc(String approvalDesc) {
+        this.approvalDesc = approvalDesc;
+    }
+
+    public Date getApprovalCreateTime() {
+        return approvalCreateTime;
+    }
+
+    public void setApprovalCreateTime(Date approvalCreateTime) {
+        this.approvalCreateTime = approvalCreateTime;
+    }
+
+    public Date getApprovalUpdateTime() {
+        return approvalUpdateTime;
+    }
+
+    public void setApprovalUpdateTime(Date approvalUpdateTime) {
+        this.approvalUpdateTime = approvalUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalOrderItem.java

@@ -0,0 +1,84 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 审批订单项表
+ * Created by Administrator on 2018/9/18.
+ */
+public class ApprovalOrderItem implements Serializable {
+    private static final long serialVersionUID = 6491512318998002598L;
+    private Integer itemId;//
+    private Integer approvalId;//审核订单id
+    private Integer productId;//产品id
+    private String productName;//产品名称
+    private String colorName;//颜色名称
+    private Integer productNum;//产品数量
+    private Date itemCreateTime;//创建时间
+    private Date itemUpdateTime;//修改时间
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public Integer getProductNum() {
+        return productNum;
+    }
+
+    public void setProductNum(Integer productNum) {
+        this.productNum = productNum;
+    }
+
+    public Date getItemCreateTime() {
+        return itemCreateTime;
+    }
+
+    public void setItemCreateTime(Date itemCreateTime) {
+        this.itemCreateTime = itemCreateTime;
+    }
+
+    public Date getItemUpdateTime() {
+        return itemUpdateTime;
+    }
+
+    public void setItemUpdateTime(Date itemUpdateTime) {
+        this.itemUpdateTime = itemUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalPeople.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * 审批人表
+ * Created by Administrator on 2018/9/18.
+ */
+public class ApprovalPeople implements Serializable{
+    private static final long serialVersionUID = -6699635149240250912L;
+    private Integer peopleId;//
+    private String approvalName;//审核人姓名
+    private Integer adminId;//审核人id（管理员id）
+    private Integer isFirst;//是否为第一级审批人
+    private Integer isLast;//是否为最后一级审批人
+    private Integer nextAdminId;//下一级审批人
+
+    public Integer getPeopleId() {
+        return peopleId;
+    }
+
+    public void setPeopleId(Integer peopleId) {
+        this.peopleId = peopleId;
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public Integer getIsFirst() {
+        return isFirst;
+    }
+
+    public void setIsFirst(Integer isFirst) {
+        this.isFirst = isFirst;
+    }
+
+    public Integer getIsLast() {
+        return isLast;
+    }
+
+    public void setIsLast(Integer isLast) {
+        this.isLast = isLast;
+    }
+
+    public Integer getNextAdminId() {
+        return nextAdminId;
+    }
+
+    public void setNextAdminId(Integer nextAdminId) {
+        this.nextAdminId = nextAdminId;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalRecord.java

@@ -0,0 +1,76 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 审批记录表
+ * Created by Administrator on 2018/9/18.
+ */
+public class ApprovalRecord implements Serializable {
+    private static final long serialVersionUID = -2586706898607985134L;
+    private Integer recordId;//
+    private String approvalName;//审核人姓名
+    private Integer adminId;//审核人id（管理员id）
+    private Integer recordState;//审核状态1 待审核 2. 审核通过 3,拒绝申请4.删除申请
+    private Date approvalTime;//审核时间
+    private String approvalDesc;//审批备注
+    private Date recordCreateTime;//创建时间
+    private Date recordUpdateTime;//修改时间
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public Integer getRecordState() {
+        return recordState;
+    }
+
+    public void setRecordState(Integer recordState) {
+        this.recordState = recordState;
+    }
+
+    public Date getApprovalTime() {
+        return approvalTime;
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
+    public String getApprovalDesc() {
+        return approvalDesc;
+    }
+
+    public void setApprovalDesc(String approvalDesc) {
+        this.approvalDesc = approvalDesc;
+    }
+
+    public Date getRecordCreateTime() {
+        return recordCreateTime;
+    }
+
+    public void setRecordCreateTime(Date recordCreateTime) {
+        this.recordCreateTime = recordCreateTime;
+    }
+
+    public Date getRecordUpdateTime() {
+        return recordUpdateTime;
+    }
+
+    public void setRecordUpdateTime(Date recordUpdateTime) {
+        this.recordUpdateTime = recordUpdateTime;
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -0,0 +1,70 @@
+<?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.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper" >
+  <resultMap id="BaseResultMap" type="ApprovalOrderInfo" >
+    <id column="approval_id" property="approvalId" jdbcType="INTEGER" />
+    <result column="applicant_name" property="applicantName" jdbcType="VARCHAR" />
+    <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
+    <result column="order_name" property="orderName" jdbcType="VARCHAR" />
+    <result column="company_name" property="companyName" jdbcType="VARCHAR" />
+    <result column="contact_name" property="contactName" jdbcType="VARCHAR" />
+    <result column="contact_tel" property="contactTel" jdbcType="VARCHAR" />
+    <result column="delivery_time" property="deliveryTime" jdbcType="TIMESTAMP" />
+    <result column="delivery_way" property="deliveryWay" jdbcType="VARCHAR" />
+    <result column="contract_name" property="contractName" jdbcType="VARCHAR" />
+    <result column="contract_img" property="contractImg" jdbcType="VARCHAR" />
+    <result column="attachment_img" property="attachmentImg" jdbcType="VARCHAR" />
+    <result column="approval_state" property="approvalState" jdbcType="INTEGER" />
+    <result column="current_admin_id" property="currentAdminId" jdbcType="INTEGER" />
+    <result column="approval_desc" property="approvalDesc" jdbcType="VARCHAR" />
+    <result column="approval_create_time" property="approvalCreateTime" jdbcType="TIMESTAMP" />
+    <result column="approval_update_time" property="approvalUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="approval_order_column_List" >
+    approval_id, applicant_name,applicant_id, order_name,company_name,contact_name,
+    contact_tel,delivery_time,delivery_way,contract_name,contract_img,attachment_img,approval_state
+    ,current_admin_id,approval_desc,approval_create_time,approval_update_time
+  </sql>
+  <sql id="order_item_column_List" >
+    item_id, approval_id,product_id, product_name,color_name,product_num,
+    item_create_time,item_update_time
+  </sql>
+  <sql id="approval_people_column_List" >
+    people_id, approval_name,admin_id,is_first,is_last,next_admin_id
+  </sql>
+
+  <sql id="approval_record_column_List" >
+    record_id,approval_name,admin_id,record_state,approval_time,approval_desc,record_create_time,record_update_time
+  </sql>
+
+<insert id="insert" parameterType="ApprovalOrderInfo"  useGeneratedKeys="true" keyProperty="approvalId">
+    INSERT INTO tb_rst_approval_order(approval_id,applicant_name,applicant_id,order_name,
+    company_name,contact_name,contact_tel,delivery_time,
+    delivery_way,contract_name,contract_img,attachment_img,
+    approval_state,current_admin_id,approval_desc,approval_create_time)
+    VALUES
+    (#{approvalId},(#{applicantName},#{applicantId},#{orderName},#{companyName}
+    ,#{contactName},#{contactTel},#{deliveryTime},#{deliveryWay}
+    ,#{contractName},#{contractImg},#{attachmentImg},#{approvalState}
+    ,#{currentAdminId},#{approvalDesc},#{approvalCreateTime})
+</insert>
+  <!-- 批量添加订单项数据 -->
+  <insert id="insertItem" parameterType="orderItem">
+    INSERT INTO tb_rst_approval_order_item
+    (
+    approval_id,
+    product_id,
+    product_name,
+    color_name,
+    product_num,
+    item_create_time,
+    )
+    VALUES
+    <foreach collection="list" item="item" separator=",">
+      (
+      #{item.approvalId},#{item.productId},#{item.productName},#{item.colorName},
+      #{item.productNum},#{item.itemCreateTime}
+      )
+    </foreach>
+  </insert>
+</mapper>

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -113,7 +113,12 @@
 		<typeAlias type="com.iamberry.rst.core.cm.InventoryLog" alias="InventoryLog"/>
 		<typeAlias type="com.iamberry.rst.core.cm.InventoryInfo" alias="InventoryInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.WarehouseInfo" alias="WarehouseInfo"/>
-		<typeAlias type="com.iamberry.rst.core.cm.FactoryInfo" alias="FactoryInfo"/>
+		<typeAlias type="com.iamberry.rst.core.approval.FactoryInfo" alias="FactoryInfo"/>
+		<!-- 审批实体类 -->
+		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderInfo" alias="ApprovalOrderInfo"/>
+		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderItem" alias="ApprovalOrderItem"/>
+		<typeAlias type="com.iamberry.rst.core.approval.ApprovalPeople" alias="ApprovalPeople"/>
+		<typeAlias type="com.iamberry.rst.core.approval.ApprovalRecord" alias="ApprovalRecord"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -117,7 +117,8 @@
                     <#if o.salesShippingStatus == 11>
                         <span style="color: red;">通知配货</span>
                     <#elseif o.salesShippingStatus == 1>
-                        <p>已发货(${(o.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!"暂无发货时间"})</p>
+                        <p>已发货</p>
+                        <p>(${(o.salesSendTime?string("MM-dd HH:mm:ss"))!"暂无发货时间"})</p>
                         <p class="label radius"><a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${(o.salesPostNum)!}&billName=${(o.salesPostFirm)!}',300,400);">${(o.salesPostFirm)!}-${(o.salesPostNum)!}</a></p>
                     </#if>
                 </td>