Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X
This commit is contained in:
@@ -95,5 +95,9 @@ public class WmsDeliveryWaybillDetailBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发货计划ID(用于根据计划ID查询所有关联的发货单明细)
|
||||||
|
*/
|
||||||
|
private Long planId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -263,6 +263,9 @@
|
|||||||
<if test="bo.unitPrice != null">
|
<if test="bo.unitPrice != null">
|
||||||
AND d.unit_price = #{bo.unitPrice}
|
AND d.unit_price = #{bo.unitPrice}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="bo.planId != null">
|
||||||
|
AND w.plan_id = #{bo.planId}
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user