修改完成数量

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -77,7 +77,6 @@ public class PushServiceImpl implements PushsService{
 			criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
 			criteria.andApplyNoEqualTo(applyNo);
 			List<StorageChangeStoragehouseDefault> list = storageChangeStoragehouseDefaultMapper.selectByExample(StorageChangeStoragehouseDefaultExample);
-			BigDecimal bigDecimal = new BigDecimal(goalNumber);
 			if(list == null || list.size() ==0 ) {
 				return retS = "该数据不存在!";
 			}else {
@@ -101,8 +100,8 @@ public class PushServiceImpl implements PushsService{
 				StorageChangeStoragehouseRop.setIntoWarehouse(o.getIntoWarehouse());  //倒入货位
 				StorageChangeStoragehouseRop.setIntoWarehouseName(o.getIntoWarehouseName());   //倒入货位名称
 				StorageChangeStoragehouseRop.setDetailWar(o.getDetailWar());   //明细品种
-				StorageChangeStoragehouseRop.setFoodNumber(o.getFoodNumber());   //粮食数量(公斤)
-				StorageChangeStoragehouseRop.setGoalNumber(bigDecimal);   //目标数量
+				StorageChangeStoragehouseRop.setFoodNumber(goalNumber);   //完成数量(公斤)
+				StorageChangeStoragehouseRop.setGoalNumber(o.getFoodNumber());   //目标数量
 				StorageChangeStoragehouseRop.setOutAfter(o.getOutAfter());  //倒出后保管方式
 				StorageChangeStoragehouseRop.setOrgId(Integer.parseInt(orgId));   //单位ID
 				StorageChangeStoragehouseRop.setApplyNo(applyNo);  //申请单号

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

@@ -1,12 +1,13 @@
 package com.chinaitop.depot.storage.mapper;
 
-import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault;
-import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample;
+
 public interface StorageChangeStoragehouseDefaultMapper {
     int countByExample(StorageChangeStoragehouseDefaultExample example);
 

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

@@ -22,7 +22,7 @@
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
     <result column="into_warehouse_name" property="intoWarehouseName" jdbcType="VARCHAR" />
     <result column="detail_war" property="detailWar" jdbcType="INTEGER" />
-    <result column="food_number" property="foodNumber" jdbcType="DECIMAL" />
+    <result column="food_number" property="foodNumber" jdbcType="VARCHAR" />
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
     <result column="oper_staff" property="operStaff" jdbcType="VARCHAR" />
   </resultMap>
@@ -125,7 +125,7 @@
       #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, #{outBefore,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}, 
+      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=VARCHAR}, 
       #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
@@ -263,7 +263,7 @@
         #{detailWar,jdbcType=INTEGER},
       </if>
       <if test="foodNumber != null" >
-        #{foodNumber,jdbcType=DECIMAL},
+        #{foodNumber,jdbcType=VARCHAR},
       </if>
       <if test="outAfter != null" >
         #{outAfter,jdbcType=VARCHAR},
@@ -343,7 +343,7 @@
         detail_war = #{record.detailWar,jdbcType=INTEGER},
       </if>
       <if test="record.foodNumber != null" >
-        food_number = #{record.foodNumber,jdbcType=DECIMAL},
+        food_number = #{record.foodNumber,jdbcType=VARCHAR},
       </if>
       <if test="record.outAfter != null" >
         out_after = #{record.outAfter,jdbcType=VARCHAR},
@@ -378,7 +378,7 @@
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
       into_warehouse_name = #{record.intoWarehouseName,jdbcType=VARCHAR},
       detail_war = #{record.detailWar,jdbcType=INTEGER},
-      food_number = #{record.foodNumber,jdbcType=DECIMAL},
+      food_number = #{record.foodNumber,jdbcType=VARCHAR},
       out_after = #{record.outAfter,jdbcType=VARCHAR},
       oper_staff = #{record.operStaff,jdbcType=VARCHAR}
     <if test="_parameter != null" >

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

@@ -23,8 +23,8 @@
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
     <result column="into_warehouse_name" property="intoWarehouseName" jdbcType="VARCHAR" />
     <result column="detail_war" property="detailWar" jdbcType="INTEGER" />
-    <result column="food_number" property="foodNumber" jdbcType="DECIMAL" />
-    <result column="goal_number" property="goalNumber" jdbcType="DECIMAL" />
+    <result column="food_number" property="foodNumber" jdbcType="VARCHAR" />
+    <result column="goal_number" property="goalNumber" jdbcType="VARCHAR" />
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -128,7 +128,7 @@
       #{outBefore,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}, #{goalNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}
+      #{foodNumber,jdbcType=VARCHAR}, #{goalNumber,jdbcType=VARCHAR}, #{outAfter,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
@@ -272,10 +272,10 @@
         #{detailWar,jdbcType=INTEGER},
       </if>
       <if test="foodNumber != null" >
-        #{foodNumber,jdbcType=DECIMAL},
+        #{foodNumber,jdbcType=VARCHAR},
       </if>
       <if test="goalNumber != null" >
-        #{goalNumber,jdbcType=DECIMAL},
+        #{goalNumber,jdbcType=VARCHAR},
       </if>
       <if test="outAfter != null" >
         #{outAfter,jdbcType=VARCHAR},
@@ -355,10 +355,10 @@
         detail_war = #{record.detailWar,jdbcType=INTEGER},
       </if>
       <if test="record.foodNumber != null" >
-        food_number = #{record.foodNumber,jdbcType=DECIMAL},
+        food_number = #{record.foodNumber,jdbcType=VARCHAR},
       </if>
       <if test="record.goalNumber != null" >
-        goal_number = #{record.goalNumber,jdbcType=DECIMAL},
+        goal_number = #{record.goalNumber,jdbcType=VARCHAR},
       </if>
       <if test="record.outAfter != null" >
         out_after = #{record.outAfter,jdbcType=VARCHAR},
@@ -391,14 +391,13 @@
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
       into_warehouse_name = #{record.intoWarehouseName,jdbcType=VARCHAR},
       detail_war = #{record.detailWar,jdbcType=INTEGER},
-      food_number = #{record.foodNumber,jdbcType=DECIMAL},
-      goal_number = #{record.goalNumber,jdbcType=DECIMAL},
+      food_number = #{record.foodNumber,jdbcType=VARCHAR},
+      goal_number = #{record.goalNumber,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 >
@@ -460,10 +459,10 @@
         detail_war = #{detailWar,jdbcType=INTEGER},
       </if>
       <if test="foodNumber != null" >
-        food_number = #{foodNumber,jdbcType=DECIMAL},
+        food_number = #{foodNumber,jdbcType=VARCHAR},
       </if>
       <if test="goalNumber != null" >
-        goal_number = #{goalNumber,jdbcType=DECIMAL},
+        goal_number = #{goalNumber,jdbcType=VARCHAR},
       </if>
       <if test="outAfter != null" >
         out_after = #{outAfter,jdbcType=VARCHAR},

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

@@ -1,19 +1,18 @@
 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;
-
-    private Date applyTime;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date applyTime;
+
     private Integer outStorehouse;
 
     private String outStorehouseName;
@@ -31,11 +30,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;
     @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;
@@ -46,7 +45,7 @@ public class StorageChangeStoragehouseDefault {
 
     private Integer detailWar;
 
-    private BigDecimal foodNumber;
+    private String foodNumber;
 
     private String outAfter;
 
@@ -376,7 +375,7 @@ public class StorageChangeStoragehouseDefault {
      * 粮食数量(公斤)
      * @return food_number 粮食数量(公斤)
      */
-    public BigDecimal getFoodNumber() {
+    public String getFoodNumber() {
         return foodNumber;
     }
 
@@ -384,8 +383,8 @@ public class StorageChangeStoragehouseDefault {
      * 粮食数量(公斤)
      * @param foodNumber 粮食数量(公斤)
      */
-    public void setFoodNumber(BigDecimal foodNumber) {
-        this.foodNumber = foodNumber;
+    public void setFoodNumber(String foodNumber) {
+        this.foodNumber = foodNumber == null ? null : foodNumber.trim();
     }
 
     /**

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

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.storage.model;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -75,7 +74,7 @@ public class StorageChangeStoragehouseDefaultExample {
     }
 
     /**
-     * storage_change_storagehouse_default 2020-09-07
+     * storage_change_storagehouse_default 2020-09-17
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -1428,52 +1427,62 @@ public class StorageChangeStoragehouseDefaultExample {
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberEqualTo(String value) {
             addCriterion("food_number =", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberNotEqualTo(String value) {
             addCriterion("food_number <>", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberGreaterThan(BigDecimal value) {
+        public Criteria andFoodNumberGreaterThan(String value) {
             addCriterion("food_number >", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberGreaterThanOrEqualTo(String value) {
             addCriterion("food_number >=", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberLessThan(BigDecimal value) {
+        public Criteria andFoodNumberLessThan(String value) {
             addCriterion("food_number <", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberLessThanOrEqualTo(String value) {
             addCriterion("food_number <=", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberIn(List<BigDecimal> values) {
+        public Criteria andFoodNumberLike(String value) {
+            addCriterion("food_number like", value, "foodNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodNumberNotLike(String value) {
+            addCriterion("food_number not like", value, "foodNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodNumberIn(List<String> values) {
             addCriterion("food_number in", values, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotIn(List<BigDecimal> values) {
+        public Criteria andFoodNumberNotIn(List<String> values) {
             addCriterion("food_number not in", values, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andFoodNumberBetween(String value1, String value2) {
             addCriterion("food_number between", value1, value2, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andFoodNumberNotBetween(String value1, String value2) {
             addCriterion("food_number not between", value1, value2, "foodNumber");
             return (Criteria) this;
         }
@@ -1630,7 +1639,7 @@ public class StorageChangeStoragehouseDefaultExample {
     }
 
     /**
-     * storage_change_storagehouse_default 2020-09-07
+     * storage_change_storagehouse_default 2020-09-17
      */
     public static class Criterion {
         private String condition;

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

@@ -1,19 +1,18 @@
 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;
-
-    private Date applyTime;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date applyTime;
+
     private Integer outStorehouse;
 
     private String outStorehouseName;
@@ -33,11 +32,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;
     @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;
@@ -48,9 +47,9 @@ public class StorageChangeStoragehouseRop {
 
     private Integer detailWar;
 
-    private BigDecimal foodNumber;
+    private String foodNumber;
 
-    private BigDecimal goalNumber;
+    private String goalNumber;
 
     private String outAfter;
 
@@ -394,7 +393,7 @@ public class StorageChangeStoragehouseRop {
      * 粮食数量(公斤)
      * @return food_number 粮食数量(公斤)
      */
-    public BigDecimal getFoodNumber() {
+    public String getFoodNumber() {
         return foodNumber;
     }
 
@@ -402,15 +401,15 @@ public class StorageChangeStoragehouseRop {
      * 粮食数量(公斤)
      * @param foodNumber 粮食数量(公斤)
      */
-    public void setFoodNumber(BigDecimal foodNumber) {
-        this.foodNumber = foodNumber;
+    public void setFoodNumber(String foodNumber) {
+        this.foodNumber = foodNumber == null ? null : foodNumber.trim();
     }
 
     /**
      * 目标数量
      * @return goal_number 目标数量
      */
-    public BigDecimal getGoalNumber() {
+    public String getGoalNumber() {
         return goalNumber;
     }
 
@@ -418,8 +417,8 @@ public class StorageChangeStoragehouseRop {
      * 目标数量
      * @param goalNumber 目标数量
      */
-    public void setGoalNumber(BigDecimal goalNumber) {
-        this.goalNumber = goalNumber;
+    public void setGoalNumber(String goalNumber) {
+        this.goalNumber = goalNumber == null ? null : goalNumber.trim();
     }
 
     /**

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

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.storage.model;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -75,7 +74,7 @@ public class StorageChangeStoragehouseRopExample {
     }
 
     /**
-     * storage_change_storagehouse_rop 2020-09-07
+     * storage_change_storagehouse_rop 2020-09-17
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -1498,52 +1497,62 @@ public class StorageChangeStoragehouseRopExample {
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberEqualTo(String value) {
             addCriterion("food_number =", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberNotEqualTo(String value) {
             addCriterion("food_number <>", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberGreaterThan(BigDecimal value) {
+        public Criteria andFoodNumberGreaterThan(String value) {
             addCriterion("food_number >", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberGreaterThanOrEqualTo(String value) {
             addCriterion("food_number >=", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberLessThan(BigDecimal value) {
+        public Criteria andFoodNumberLessThan(String value) {
             addCriterion("food_number <", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andFoodNumberLessThanOrEqualTo(String value) {
             addCriterion("food_number <=", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberIn(List<BigDecimal> values) {
+        public Criteria andFoodNumberLike(String value) {
+            addCriterion("food_number like", value, "foodNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodNumberNotLike(String value) {
+            addCriterion("food_number not like", value, "foodNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodNumberIn(List<String> values) {
             addCriterion("food_number in", values, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotIn(List<BigDecimal> values) {
+        public Criteria andFoodNumberNotIn(List<String> values) {
             addCriterion("food_number not in", values, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andFoodNumberBetween(String value1, String value2) {
             addCriterion("food_number between", value1, value2, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andFoodNumberNotBetween(String value1, String value2) {
             addCriterion("food_number not between", value1, value2, "foodNumber");
             return (Criteria) this;
         }
@@ -1558,52 +1567,62 @@ public class StorageChangeStoragehouseRopExample {
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberEqualTo(BigDecimal value) {
+        public Criteria andGoalNumberEqualTo(String value) {
             addCriterion("goal_number =", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberNotEqualTo(BigDecimal value) {
+        public Criteria andGoalNumberNotEqualTo(String value) {
             addCriterion("goal_number <>", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberGreaterThan(BigDecimal value) {
+        public Criteria andGoalNumberGreaterThan(String value) {
             addCriterion("goal_number >", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andGoalNumberGreaterThanOrEqualTo(String value) {
             addCriterion("goal_number >=", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberLessThan(BigDecimal value) {
+        public Criteria andGoalNumberLessThan(String value) {
             addCriterion("goal_number <", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andGoalNumberLessThanOrEqualTo(String value) {
             addCriterion("goal_number <=", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberIn(List<BigDecimal> values) {
+        public Criteria andGoalNumberLike(String value) {
+            addCriterion("goal_number like", value, "goalNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoalNumberNotLike(String value) {
+            addCriterion("goal_number not like", value, "goalNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoalNumberIn(List<String> values) {
             addCriterion("goal_number in", values, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberNotIn(List<BigDecimal> values) {
+        public Criteria andGoalNumberNotIn(List<String> values) {
             addCriterion("goal_number not in", values, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andGoalNumberBetween(String value1, String value2) {
             addCriterion("goal_number between", value1, value2, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andGoalNumberNotBetween(String value1, String value2) {
             addCriterion("goal_number not between", value1, value2, "goalNumber");
             return (Criteria) this;
         }
@@ -1690,7 +1709,7 @@ public class StorageChangeStoragehouseRopExample {
     }
 
     /**
-     * storage_change_storagehouse_rop 2020-09-07
+     * storage_change_storagehouse_rop 2020-09-17
      */
     public static class Criterion {
         private String condition;

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

@@ -66,7 +66,7 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
         	storageChangeStoragehouseDefault.setBitWeigh("需要称重"); //  是否称重
         	storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
             storageChangeStoragehouseDefault.setOverTime(jsonObject.getDate("createTime"));  //结束时间
-        	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getBigDecimal("foodNumber")); //粮食数量
+        	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getString("foodNumber")); //粮食数量
             storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
         	storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
         	storageChangeStoragehouseDefault.setOutBefore(jsonObject.getString("out_before")); //倒出前保管方式