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

@@ -29,6 +29,14 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     @ApiModelProperty("ID")
     @ApiModelProperty("ID")
     private String id;
     private String id;
 
 
+    /**
+     * 类型
+     * 外贸: OUTSIDE
+     * 内贸：INSIDE
+     */
+    @ApiModelProperty("类型")
+    private String type;
+
     @ApiModelProperty("父ID")
     @ApiModelProperty("父ID")
     private String parentId;
     private String parentId;
 
 

@@ -30,6 +30,13 @@ public class ReceiptLedgerInfo extends BaseEntity implements BaseDto {
     private String id;
     private String id;
 
 
     /**
     /**
+     * 类型
+     * 外贸: OUTSIDE
+     * 内贸：INSIDE
+     */
+    private String type;
+
+    /**
      * 父ID
      * 父ID
      */
      */
     private String parentId;
     private String parentId;

@@ -238,6 +238,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         String userId = SecurityUtil.getCurrentUser().getId();
         String userId = SecurityUtil.getCurrentUser().getId();
         ReceiptLedgerInfo data = new ReceiptLedgerInfo();
         ReceiptLedgerInfo data = new ReceiptLedgerInfo();
         data.setId(IdUtil.getId());
         data.setId(IdUtil.getId());
+        data.setType(vo.getType());
         data.setParentId(vo.getId());
         data.setParentId(vo.getId());
         data.setCustomerShortId(vo.getCustomerShortId());
         data.setCustomerShortId(vo.getCustomerShortId());
         data.setQuota(vo.getQuota());
         data.setQuota(vo.getQuota());

@@ -207,7 +207,13 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 existOrderSpecIds.addAll(orderSpecIds);
                 existOrderSpecIds.addAll(orderSpecIds);
             }
             }
         }
         }
-        vo.setOrderSpecIds(existOrderSpecIds);
+        List<String> orderSpecIds = vo.getOrderSpecIds();
+        if (CollectionUtils.isNotEmpty(orderSpecIds)) {
+            orderSpecIds.addAll(existOrderSpecIds);
+        } else {
+            orderSpecIds = existOrderSpecIds;
+        }
+        vo.setOrderSpecIds(orderSpecIds);
         // 业务员做权限控制
         // 业务员做权限控制
         List<String> userIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         String currentUserId = SecurityUtil.getCurrentUser().getId();

@@ -18,6 +18,14 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
     private String id;
     private String id;
 
 
     /**
     /**
+     * 类型
+     * 外贸: OUTSIDE
+     * 内贸：INSIDE
+     */
+    @ApiModelProperty("类型")
+    private String type;
+
+    /**
      * 客户简称ID
      * 客户简称ID
      */
      */
     @ApiModelProperty("客户简称ID")
     @ApiModelProperty("客户简称ID")

@@ -4,6 +4,7 @@
 
 
     <resultMap id="ReceiptLedgerInfo" type="com.lframework.xingyun.sc.entity.ReceiptLedgerInfo">
     <resultMap id="ReceiptLedgerInfo" type="com.lframework.xingyun.sc.entity.ReceiptLedgerInfo">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
+        <result column="type" property="type"/>
         <result column="parent_id" property="parentId"/>
         <result column="parent_id" property="parentId"/>
         <result column="customer_short_id" property="customerShortId"/>
         <result column="customer_short_id" property="customerShortId"/>
         <result column="customer_short_name" property="customerShortName"/>
         <result column="customer_short_name" property="customerShortName"/>
@@ -45,6 +46,7 @@
     <sql id="ReceiptLedgerInfo_sql">
     <sql id="ReceiptLedgerInfo_sql">
         SELECT
         SELECT
             tb.id,
             tb.id,
+            tb.type,
             tb.parent_id,
             tb.parent_id,
             tb.customer_short_id,
             tb.customer_short_id,
             cs.short_name as customer_short_name,
             cs.short_name as customer_short_name,
@@ -96,6 +98,9 @@
             <if test="vo.id != null and vo.id != ''">
             <if test="vo.id != null and vo.id != ''">
                 AND tb.id = #{vo.id}
                 AND tb.id = #{vo.id}
             </if>
             </if>
+            <if test="vo.type != null and vo.type != ''">
+                AND tb.type = #{vo.type}
+            </if>
             <if test="vo.customerShortId != null and vo.customerShortId != ''">
             <if test="vo.customerShortId != null and vo.customerShortId != ''">
                 AND tb.customer_short_id = #{vo.customerShortId}
                 AND tb.customer_short_id = #{vo.customerShortId}
             </if>
             </if>
@@ -137,6 +142,7 @@
     <insert id="batchAdd">
     <insert id="batchAdd">
         INSERT INTO receipt_ledger_info (
         INSERT INTO receipt_ledger_info (
         id,
         id,
+        type,
         parent_id,
         parent_id,
         customer_short_id,
         customer_short_id,
         quota,
         quota,
@@ -169,6 +175,7 @@
         <foreach collection="list" item="item" separator=",">
         <foreach collection="list" item="item" separator=",">
             (
             (
             #{item.id},
             #{item.id},
+            #{item.type},
             #{item.parentId},
             #{item.parentId},
             #{item.customerShortId},
             #{item.customerShortId},
             #{item.quota},
             #{item.quota},