Merge remote-tracking branch 'origin/master'

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

@@ -166,5 +166,11 @@ public class Receivednote extends PageVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
+    /**
+     * 文件地址
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "文件地址")
+    private String fileUrl;
 }
\ No newline at end of file

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

@@ -1294,6 +1294,76 @@ public class ReceivednoteCriteria {
             addCriterion("UPDATED_TIME not between", value1, value2, "updatedTime");
             return (Criteria) this;
         }
+
+        public Criteria andFileUrlIsNull() {
+            addCriterion("file_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlIsNotNull() {
+            addCriterion("file_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlEqualTo(String value) {
+            addCriterion("file_url =", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotEqualTo(String value) {
+            addCriterion("file_url <>", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlGreaterThan(String value) {
+            addCriterion("file_url >", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("file_url >=", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlLessThan(String value) {
+            addCriterion("file_url <", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlLessThanOrEqualTo(String value) {
+            addCriterion("file_url <=", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlLike(String value) {
+            addCriterion("file_url like", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotLike(String value) {
+            addCriterion("file_url not like", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlIn(List<String> values) {
+            addCriterion("file_url in", values, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotIn(List<String> values) {
+            addCriterion("file_url not in", values, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlBetween(String value1, String value2) {
+            addCriterion("file_url between", value1, value2, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotBetween(String value1, String value2) {
+            addCriterion("file_url not between", value1, value2, "fileUrl");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -95,17 +95,17 @@
     from t_delivery
     <where>
       <if test="deliveryOrder != null  and deliveryOrder != ''"> and delivery_order = #{deliveryOrder}</if>
-      <if test="installOrder != null  and installOrder != ''"> and install_order = #{installOrder}</if>
+      <if test="installOrder != null  and installOrder != ''"> and install_order like concat('%', #{installOrder}, '%')</if>
       <if test="productBatch != null  and productBatch != ''"> and product_batch = #{productBatch}</if>
       <if test="quantity != null "> and quantity = #{quantity}</if>
       <if test="materialCategory != null  and materialCategory != ''"> and material_category = #{materialCategory}</if>
-      <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
+      <if test="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
       <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
       <if test="materialCompany != null  and materialCompany != ''"> and material_company = #{materialCompany}</if>
       <if test="logisticOrder != null  and logisticOrder != ''"> and logistic_order = #{logisticOrder}</if>
       <if test="logisticCompany != null  and logisticCompany != ''"> and logistic_company = #{logisticCompany}</if>
       <if test="logisticStatus != null  and logisticStatus != ''"> and logistic_status = #{logisticStatus}</if>
-      <if test="team != null  and team != ''"> and team = #{team}</if>
+      <if test="team != null  and team != ''"> and team like concat('%', #{team}, '%')</if>
       <if test="isproduct != null "> and isproduct = #{isproduct}</if>
       <if test="createdBy != null  and createdBy != ''"> and CREATED_BY = #{createdBy}</if>
       <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>

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

@@ -20,6 +20,7 @@
     <result column="CREATED_TIME" jdbcType="TIMESTAMP" property="createdTime" />
     <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
     <result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" />
+    <result column="file_url" jdbcType="VARCHAR" property="fileUrl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -83,7 +84,7 @@
     id, received_order, install_order, product_batch, material_category, material_code, 
     material_name, arrival_warehouse, arrival_warehouse_id, receiver, receiving_time, 
     arrival_quantity, auxiliary_id, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, 
-    UPDATED_TIME
+    UPDATED_TIME, file_url
   </sql>
 
   <select id="selectReceivedNoteList" parameterType="com.starcharge.wios.dao.entity.Receivednote" resultMap="BaseResultMap">
@@ -92,12 +93,12 @@
     from t_received_note
     <where>
       <if test="receivedOrder != null  and receivedOrder != ''"> and received_order = #{receivedOrder}</if>
-      <if test="installOrder != null  and installOrder != ''"> and install_order = #{installOrder}</if>
+      <if test="installOrder != null  and installOrder != ''"> and install_order like concat('%', #{installOrder}, '%')</if>
       <if test="productBatch != null  and productBatch != ''"> and product_batch = #{productBatch}</if>
       <if test="materialCategory != null  and materialCategory != ''"> and material_category = #{materialCategory}</if>
-      <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
+      <if test="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
       <if test="arrivalWarehouse != null  and arrivalWarehouse != ''"> and arrival_warehouse = #{arrivalWarehouse}</if>
-      <if test="arrivalWarehouseId != null "> and arrival_warehouse_id = #{arrivalWarehouseId}</if>
+      <if test="arrivalWarehouseId != null "> and arrival_warehouse_id like concat('%', #{arrivalWarehouseId}, '%')</if>
       <if test="receiver != null  and receiver != ''"> and receiver = #{receiver}</if>
       <if test="receivingTime != null "> and receiving_time = #{receivingTime}</if>
       <if test="arrivalQuantity != null "> and arrival_quantity = #{arrivalQuantity}</if>
@@ -107,10 +108,10 @@
       <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
       <if test="updatedBy != null  and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if>
       <if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if>
+      <if test="fileUrl != null "> and file_url = #{fileUrl}</if>
     </where>
   </select>
 
-
   <select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.ReceivednoteCriteria" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -150,13 +151,15 @@
       arrival_warehouse, arrival_warehouse_id, receiver, 
       receiving_time, arrival_quantity, auxiliary_id, 
       isproduct, CREATED_BY, CREATED_TIME, 
-      UPDATED_BY, UPDATED_TIME)
+      UPDATED_BY, UPDATED_TIME, file_url
+      )
     values (#{receivedOrder,jdbcType=VARCHAR}, #{installOrder,jdbcType=VARCHAR}, #{productBatch,jdbcType=VARCHAR}, 
       #{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=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP},
-      #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP})
+      #{isproduct,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP}, 
+      #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP}, #{fileUrl,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Receivednote">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -215,6 +218,9 @@
       <if test="updatedTime != null">
         UPDATED_TIME,
       </if>
+      <if test="fileUrl != null">
+        file_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="receivedOrder != null">
@@ -268,6 +274,9 @@
       <if test="updatedTime != null">
         #{updatedTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="fileUrl != null">
+        #{fileUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.ReceivednoteCriteria" resultType="java.lang.Long">
@@ -333,6 +342,9 @@
       <if test="record.updatedTime != null">
         UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.fileUrl != null">
+        file_url = #{record.fileUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -357,7 +369,8 @@
       CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{record.createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{record.updatedBy,jdbcType=VARCHAR},
-      UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP}
+      UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP},
+      file_url = #{record.fileUrl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -416,6 +429,9 @@
       <if test="updatedTime != null">
         UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="fileUrl != null">
+        file_url = #{fileUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -437,7 +453,8 @@
       CREATED_BY = #{createdBy,jdbcType=VARCHAR},
       CREATED_TIME = #{createdTime,jdbcType=TIMESTAMP},
       UPDATED_BY = #{updatedBy,jdbcType=VARCHAR},
-      UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP}
+      UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
+      file_url = #{fileUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

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

@@ -104,7 +104,7 @@
     left join wb_account wb on t.account_id=wb.id
     <where>
       <if test="rejectOrder != null  and rejectOrder != ''"> and t.reject_order = #{rejectOrder}</if>
-      <if test="installOrder != null  and installOrder != ''"> and t.install_order = #{installOrder}</if>
+      <if test="installOrder != null  and installOrder != ''"> and t.install_order like concat('%', #{installOrder}, '%')</if>
       <if test="productBatch != null  and productBatch != ''"> and t.product_batch = #{productBatch}</if>
       <if test="quantity != null "> and t.quantity = #{quantity}</if>
       <if test="materialCategory != null  and materialCategory != ''"> and t.material_category = #{materialCategory}</if>

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

@@ -652,11 +652,11 @@
       <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
       <if test="updatedBy != null  and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if>
       <if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if>
-      <if test="installOrder != null  and installOrder != ''"> and install_order = #{installOrder}</if>
+      <if test="installOrder != null  and installOrder != ''"> and install_order like concat('%', #{installOrder}, '%')</if>
       <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
       <if test="logisticOrder != null  and logisticOrder != ''"> and logistic_order = #{logisticOrder}</if>
       <if test="applyInventory != null  and applyInventory != ''"> and apply_inventory = #{applyInventory}</if>
-      <if test="applyOrder != null  and applyOrder != ''"> and apply_order = #{applyOrder}</if>
+      <if test="applyOrder != null  and applyOrder != ''"> and apply_order like concat('%', #{applyOrder}, '%')</if>
     </where>
   </select>
 

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

@@ -140,7 +140,13 @@ public class ReceivednoteAddVo {
         @ApiModelProperty(value = "辅料申请单号")
         private Integer auxiliaryId;
 
-
+        /**
+         * 文件地址
+         *
+         * @mbg.generated
+         */
+        @ApiModelProperty(value = "文件地址")
+        private String fileUrl;
     }
 
 

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

 package com.starcharge.wios.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -154,4 +155,11 @@ public class ReceivednoteExcelVo {
      */
     @ExcelProperty(value = "更新时间")
     private LocalDateTime updatedTime;
+    /**
+     * 文件地址
+     *
+     * @mbg.generated
+     */
+    @ExcelProperty(value = "文件地址")
+    private String fileUrl;
 }