Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java

@@ -272,5 +272,13 @@ public class IoCollectOrder implements Serializable {
     @TableField(value = "uploadError")
     private String uploadError;
 
+
+    @TableField(value = "shipper")
+    @ApiModelProperty(value = "发货方编码")
+    private String shipper;
+    @TableField(value = "shipperName")
+    @ApiModelProperty(value = "发货方名称")
+    private String shipperName;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java

@@ -234,16 +234,23 @@ public class IoCollectOrderBackup implements Serializable {
     private String errorMsg;
 
     /**
-     *上传状态(1.未上传,2.已上传,3.上传失败)
+     * 上传状态(1.未上传,2.已上传,3.上传失败)
      */
     @TableField(value = "uploadStatus")
     private Integer uploadStatus;
 
     /**
-     *上传错误信息
+     * 上传错误信息
      */
     @TableField(value = "uploadError")
     private String uploadError;
 
+
+    @TableField(value = "shipper")
+    @ApiModelProperty(value = "发货方编码")
+    private String shipper;
+    @TableField(value = "shipperName")
+    @ApiModelProperty(value = "发货方名称")
+    private String shipperName;
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java

@@ -323,8 +323,10 @@ public class IoCollectOrderOrigin implements Serializable {
     private String errorMsg;
 
     @TableField(value = "shipper")
-    @ApiModelProperty(value="发货方")
+    @ApiModelProperty(value="发货方编码")
     private String shipper;
-
+    @TableField(value = "shipperName")
+    @ApiModelProperty(value="发货方名称")
+    private String shipperName;
 
 }

src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java

@@ -40,5 +40,7 @@ public class IoSplitDesOrderRequest extends ListPageRequest {
      */
     private String endTime;
 
+    private String keywords;
+
 
 }

src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java

@@ -156,12 +156,12 @@ public class IoCollectOrderResponse {
     private Integer invAlert;
 
     /**
-     *上传状态(1.未上传,2.已上传,3.上传失败)
+     * 上传状态(1.未上传,2.已上传,3.上传失败)
      */
     private Integer uploadStatus;
 
     /**
-     *上传错误信息
+     * 上传错误信息
      */
     private String uploadError;
 
@@ -174,10 +174,8 @@ public class IoCollectOrderResponse {
      * 第三方单据类型
      */
     private String actionName;
-    /**
-     * 发货方
-     */
     private String shipper;
+    private String shipperName;
 
     public String getFromName() {
 

src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml

@@ -25,6 +25,11 @@
                 AND date_format(isdo.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
                 date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (isdo.billNo like concat('%', #{keywords}, '%')
+                or isdo.workPlaceCode like concat('%', #{keywords}, '%')
+                or isdo.busType like concat('%', #{keywords}, '%'))
+            </if>
         </where>
         ORDER BY isdo.createTime DESC
     </select>

src/main/resources/schemas/schema_v2.4.sql

@@ -4387,3 +4387,22 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'tempSplitCount',
 CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'shipper',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
                          1);
+CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'shipperName',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_collect_order', 'shipper',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_order', 'shipperName',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
+                         1);
+
+
+CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'shipper',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'shipperName',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
+                         1);
+