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

@@ -28,4 +28,10 @@ public class QueryCustomerVo extends SortPageVo implements BaseVo, Serializable
    */
   @ApiModelProperty("状态")
   private Boolean available;
+
+  /**
+   * 来源
+   */
+  @ApiModelProperty("来源")
+  private String source;
 }

@@ -69,6 +69,27 @@
                 <if test="vo.available != null">
                     AND c.available = #{vo.available}
                 </if>
+                <choose>
+                    <when test="vo.source == 'CUSTOMER_CREDIT'">
+                        AND NOT EXISTS (
+                        SELECT 1
+                        FROM customer_credit cc
+                        WHERE cc.company_id = c.id
+                        AND cc.status != 'CANCEL'
+                        )
+                    </when>
+                    <when test="vo.source == 'CUSTOMER_DEVELOP'">
+                        AND NOT EXISTS (
+                        SELECT 1
+                        FROM customer_develop_plan cdp
+                        WHERE cdp.customer_id = c.id
+                        AND cdp.status != 'CANCEL'
+                        )
+                    </when>
+                    <otherwise>
+                        AND 1 = 1  <!-- 确保查询到任何数据 -->
+                    </otherwise>
+                </choose>
             </if>
         </where>
         ORDER BY c.code
@@ -99,14 +120,27 @@
                 <if test="vo.available != null">
                     AND c.available = #{vo.available}
                 </if>
-                <if test="vo.source == 'CUSTOMER_CREDIT'">
-                    AND NOT EXISTS (
-                    SELECT 1
-                    FROM customer_credit cc
-                    WHERE cc.company_id = c.id
-                    AND cc.status != 'CANCEL'
-                    )
-                </if>
+                <choose>
+                    <when test="vo.source == 'CUSTOMER_CREDIT'">
+                        AND NOT EXISTS (
+                        SELECT 1
+                        FROM customer_credit cc
+                        WHERE cc.company_id = c.id
+                        AND cc.status != 'CANCEL'
+                        )
+                    </when>
+                    <when test="vo.source == 'CUSTOMER_DEVELOP'">
+                        AND NOT EXISTS (
+                        SELECT 1
+                        FROM customer_develop_plan cdp
+                        WHERE cdp.customer_id = c.id
+                        AND cdp.status != 'CANCEL'
+                        )
+                    </when>
+                    <otherwise>
+                        AND 1 = 1  <!-- 确保查询到任何数据 -->
+                    </otherwise>
+                </choose>
             </if>
         </where>
         ORDER BY c.code

@@ -30,6 +30,11 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 规格变更后ID
+     */
+    private String afterId;
+
+    /**
      * 订货单主表ID/订货单变更记录ID
      */
     private String purchaseOrderId;
@@ -50,11 +55,23 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String brand;
 
     /**
+     * 牌号是否变更
+     */
+    @TableField(exist = false)
+    private Boolean brandChange;
+
+    /**
      * 厚度
      */
     private BigDecimal thickness;
 
     /**
+     * 厚度是否变更
+     */
+    @TableField(exist = false)
+    private Boolean thicknessChange;
+
+    /**
      * 厚度公差正
      */
     private BigDecimal thicknessTolPos;
@@ -70,6 +87,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal width;
 
     /**
+     * 宽度是否变更
+     */
+    @TableField(exist = false)
+    private Boolean widthChange;
+
+    /**
      * 宽度公差正
      */
     private BigDecimal widthTolPos;
@@ -85,6 +108,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal length;
 
     /**
+     * 长度是否变更
+     */
+    @TableField(exist = false)
+    private Boolean lengthChange;
+
+    /**
      * 长度公差正
      */
     private BigDecimal lengthTolPos;
@@ -100,11 +129,23 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 状态是否变更
+     */
+    @TableField(exist = false)
+    private Boolean statusChange;
+
+    /**
      * 数量
      */
     private BigDecimal quantity;
 
     /**
+     * 数量是否变更
+     */
+    @TableField(exist = false)
+    private Boolean quantityChange;
+
+    /**
      * 实发数
      */
     @TableField(exist = false)
@@ -116,6 +157,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal salesPrice;
 
     /**
+     * 销售价格是否变更
+     */
+    @TableField(exist = false)
+    private Boolean salesPriceChange;
+
+    /**
      * 是否展示销售价格(非持久化字段)
      */
     @TableField(exist = false)
@@ -153,6 +200,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private Boolean delFlag;
 
     /**
+     * 新增/删除/变更
+     */
+    @TableField(exist = false)
+    private String type;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -67,6 +67,9 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
         PurchaseOrderLine data = new PurchaseOrderLine();
         data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getAfterId())) {
+            data.setAfterId(vo.getAfterId());
+        }
         data.setPurchaseOrderId(vo.getPurchaseOrderId());
         if (!StringUtil.isBlank(vo.getIndustry())) {
             data.setIndustry(vo.getIndustry());

@@ -17,6 +17,13 @@ public class CreatePurchaseOrderLineVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 变更后ID
+     */
+    @ApiModelProperty("变更后ID")
+    @Length(message = "变更后ID最多允许32个字符！")
+    private String afterId;
+
+    /**
      * 订货单主表ID
      */
     @ApiModelProperty(value = "订货单主表ID", required = true)

@@ -4,6 +4,7 @@
 
     <resultMap id="PurchaseOrderLine" type="com.lframework.xingyun.sc.entity.PurchaseOrderLine">
         <id column="id" property="id"/>
+        <result column="after_id" property="afterId"/>
         <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="industry" property="industry"/>
         <result column="quality" property="quality"/>
@@ -34,6 +35,7 @@
     <sql id="PurchaseOrderLine_sql">
         SELECT
             tb.id,
+            tb.after_id,
             tb.purchase_order_id,
             tb.industry,
             tb.quality,