...

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.java

@@ -21,6 +21,6 @@ public interface StorageChangeStoragehouseDefaultMapper {
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
 
     int updateByExample(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
-    
+
     List<Map<String,Object>> contractData(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.xml

@@ -16,6 +16,7 @@
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="over_time" property="overTime" jdbcType="TIMESTAMP" />
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
     <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
@@ -86,8 +87,8 @@
   <sql id="Base_Column_List" >
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
     out_warehouse, out_warehouse_name, food_war, food_nature, bit_weigh, out_before, 
-    apply_firm, create_time, into_storehouse, into_storehouse_name, into_warehouse, into_warehouse_name, 
-    detail_war, food_number, out_after, oper_staff
+    apply_firm, create_time, over_time, into_storehouse, into_storehouse_name, into_warehouse, 
+    into_warehouse_name, detail_war, food_number, out_after, oper_staff
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample" >
     select
@@ -114,18 +115,18 @@
       apply_time, out_storehouse, out_storehouse_name, 
       out_warehouse, out_warehouse_name, food_war, 
       food_nature, bit_weigh, out_before, 
-      apply_firm, create_time, into_storehouse, 
-      into_storehouse_name, into_warehouse, into_warehouse_name, 
-      detail_war, food_number, out_after, 
-      oper_staff)
+      apply_firm, create_time, over_time, 
+      into_storehouse, into_storehouse_name, into_warehouse, 
+      into_warehouse_name, detail_war, food_number, 
+      out_after, oper_staff)
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
       #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, #{outBefore,jdbcType=VARCHAR}, 
-      #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{intoStorehouse,jdbcType=INTEGER}, 
-      #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, #{intoWarehouseName,jdbcType=VARCHAR}, 
-      #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}, 
-      #{operStaff,jdbcType=VARCHAR})
+      #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{overTime,jdbcType=TIMESTAMP}, 
+      #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, 
+      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, 
+      #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
     insert into storage_change_storagehouse_default
@@ -172,6 +173,9 @@
       <if test="createTime != null" >
         create_time,
       </if>
+      <if test="overTime != null" >
+        over_time,
+      </if>
       <if test="intoStorehouse != null" >
         into_storehouse,
       </if>
@@ -240,6 +244,9 @@
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="overTime != null" >
+        #{overTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="intoStorehouse != null" >
         #{intoStorehouse,jdbcType=INTEGER},
       </if>
@@ -317,6 +324,9 @@
       <if test="record.createTime != null" >
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.overTime != null" >
+        over_time = #{record.overTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.intoStorehouse != null" >
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
       </if>
@@ -362,6 +372,7 @@
       out_before = #{record.outBefore,jdbcType=VARCHAR},
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      over_time = #{record.overTime,jdbcType=TIMESTAMP},
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
       into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
@@ -376,18 +387,18 @@
   </update>
   <select id="contractData" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT DISTINCT
-        storagehouse.*
+    storagehouse.*
     FROM
-      storage_change_storagehouse_default storagehouse
+    storage_change_storagehouse_default storagehouse
     INNER JOIN (
-        SELECT
-          changehouse_no,
-          max(create_time) maxTime
-        FROM
-          storage_change_storagehouse_default
-        GROUP BY
-        changehouse_no
-      ) AS b ON storagehouse.changehouse_no = b.changehouse_no AND storagehouse.create_time = b.maxTime
+    SELECT
+    changehouse_no,
+    max(create_time) maxTime
+    FROM
+    storage_change_storagehouse_default
+    GROUP BY
+    changehouse_no
+    ) AS b ON storagehouse.changehouse_no = b.changehouse_no AND storagehouse.create_time = b.maxTime
     WHERE 1=1
     <if test="orgId != null" >
       AND storagehouse.org_id = #{orgId,jdbcType=INTEGER}

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.java

@@ -19,6 +19,6 @@ public interface StorageChangeStoragehouseRopMapper {
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
 
     int updateByExample(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
-    
+
     int updateByPrimaryKeySelective(StorageChangeStoragehouseRop record);
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.xml

@@ -17,6 +17,7 @@
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="over_time" property="overTime" jdbcType="TIMESTAMP" />
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
     <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
@@ -25,7 +26,6 @@
     <result column="food_number" property="foodNumber" jdbcType="DECIMAL" />
     <result column="goal_number" property="goalNumber" jdbcType="DECIMAL" />
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
-    <result column="oper_staff" property="operStaff" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -88,8 +88,8 @@
   <sql id="Base_Column_List" >
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
     out_warehouse, out_warehouse_name, food_war, food_status, food_nature, bit_weigh, 
-    out_before, apply_firm, create_time, into_storehouse, into_storehouse_name, into_warehouse, 
-    into_warehouse_name, detail_war, food_number, goal_number, out_after, oper_staff
+    out_before, apply_firm, create_time, over_time, into_storehouse, into_storehouse_name, 
+    into_warehouse, into_warehouse_name, detail_war, food_number, goal_number, out_after
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" >
     select
@@ -117,18 +117,18 @@
       out_warehouse, out_warehouse_name, food_war, 
       food_status, food_nature, bit_weigh, 
       out_before, apply_firm, create_time, 
-      into_storehouse, into_storehouse_name, into_warehouse, 
-      into_warehouse_name, detail_war, food_number, 
-      goal_number, out_after, oper_staff
+      over_time, into_storehouse, into_storehouse_name, 
+      into_warehouse, into_warehouse_name, detail_war, 
+      food_number, goal_number, out_after
       )
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
       #{foodStatus,jdbcType=VARCHAR}, #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, 
       #{outBefore,jdbcType=VARCHAR}, #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, 
-      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, 
-      #{goalNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR}
+      #{overTime,jdbcType=TIMESTAMP}, #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, 
+      #{intoWarehouse,jdbcType=INTEGER}, #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, 
+      #{foodNumber,jdbcType=DECIMAL}, #{goalNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
@@ -179,6 +179,9 @@
       <if test="createTime != null" >
         create_time,
       </if>
+      <if test="overTime != null" >
+        over_time,
+      </if>
       <if test="intoStorehouse != null" >
         into_storehouse,
       </if>
@@ -203,9 +206,6 @@
       <if test="outAfter != null" >
         out_after,
       </if>
-      <if test="operStaff != null" >
-        oper_staff,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="changehouseNo != null" >
@@ -253,6 +253,9 @@
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="overTime != null" >
+        #{overTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="intoStorehouse != null" >
         #{intoStorehouse,jdbcType=INTEGER},
       </if>
@@ -277,9 +280,6 @@
       <if test="outAfter != null" >
         #{outAfter,jdbcType=VARCHAR},
       </if>
-      <if test="operStaff != null" >
-        #{operStaff,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" resultType="java.lang.Integer" >
@@ -336,6 +336,9 @@
       <if test="record.createTime != null" >
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.overTime != null" >
+        over_time = #{record.overTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.intoStorehouse != null" >
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
       </if>
@@ -360,9 +363,6 @@
       <if test="record.outAfter != null" >
         out_after = #{record.outAfter,jdbcType=VARCHAR},
       </if>
-      <if test="record.operStaff != null" >
-        oper_staff = #{record.operStaff,jdbcType=VARCHAR},
-      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -385,6 +385,7 @@
       out_before = #{record.outBefore,jdbcType=VARCHAR},
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      over_time = #{record.overTime,jdbcType=TIMESTAMP},
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
       into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
@@ -392,12 +393,12 @@
       detail_war = #{record.detailWar,jdbcType=INTEGER},
       food_number = #{record.foodNumber,jdbcType=DECIMAL},
       goal_number = #{record.goalNumber,jdbcType=DECIMAL},
-      out_after = #{record.outAfter,jdbcType=VARCHAR},
-      oper_staff = #{record.operStaff,jdbcType=VARCHAR}
+      out_after = #{record.outAfter,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
     update storage_change_storagehouse_rop
     <set >

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefault.java

@@ -1,19 +1,19 @@
 package com.chinaitop.depot.storage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 public class StorageChangeStoragehouseDefault {
     private String changehouseNo;
 
     private Integer orgId;
 
     private String applyNo;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date applyTime;
 
+    private Date applyTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Integer outStorehouse;
 
     private String outStorehouseName;
@@ -31,9 +31,11 @@ public class StorageChangeStoragehouseDefault {
     private String outBefore;
 
     private String applyFirm;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date createTime;
 
+    private Date createTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date overTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Integer intoStorehouse;
 
     private String intoStorehouseName;
@@ -275,6 +277,22 @@ public class StorageChangeStoragehouseDefault {
     }
 
     /**
+     * 结束日期
+     * @return over_time 结束日期
+     */
+    public Date getOverTime() {
+        return overTime;
+    }
+
+    /**
+     * 结束日期
+     * @param overTime 结束日期
+     */
+    public void setOverTime(Date overTime) {
+        this.overTime = overTime;
+    }
+
+    /**
      * 倒入仓房
      * @return into_storehouse 倒入仓房
      */

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefaultExample.java

@@ -75,7 +75,7 @@ public class StorageChangeStoragehouseDefaultExample {
     }
 
     /**
-     * storage_change_storagehouse_default 2020-06-28
+     * storage_change_storagehouse_default 2020-09-07
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -1038,6 +1038,66 @@ public class StorageChangeStoragehouseDefaultExample {
             return (Criteria) this;
         }
 
+        public Criteria andOverTimeIsNull() {
+            addCriterion("over_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeIsNotNull() {
+            addCriterion("over_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeEqualTo(Date value) {
+            addCriterion("over_time =", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotEqualTo(Date value) {
+            addCriterion("over_time <>", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeGreaterThan(Date value) {
+            addCriterion("over_time >", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("over_time >=", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeLessThan(Date value) {
+            addCriterion("over_time <", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeLessThanOrEqualTo(Date value) {
+            addCriterion("over_time <=", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeIn(List<Date> values) {
+            addCriterion("over_time in", values, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotIn(List<Date> values) {
+            addCriterion("over_time not in", values, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeBetween(Date value1, Date value2) {
+            addCriterion("over_time between", value1, value2, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotBetween(Date value1, Date value2) {
+            addCriterion("over_time not between", value1, value2, "overTime");
+            return (Criteria) this;
+        }
+
         public Criteria andIntoStorehouseIsNull() {
             addCriterion("into_storehouse is null");
             return (Criteria) this;
@@ -1570,7 +1630,7 @@ public class StorageChangeStoragehouseDefaultExample {
     }
 
     /**
-     * storage_change_storagehouse_default 2020-06-28
+     * storage_change_storagehouse_default 2020-09-07
      */
     public static class Criterion {
         private String condition;

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRop.java

@@ -1,19 +1,19 @@
 package com.chinaitop.depot.storage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 public class StorageChangeStoragehouseRop {
     private String changehouseNo;
 
     private Integer orgId;
 
     private String applyNo;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date applyTime;
 
+    private Date applyTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Integer outStorehouse;
 
     private String outStorehouseName;
@@ -33,9 +33,11 @@ public class StorageChangeStoragehouseRop {
     private String outBefore;
 
     private String applyFirm;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date createTime;
 
+    private Date createTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date overTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Integer intoStorehouse;
 
     private String intoStorehouseName;
@@ -52,8 +54,6 @@ public class StorageChangeStoragehouseRop {
 
     private String outAfter;
 
-    private String operStaff;
-
     /**
      * 倒仓通知单编号
      * @return changehouse_no 倒仓通知单编号
@@ -295,6 +295,22 @@ public class StorageChangeStoragehouseRop {
     }
 
     /**
+     * 结束日期
+     * @return over_time 结束日期
+     */
+    public Date getOverTime() {
+        return overTime;
+    }
+
+    /**
+     * 结束日期
+     * @param overTime 结束日期
+     */
+    public void setOverTime(Date overTime) {
+        this.overTime = overTime;
+    }
+
+    /**
      * 倒入仓房
      * @return into_storehouse 倒入仓房
      */
@@ -421,20 +437,4 @@ public class StorageChangeStoragehouseRop {
     public void setOutAfter(String outAfter) {
         this.outAfter = outAfter == null ? null : outAfter.trim();
     }
-
-    /**
-     * 操作人员
-     * @return oper_staff 操作人员
-     */
-    public String getOperStaff() {
-        return operStaff;
-    }
-
-    /**
-     * 操作人员
-     * @param operStaff 操作人员
-     */
-    public void setOperStaff(String operStaff) {
-        this.operStaff = operStaff == null ? null : operStaff.trim();
-    }
 }

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRopExample.java

@@ -75,7 +75,7 @@ public class StorageChangeStoragehouseRopExample {
     }
 
     /**
-     * storage_change_storagehouse_rop 2020-06-28
+     * storage_change_storagehouse_rop 2020-09-07
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -1108,6 +1108,66 @@ public class StorageChangeStoragehouseRopExample {
             return (Criteria) this;
         }
 
+        public Criteria andOverTimeIsNull() {
+            addCriterion("over_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeIsNotNull() {
+            addCriterion("over_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeEqualTo(Date value) {
+            addCriterion("over_time =", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotEqualTo(Date value) {
+            addCriterion("over_time <>", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeGreaterThan(Date value) {
+            addCriterion("over_time >", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("over_time >=", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeLessThan(Date value) {
+            addCriterion("over_time <", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeLessThanOrEqualTo(Date value) {
+            addCriterion("over_time <=", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeIn(List<Date> values) {
+            addCriterion("over_time in", values, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotIn(List<Date> values) {
+            addCriterion("over_time not in", values, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeBetween(Date value1, Date value2) {
+            addCriterion("over_time between", value1, value2, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotBetween(Date value1, Date value2) {
+            addCriterion("over_time not between", value1, value2, "overTime");
+            return (Criteria) this;
+        }
+
         public Criteria andIntoStorehouseIsNull() {
             addCriterion("into_storehouse is null");
             return (Criteria) this;
@@ -1617,76 +1677,6 @@ public class StorageChangeStoragehouseRopExample {
             addCriterion("out_after not between", value1, value2, "outAfter");
             return (Criteria) this;
         }
-
-        public Criteria andOperStaffIsNull() {
-            addCriterion("oper_staff is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffIsNotNull() {
-            addCriterion("oper_staff is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffEqualTo(String value) {
-            addCriterion("oper_staff =", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffNotEqualTo(String value) {
-            addCriterion("oper_staff <>", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffGreaterThan(String value) {
-            addCriterion("oper_staff >", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffGreaterThanOrEqualTo(String value) {
-            addCriterion("oper_staff >=", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffLessThan(String value) {
-            addCriterion("oper_staff <", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffLessThanOrEqualTo(String value) {
-            addCriterion("oper_staff <=", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffLike(String value) {
-            addCriterion("oper_staff like", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffNotLike(String value) {
-            addCriterion("oper_staff not like", value, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffIn(List<String> values) {
-            addCriterion("oper_staff in", values, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffNotIn(List<String> values) {
-            addCriterion("oper_staff not in", values, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffBetween(String value1, String value2) {
-            addCriterion("oper_staff between", value1, value2, "operStaff");
-            return (Criteria) this;
-        }
-
-        public Criteria andOperStaffNotBetween(String value1, String value2) {
-            addCriterion("oper_staff not between", value1, value2, "operStaff");
-            return (Criteria) this;
-        }
     }
 
     /**
@@ -1700,7 +1690,7 @@ public class StorageChangeStoragehouseRopExample {
     }
 
     /**
-     * storage_change_storagehouse_rop 2020-06-28
+     * storage_change_storagehouse_rop 2020-09-07
      */
     public static class Criterion {
         private String condition;

src/main/java/com/chinaitop/depot/storage/service/impl/StorageChangeStoragehouseRopServiceImpl.java

@@ -65,6 +65,7 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
         	storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("apply_time")); //申请倒仓时间
         	storageChangeStoragehouseDefault.setBitWeigh("需要称重"); //  是否称重
         	storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
+            storageChangeStoragehouseDefault.setOverTime(jsonObject.getDate("createTime"));  //结束时间
         	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getBigDecimal("foodNumber")); //粮食数量
             storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
         	storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
@@ -85,7 +86,7 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
              //货位
              storageChangeStoragehouseDefault.setIntoWarehouse(wareHouseId); //倒入货位
              storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒出货位名称
-             storageChangeStoragehouseDefault.setOrgId(orgId);  //组织id
+             storageChangeStoragehouseDefault.setOrgId(jsonObject.getInteger("org_id"));  //组织id
              //根据倒出仓房编码查询倒出仓房、货位、组织机构数据 
              String hwbmout = jsonObject.getString("cfbmout");
              Map<String, Object> outwareDataMap = feignBasicService.getWareDataByHwbm(hwbmout);