审批流程代码

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

@@ -0,0 +1,20 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ApprovalApplyPick implements Serializable{
+    private Integer applyPickId;//
+    private Integer approvalId;//审批订单信息id
+    private Integer adminId;//申请人id
+    private Integer applyPickName;//姓名
+    private Integer applyPickTel;//手机号码
+    private Integer applyPickReason;//提货原因
+    private Integer applyPickStruts;//提货状态1:未发货  2:已发货
+    private Integer applyPickRemk;//备注信息
+    private Integer applyPickCreateTime;//
+    private Integer applyPickUpdateTime;//
+
+}

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

@@ -0,0 +1,118 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ApprovalApplyPickItem implements Serializable{
+    private static final long serialVersionUID = -3566469572724340861L;
+    private Integer applyitemid;//
+    private Integer applyPickId;//提货id
+    private Integer productId;//产品id
+    private String itemProductName;//产品名称
+    private String itemColorName;//颜色名称
+    private Integer itemProductNum;//产品数量
+    private String itemBrandName;//品牌名称
+    private String itemProductModel;//产品型号
+    private String itemProductUnit;//单位
+    private Integer itemProductBoxNumber;//箱数/套数
+    private Integer itemCreateTime;//
+    private Integer itemUpdateTime;//
+
+    public Integer getApplyitemid() {
+        return applyitemid;
+    }
+
+    public void setApplyitemid(Integer applyitemid) {
+        this.applyitemid = applyitemid;
+    }
+
+    public Integer getApplyPickId() {
+        return applyPickId;
+    }
+
+    public void setApplyPickId(Integer applyPickId) {
+        this.applyPickId = applyPickId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getItemProductName() {
+        return itemProductName;
+    }
+
+    public void setItemProductName(String itemProductName) {
+        this.itemProductName = itemProductName;
+    }
+
+    public String getItemColorName() {
+        return itemColorName;
+    }
+
+    public void setItemColorName(String itemColorName) {
+        this.itemColorName = itemColorName;
+    }
+
+    public Integer getItemProductNum() {
+        return itemProductNum;
+    }
+
+    public void setItemProductNum(Integer itemProductNum) {
+        this.itemProductNum = itemProductNum;
+    }
+
+    public String getItemBrandName() {
+        return itemBrandName;
+    }
+
+    public void setItemBrandName(String itemBrandName) {
+        this.itemBrandName = itemBrandName;
+    }
+
+    public String getItemProductModel() {
+        return itemProductModel;
+    }
+
+    public void setItemProductModel(String itemProductModel) {
+        this.itemProductModel = itemProductModel;
+    }
+
+    public String getItemProductUnit() {
+        return itemProductUnit;
+    }
+
+    public void setItemProductUnit(String itemProductUnit) {
+        this.itemProductUnit = itemProductUnit;
+    }
+
+    public Integer getItemProductBoxNumber() {
+        return itemProductBoxNumber;
+    }
+
+    public void setItemProductBoxNumber(Integer itemProductBoxNumber) {
+        this.itemProductBoxNumber = itemProductBoxNumber;
+    }
+
+    public Integer getItemCreateTime() {
+        return itemCreateTime;
+    }
+
+    public void setItemCreateTime(Integer itemCreateTime) {
+        this.itemCreateTime = itemCreateTime;
+    }
+
+    public Integer getItemUpdateTime() {
+        return itemUpdateTime;
+    }
+
+    public void setItemUpdateTime(Integer itemUpdateTime) {
+        this.itemUpdateTime = itemUpdateTime;
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ApprovalInventoryRecords implements Serializable {
+    private static final long serialVersionUID = -2060549066223267336L;
+    private Integer storageId;//
+    private Integer approvalId;//审批订单id
+    private Integer storageState;//入库状态
+    private Integer productId;//产品id
+    private String productName;//产品名称
+    private String colorName;//颜色名称
+    private Integer shouldStorage;//本次应入库数量
+    private Integer actualStorage;//实际入库数量
+    private Integer lackNumber;//入库后缺少数量
+    private Integer operatingAdminId;//操作人
+    private Integer operatingTime;//
+
+    public Integer getStorageId() {
+        return storageId;
+    }
+
+    public void setStorageId(Integer storageId) {
+        this.storageId = storageId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public Integer getStorageState() {
+        return storageState;
+    }
+
+    public void setStorageState(Integer storageState) {
+        this.storageState = storageState;
+    }
+
+    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 getShouldStorage() {
+        return shouldStorage;
+    }
+
+    public void setShouldStorage(Integer shouldStorage) {
+        this.shouldStorage = shouldStorage;
+    }
+
+    public Integer getActualStorage() {
+        return actualStorage;
+    }
+
+    public void setActualStorage(Integer actualStorage) {
+        this.actualStorage = actualStorage;
+    }
+
+    public Integer getLackNumber() {
+        return lackNumber;
+    }
+
+    public void setLackNumber(Integer lackNumber) {
+        this.lackNumber = lackNumber;
+    }
+
+    public Integer getOperatingAdminId() {
+        return operatingAdminId;
+    }
+
+    public void setOperatingAdminId(Integer operatingAdminId) {
+        this.operatingAdminId = operatingAdminId;
+    }
+
+    public Integer getOperatingTime() {
+        return operatingTime;
+    }
+
+    public void setOperatingTime(Integer operatingTime) {
+        this.operatingTime = operatingTime;
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class HistoricalRecord implements Serializable {
+    private static final long serialVersionUID = 4110663412302723787L;
+    private Integer recordId;//
+    private Integer approvalId;//审批订单id
+    private Integer adminId;//审批人id
+    private Integer recordState;//审核状态1：待审核2：审核通过3：驳回申请
+    private String taskId;//activiti任务id
+    private Date approvalTime;//审核时间
+    private Date recordCreateTime;//
+
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    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 String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public Date getApprovalTime() {
+        return approvalTime;
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
+    public Date getRecordCreateTime() {
+        return recordCreateTime;
+    }
+
+    public void setRecordCreateTime(Date recordCreateTime) {
+        this.recordCreateTime = recordCreateTime;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.iamberry.rst.core.approval;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2018/9/29.
+ */
+public class ProcessInfo implements Serializable{
+    private static final long serialVersionUID = 52633936436129533L;
+    private Integer processId;//
+    private Integer approvalId;//审批订单id
+    private Integer adminId;//所属人
+    private String processDesc;//审批内容
+    private Integer processState;//审核状态0：评论1：待审核2：审核通过3：驳回申请4：删除申请
+    private Date processCreateTime;//
+
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
+
+    public Integer getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Integer adminId) {
+        this.adminId = adminId;
+    }
+
+    public String getProcessDesc() {
+        return processDesc;
+    }
+
+    public void setProcessDesc(String processDesc) {
+        this.processDesc = processDesc;
+    }
+
+    public Integer getProcessState() {
+        return processState;
+    }
+
+    public void setProcessState(Integer processState) {
+        this.processState = processState;
+    }
+
+    public Date getProcessCreateTime() {
+        return processCreateTime;
+    }
+
+    public void setProcessCreateTime(Date processCreateTime) {
+        this.processCreateTime = processCreateTime;
+    }
+}

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

@@ -1,7 +1,43 @@
 <?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.approval.mapper.ApprovalOrderMapper" >
-  <resultMap id="BaseResultMap" type="ApprovalOrderInfo" >
+
+  <resultMap id="ApprovalInfoResultMap" type="ApprovalInfo" >
+    <id column="approval_id" property="approvalId" jdbcType="INTEGER" />
+    <result column="approval_name" property="approvalName" jdbcType="VARCHAR" />
+    <result column="approval_type" property="approvalType" jdbcType="INTEGER" />
+    <result column="approval_status" property="approvalStatus" jdbcType="INTEGER" />
+    <result column="approval_status_details" property="approvalStatusDetails" jdbcType="VARCHAR" />
+    <result column="admin_id" property="adminId" jdbcType="INTEGER" />
+    <result column="approval_applicant" property="approvalApplicant" jdbcType="VARCHAR" />
+    <result column="activiti_id" property="activitiId" jdbcType="INTEGER" />
+    <result column="approval_details" property="approvalDetails" jdbcType="VARCHAR" />
+    <result column="approval_remark" property="approvalRemark" jdbcType="VARCHAR" />
+    <result column="approval_create_time" property="approvalCreateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <resultMap id="ApprovalProductionResultMap" type="ApprovalProduction" >
+    <id column="production_id" property="productionId" jdbcType="INTEGER" />
+    <result column="approval_id" property="approvalId" jdbcType="VARCHAR" />
+    <result column="applicant_order_no" property="applicantOrderNo" jdbcType="VARCHAR" />
+    <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="production_delivery_date" property="productionDeliveryDate" jdbcType="DATE" />
+    <result column="production_delivery_way" property="productionDeliveryWay" jdbcType="VARCHAR" />
+    <result column="production_delivery_desc" property="productionDeliveryDesc" jdbcType="VARCHAR" />
+    <result column="production_state" property="productionState" jdbcType="INTEGER" />
+    <result column="production_packing_way" property="productionPackingWay" jdbcType="VARCHAR" />
+    <result column="production_remark" property="productionRemark" jdbcType="VARCHAR" />
+    <result column="production_create_time" property="productionCreateTime" jdbcType="TIMESTAMP" />
+    <result column="production_update_time" property="productionUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+
+
+
+ <!-- <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" />
@@ -49,7 +85,7 @@
     ,#{contractName},#{contractImg},#{attachmentImg},#{approvalState}
     ,#{currentAdminId},#{approvalDesc},NOW())
 </insert>
-  <!-- 批量添加订单项数据 -->
+  &lt;!&ndash; 批量添加订单项数据 &ndash;&gt;
   <insert id="insertItem" parameterType="ArrayList">
     INSERT INTO tb_rst_approval_order_item
     (
@@ -179,5 +215,5 @@
 
   <delete id="deleteItem" parameterType="Integer">
     DELETE FROM tb_rst_approval_order_item where approval_id = #{approvalId}
-  </delete>
+  </delete>-->
 </mapper>