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

@@ -27,6 +27,12 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
     private String planId;
 
     /**
+     * 发货单ID
+     */
+    @ApiModelProperty("发货单ID")
+    private String shipmentsOrderId;
+
+    /**
      * 发货日期
      */
     @ApiModelProperty("发货日期")

@@ -83,6 +83,9 @@
             <if test="vo.planId != null and vo.planId != ''">
                 AND tb.plan_id = #{vo.planId}
             </if>
+            <if test="vo.shipmentsOrderId != null and vo.shipmentsOrderId != ''">
+                AND tb.shipment_order_id = #{vo.shipmentsOrderId}
+            </if>
             <if test="vo.shipmentsDate != null">
                 AND tb.shipments_date = #{vo.shipmentsDate}
             </if>