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

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

@@ -92,6 +92,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="uploadStatus != null">
+                and ico.uploadStatus = #{uploadStatus}
+            </if>
         </where>
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
     </select>

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

@@ -4354,3 +4354,8 @@ CALL Pro_Temp_ColumnWork('thr_products', 'prepnSpec',
 CALL Pro_Temp_ColumnWork('thr_products', 'prepnUnit',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''制剂单位''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('io_collect_order', 'errorMsg',
+                         'varchar(1024) NULL COMMENT ''异常信息''',
+                         1);