发货到货仓库id改为字符串

退货isproduct字段改为字符串
收货isproduct字段改为字符串

src/main/java/com/starcharge/wios/dao/entity/Delivery.java

@@ -178,7 +178,7 @@ public class Delivery extends PageVo implements Serializable {
      * @mbg.generated
      */
     @ApiModelProperty(value = "到货仓库id")
-    private Integer arrivalWarehouseId;
+    private String arrivalWarehouseId;
 
     /**
      * 收货人

src/main/java/com/starcharge/wios/dao/entity/DeliveryCriteria.java

@@ -1405,52 +1405,62 @@ public class DeliveryCriteria {
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdEqualTo(Integer value) {
+        public Criteria andArrivalWarehouseIdEqualTo(String value) {
             addCriterion("arrival_warehouse_id =", value, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdNotEqualTo(Integer value) {
+        public Criteria andArrivalWarehouseIdNotEqualTo(String value) {
             addCriterion("arrival_warehouse_id <>", value, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdGreaterThan(Integer value) {
+        public Criteria andArrivalWarehouseIdGreaterThan(String value) {
             addCriterion("arrival_warehouse_id >", value, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andArrivalWarehouseIdGreaterThanOrEqualTo(String value) {
             addCriterion("arrival_warehouse_id >=", value, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdLessThan(Integer value) {
+        public Criteria andArrivalWarehouseIdLessThan(String value) {
             addCriterion("arrival_warehouse_id <", value, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdLessThanOrEqualTo(Integer value) {
+        public Criteria andArrivalWarehouseIdLessThanOrEqualTo(String value) {
             addCriterion("arrival_warehouse_id <=", value, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdIn(List<Integer> values) {
+        public Criteria andArrivalWarehouseIdLike(String value) {
+            addCriterion("arrival_warehouse_id like", value, "arrivalWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalWarehouseIdNotLike(String value) {
+            addCriterion("arrival_warehouse_id not like", value, "arrivalWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalWarehouseIdIn(List<String> values) {
             addCriterion("arrival_warehouse_id in", values, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdNotIn(List<Integer> values) {
+        public Criteria andArrivalWarehouseIdNotIn(List<String> values) {
             addCriterion("arrival_warehouse_id not in", values, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdBetween(Integer value1, Integer value2) {
+        public Criteria andArrivalWarehouseIdBetween(String value1, String value2) {
             addCriterion("arrival_warehouse_id between", value1, value2, "arrivalWarehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andArrivalWarehouseIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andArrivalWarehouseIdNotBetween(String value1, String value2) {
             addCriterion("arrival_warehouse_id not between", value1, value2, "arrivalWarehouseId");
             return (Criteria) this;
         }

src/main/java/com/starcharge/wios/dao/entity/Receivednote.java

@@ -131,8 +131,7 @@ public class Receivednote extends PageVo implements Serializable {
      */
     @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
     @NotNull(groups = CreateEntityGroup.class)
-    @Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups = UpdateEntityGroup.class)
-    private Integer isproduct;
+    private String isproduct;
     /**
      * 创建人
      *

src/main/java/com/starcharge/wios/dao/entity/ReceivednoteCriteria.java

@@ -975,52 +975,62 @@ public class ReceivednoteCriteria {
             return (Criteria) this;
         }
 
-        public Criteria andIsproductEqualTo(Integer value) {
+        public Criteria andIsproductEqualTo(String value) {
             addCriterion("isproduct =", value, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductNotEqualTo(Integer value) {
+        public Criteria andIsproductNotEqualTo(String value) {
             addCriterion("isproduct <>", value, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductGreaterThan(Integer value) {
+        public Criteria andIsproductGreaterThan(String value) {
             addCriterion("isproduct >", value, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIsproductGreaterThanOrEqualTo(String value) {
             addCriterion("isproduct >=", value, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductLessThan(Integer value) {
+        public Criteria andIsproductLessThan(String value) {
             addCriterion("isproduct <", value, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductLessThanOrEqualTo(Integer value) {
+        public Criteria andIsproductLessThanOrEqualTo(String value) {
             addCriterion("isproduct <=", value, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductIn(List<Integer> values) {
+        public Criteria andIsproductLike(String value) {
+            addCriterion("isproduct like", value, "isproduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsproductNotLike(String value) {
+            addCriterion("isproduct not like", value, "isproduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsproductIn(List<String> values) {
             addCriterion("isproduct in", values, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductNotIn(List<Integer> values) {
+        public Criteria andIsproductNotIn(List<String> values) {
             addCriterion("isproduct not in", values, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductBetween(Integer value1, Integer value2) {
+        public Criteria andIsproductBetween(String value1, String value2) {
             addCriterion("isproduct between", value1, value2, "isproduct");
             return (Criteria) this;
         }
 
-        public Criteria andIsproductNotBetween(Integer value1, Integer value2) {
+        public Criteria andIsproductNotBetween(String value1, String value2) {
             addCriterion("isproduct not between", value1, value2, "isproduct");
             return (Criteria) this;
         }

src/main/java/com/starcharge/wios/dao/entity/Reject.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -167,8 +168,8 @@ public class Reject extends PageVo implements Serializable {
      * @mbg.generated
      */
     @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
-    @Range(min=0,max = 1,message = "是否产品或辅料只可填0或1")
-    private Integer isproduct;
+    @NotNull
+    private String isproduct;
     /**
      * 创建人
      *

src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml

@@ -21,7 +21,7 @@
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
     <result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" />
     <result column="arrival_warehouse" jdbcType="VARCHAR" property="arrivalWarehouse" />
-    <result column="arrival_warehouse_id" jdbcType="INTEGER" property="arrivalWarehouseId" />
+    <result column="arrival_warehouse_id" jdbcType="VARCHAR" property="arrivalWarehouseId" />
     <result column="receiver" jdbcType="VARCHAR" property="receiver" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -166,7 +166,7 @@
       #{logisticCompany,jdbcType=VARCHAR}, #{logisticStatus,jdbcType=VARCHAR}, #{team,jdbcType=VARCHAR}, 
       #{isproduct,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP}, 
       #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP}, #{arrivalWarehouse,jdbcType=VARCHAR}, 
-      #{arrivalWarehouseId,jdbcType=INTEGER}, #{receiver,jdbcType=VARCHAR})
+      #{arrivalWarehouseId,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Delivery">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -291,7 +291,7 @@
         #{arrivalWarehouse,jdbcType=VARCHAR},
       </if>
       <if test="arrivalWarehouseId != null">
-        #{arrivalWarehouseId,jdbcType=INTEGER},
+        #{arrivalWarehouseId,jdbcType=VARCHAR},
       </if>
       <if test="receiver != null">
         #{receiver,jdbcType=VARCHAR},
@@ -365,7 +365,7 @@
         arrival_warehouse = #{record.arrivalWarehouse,jdbcType=VARCHAR},
       </if>
       <if test="record.arrivalWarehouseId != null">
-        arrival_warehouse_id = #{record.arrivalWarehouseId,jdbcType=INTEGER},
+        arrival_warehouse_id = #{record.arrivalWarehouseId,jdbcType=VARCHAR},
       </if>
       <if test="record.receiver != null">
         receiver = #{record.receiver,jdbcType=VARCHAR},
@@ -396,7 +396,7 @@
       UPDATED_BY = #{record.updatedBy,jdbcType=VARCHAR},
       UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP},
       arrival_warehouse = #{record.arrivalWarehouse,jdbcType=VARCHAR},
-      arrival_warehouse_id = #{record.arrivalWarehouseId,jdbcType=INTEGER},
+      arrival_warehouse_id = #{record.arrivalWarehouseId,jdbcType=VARCHAR},
       receiver = #{record.receiver,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -460,7 +460,7 @@
         arrival_warehouse = #{arrivalWarehouse,jdbcType=VARCHAR},
       </if>
       <if test="arrivalWarehouseId != null">
-        arrival_warehouse_id = #{arrivalWarehouseId,jdbcType=INTEGER},
+        arrival_warehouse_id = #{arrivalWarehouseId,jdbcType=VARCHAR},
       </if>
       <if test="receiver != null">
         receiver = #{receiver,jdbcType=VARCHAR},
@@ -488,7 +488,7 @@
       UPDATED_BY = #{updatedBy,jdbcType=VARCHAR},
       UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
       arrival_warehouse = #{arrivalWarehouse,jdbcType=VARCHAR},
-      arrival_warehouse_id = #{arrivalWarehouseId,jdbcType=INTEGER},
+      arrival_warehouse_id = #{arrivalWarehouseId,jdbcType=VARCHAR},
       receiver = #{receiver,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>

src/main/java/com/starcharge/wios/dao/mappers/ReceivednoteMapper.xml

@@ -15,7 +15,7 @@
     <result column="receiving_time" jdbcType="TIMESTAMP" property="receivingTime" />
     <result column="arrival_quantity" jdbcType="INTEGER" property="arrivalQuantity" />
     <result column="auxiliary_id" jdbcType="INTEGER" property="auxiliaryId" />
-    <result column="isproduct" jdbcType="INTEGER" property="isproduct" />
+    <result column="isproduct" jdbcType="VARCHAR" property="isproduct" />
     <result column="CREATED_BY" jdbcType="VARCHAR" property="createdBy" />
     <result column="CREATED_TIME" jdbcType="TIMESTAMP" property="createdTime" />
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
@@ -155,7 +155,7 @@
       #{materialCategory,jdbcType=VARCHAR}, #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, 
       #{arrivalWarehouse,jdbcType=VARCHAR}, #{arrivalWarehouseId,jdbcType=INTEGER}, #{receiver,jdbcType=VARCHAR}, 
       #{receivingTime,jdbcType=TIMESTAMP}, #{arrivalQuantity,jdbcType=INTEGER}, #{auxiliaryId,jdbcType=INTEGER}, 
-      #{isproduct,jdbcType=INTEGER}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP}, 
+      #{isproduct,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP},
       #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Receivednote">
@@ -254,7 +254,7 @@
         #{auxiliaryId,jdbcType=INTEGER},
       </if>
       <if test="isproduct != null">
-        #{isproduct,jdbcType=INTEGER},
+        #{isproduct,jdbcType=VARCHAR},
       </if>
       <if test="createdBy != null">
         #{createdBy,jdbcType=VARCHAR},
@@ -319,7 +319,7 @@
         auxiliary_id = #{record.auxiliaryId,jdbcType=INTEGER},
       </if>
       <if test="record.isproduct != null">
-        isproduct = #{record.isproduct,jdbcType=INTEGER},
+        isproduct = #{record.isproduct,jdbcType=VARCHAR},
       </if>
       <if test="record.createdBy != null">
         CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
@@ -353,7 +353,7 @@
       receiving_time = #{record.receivingTime,jdbcType=TIMESTAMP},
       arrival_quantity = #{record.arrivalQuantity,jdbcType=INTEGER},
       auxiliary_id = #{record.auxiliaryId,jdbcType=INTEGER},
-      isproduct = #{record.isproduct,jdbcType=INTEGER},
+      isproduct = #{record.isproduct,jdbcType=VARCHAR},
       CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{record.createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{record.updatedBy,jdbcType=VARCHAR},
@@ -402,7 +402,7 @@
         auxiliary_id = #{auxiliaryId,jdbcType=INTEGER},
       </if>
       <if test="isproduct != null">
-        isproduct = #{isproduct,jdbcType=INTEGER},
+        isproduct = #{isproduct,jdbcType=VARCHAR},
       </if>
       <if test="createdBy != null">
         CREATED_BY = #{createdBy,jdbcType=VARCHAR},
@@ -433,7 +433,7 @@
       receiving_time = #{receivingTime,jdbcType=TIMESTAMP},
       arrival_quantity = #{arrivalQuantity,jdbcType=INTEGER},
       auxiliary_id = #{auxiliaryId,jdbcType=INTEGER},
-      isproduct = #{isproduct,jdbcType=INTEGER},
+      isproduct = #{isproduct,jdbcType=VARCHAR},
       CREATED_BY = #{createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{updatedBy,jdbcType=VARCHAR},

src/main/java/com/starcharge/wios/dao/mappers/RejectMapper.xml

@@ -21,7 +21,7 @@
     <result column="check_user" jdbcType="VARCHAR" property="checkUser" />
     <result column="check_user_name" jdbcType="VARCHAR" property="checkUserName" />
     <result column="check_suggestion" jdbcType="VARCHAR" property="checkSuggestion" />
-    <result column="isproduct" jdbcType="INTEGER" property="isproduct" />
+    <result column="isproduct" jdbcType="VARCHAR" property="isproduct" />
     <result column="CREATED_BY" jdbcType="VARCHAR" property="createdBy" />
     <result column="CREATED_TIME" jdbcType="TIMESTAMP" property="createdTime" />
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
@@ -183,7 +183,7 @@
       #{logisticCompany,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
       #{reason,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, 
       #{checkUser,jdbcType=VARCHAR}, #{checkUserName,jdbcType=VARCHAR}, #{checkSuggestion,jdbcType=VARCHAR}, 
-      #{isproduct,jdbcType=INTEGER}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP}, 
+      #{isproduct,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP},
       #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP},#{remarks,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Reject">
@@ -327,7 +327,7 @@
         #{checkSuggestion,jdbcType=VARCHAR},
       </if>
       <if test="isproduct != null">
-        #{isproduct,jdbcType=INTEGER},
+        #{isproduct,jdbcType=VARCHAR},
       </if>
       <if test="createdBy != null">
         #{createdBy,jdbcType=VARCHAR},
@@ -419,7 +419,7 @@
         check_suggestion = #{record.checkSuggestion,jdbcType=VARCHAR},
       </if>
       <if test="record.isproduct != null">
-        isproduct = #{record.isproduct,jdbcType=INTEGER},
+        isproduct = #{record.isproduct,jdbcType=VARCHAR},
       </if>
       <if test="record.createdBy != null">
         CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
@@ -459,7 +459,7 @@
       check_user = #{record.checkUser,jdbcType=VARCHAR},
       check_user_name = #{record.checkUserName,jdbcType=VARCHAR},
       check_suggestion = #{record.checkSuggestion,jdbcType=VARCHAR},
-      isproduct = #{record.isproduct,jdbcType=INTEGER},
+      isproduct = #{record.isproduct,jdbcType=VARCHAR},
       CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{record.createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{record.updatedBy,jdbcType=VARCHAR},
@@ -526,7 +526,7 @@
         check_suggestion = #{checkSuggestion,jdbcType=VARCHAR},
       </if>
       <if test="isproduct != null">
-        isproduct = #{isproduct,jdbcType=INTEGER},
+        isproduct = #{isproduct,jdbcType=VARCHAR},
       </if>
       <if test="createdBy != null">
         CREATED_BY = #{createdBy,jdbcType=VARCHAR},
@@ -569,7 +569,7 @@
       check_user = #{checkUser,jdbcType=VARCHAR},
       check_user_name = #{checkUserName,jdbcType=VARCHAR},
       check_suggestion = #{checkSuggestion,jdbcType=VARCHAR},
-      isproduct = #{isproduct,jdbcType=INTEGER},
+      isproduct = #{isproduct,jdbcType=VARCHAR},
       CREATED_BY = #{createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{updatedBy,jdbcType=VARCHAR},

src/main/java/com/starcharge/wios/vo/DeliveryAddVo.java

@@ -157,7 +157,7 @@ public class DeliveryAddVo {
      * @mbg.generated
      */
     @ApiModelProperty(value = "到货仓库id")
-    private Integer arrivalWarehouseId;
+    private String arrivalWarehouseId;
 
     /**
      * 收货人

src/main/java/com/starcharge/wios/vo/DeliveryExcelVo.java

@@ -170,7 +170,7 @@ public class DeliveryExcelVo {
      * @mbg.generated
      */
     @ExcelProperty(value = "到货仓库id")
-    private Integer arrivalWarehouseId;
+    private String arrivalWarehouseId;
 
     /**
      * 收货人

src/main/java/com/starcharge/wios/vo/ReceivednoteAddVo.java

@@ -100,8 +100,8 @@ public class ReceivednoteAddVo {
      */
     @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
     @NotNull(groups = CreateEntityGroup.class)
-    @Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups = CreateEntityGroup.class)
-    private Integer isproduct;
+//    @Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups = CreateEntityGroup.class)
+    private String isproduct;
 
     @Data
     public static class SingleReceivenote{

src/main/java/com/starcharge/wios/vo/ReceivednoteExcelVo.java

@@ -122,7 +122,7 @@ public class ReceivednoteExcelVo {
      * @mbg.generated
      */
     @ExcelProperty(value = "是否产品或辅料")
-    private Integer isproduct;
+    private String isproduct;
     /**
      * 创建人
      *

src/main/java/com/starcharge/wios/vo/RejectAddVo.java

@@ -155,8 +155,7 @@ public class RejectAddVo {
      */
     @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
     @NotNull(groups = CreateEntityGroup.class)
-    @Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups = {CreateEntityGroup.class,UpdateEntityGroup.class})
-    private Integer isproduct;
+    private String isproduct;
     /**
      * 申请表
      *

src/main/java/com/starcharge/wios/vo/RejectExcelVo.java

@@ -170,7 +170,7 @@ public class RejectExcelVo {
      * @mbg.generated
      */
     @ExcelProperty(value = "是否产品或辅料")
-    private Integer isproduct;
+    private String isproduct;
     /**
      * 创建人
      *