瀏覽代碼

删除出入库payable_id字段

fubin 1 年之前
父節點
當前提交
30f182ac3c

+ 3 - 12
src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -8,7 +8,7 @@
         into_id ,into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id,
         into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty,
         return_amt, into_date, remarks, annex_paths, make_staff, make_time,
-        receivable_id, payable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
+        receivable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,wh_id,
         into_reason,flg_auto_handle,flg_handle_setting,flg_neg_into
     </sql>
@@ -19,7 +19,7 @@
         tpi.into_id, tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id,
         tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt, tpi.into_qty,
         tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths,
-        tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id,
+        tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.flg_valid, tpi.cp_id,
         tpi.wh_id,tpi.into_reason,tpi.flg_auto_handle,tpi.flg_handle_setting,tpi.flg_neg_into
     </sql>
 
@@ -48,7 +48,6 @@
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
@@ -90,7 +89,6 @@
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="into_reason" property="intoReason" typeHandler="UuidTypeHandler"/>
@@ -121,7 +119,7 @@
         tpi.into_id
         , tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id, tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt,
         tpi.into_qty, tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths, tpi.make_staff, tpi.make_time,
-        tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id
+        tpi.receivable_id, tpi.flg_valid, tpi.cp_id
     </sql>
     <!-- response明细关联明细映射-->
     <resultMap id="BaseResultMapItemResponse" type="com.dk.mdm.model.response.ivt.InboundResponse">
@@ -147,7 +145,6 @@
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <collection property="inboundItemList" resultMap="inboundItemListMap" columnPrefix="list_"/>
@@ -262,9 +259,6 @@
             <if test="receivableId != null and receivableId != ''">
                 AND tpi.receivable_id = #{receivableId}
             </if>
-            <if test="payableId != null and payableId != ''">
-                AND tpi.payable_id = #{payableId}
-            </if>
             <if test="flgValid != null">
                 AND tpi.flg_valid = #{flgValid}
             </if>
@@ -453,7 +447,6 @@
             make_staff,
             make_time,
             receivable_id,
-            payable_id,
             cp_id,
             op_app_code,
             wh_id,
@@ -485,7 +478,6 @@
                 #{item.makeStaff}::uuid,
                 #{item.makeTime},
                 #{item.receivableId}::uuid,
-                #{item.payableId}::uuid,
                 #{item.cpId},
                 #{item.opAppCode},
                 #{item.whId},
@@ -983,7 +975,6 @@
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="sup_name" property="supName"/>

+ 2 - 12
src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -8,14 +8,14 @@
         out_id, out_no, out_type, from_id, from_no, org_id, staff_id, cus_id, sup_id,
         out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt,
         out_date, remarks, annex_paths, make_staff, make_time, receivable_id,
-        payable_id, flg_valid, cp_id,out_reason,flg_auto_handle,flg_handle_setting
+        flg_valid, cp_id,out_reason,flg_auto_handle,flg_handle_setting
     </sql>
 
     <sql id="Base_Column_List_Response">
         tpo.out_id, tpo.out_no, tpo.out_type, tpo.from_id, tpo.from_no, tpo.org_id, tpo.staff_id,
         tpo.cus_id, tpo.sup_id, tpo.out_status, tpo.outing_qty, tpo.outing_amt, tpo.out_qty, tpo.out_amt,
         tpo.return_qty, tpo.return_amt, tpo.out_date, tpo.remarks, tpo.annex_paths, tpo.make_staff,
-        tpo.make_time, tpo.receivable_id, tpo.payable_id, tpo.flg_valid, tpo.cp_id,tpo.out_reason,
+        tpo.make_time, tpo.receivable_id, tpo.flg_valid, tpo.cp_id,tpo.out_reason,
         tpo.flg_auto_handle,tpo.flg_handle_setting
     </sql>
 
@@ -43,7 +43,6 @@
                 <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
             <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
                 <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-                <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
             <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
@@ -82,7 +81,6 @@
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
@@ -191,9 +189,6 @@
             <if test="receivableId != null and receivableId != ''">
                 AND t.receivable_id = #{receivableId}
             </if>
-            <if test="payableId != null and payableId != ''">
-                AND t.payable_id = #{payableId}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -280,7 +275,6 @@
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
                t.receivable_id,
-               t.payable_id,
                t.cp_id,
                t.flg_valid,
               tmd.data_value                                   as out_reason_name
@@ -364,7 +358,6 @@
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
                t.receivable_id,
-               t.payable_id,
                t.cp_id,
                t.flg_valid,
                tmp.sup_name                                      AS "supplierName",
@@ -431,7 +424,6 @@
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
                t.receivable_id,
-               t.payable_id,
                t.cp_id,
                t.flg_valid,
                tmd.data_value                                    as out_reason_name
@@ -494,7 +486,6 @@
             make_staff,
             make_time,
             receivable_id,
-            payable_id,
             cp_id,
             op_app_code,
         </trim>
@@ -524,7 +515,6 @@
                 #{item.makeStaff}::uuid,
                 #{item.makeTime},
                 #{item.receivableId}::uuid,
-                #{item.payableId}::uuid,
                 #{item.cpId},
                 #{item.opAppCode},
             </trim>

+ 0 - 9
src/main/java/com/dk/mdm/model/pojo/ivt/Inbound.java

@@ -227,15 +227,6 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
 
 
     /**
-     * 应付款单
-     */
-    @Excel(name = "应付款单")
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @Excel(name = "有效标识 (1:正常 0:停用)")

+ 0 - 9
src/main/java/com/dk/mdm/model/pojo/ivt/Outbound.java

@@ -231,15 +231,6 @@ public class Outbound extends PageInfo<Outbound> implements Serializable {
 
 
     /**
-     * 应付款单
-     */
-    @Excel(name = "应付款单")
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @Excel(name = "有效标识 (1:正常 0:停用)")

+ 0 - 8
src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -209,14 +209,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> {
 
 
     /**
-     * 应付款单
-     */
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @ApiModelProperty(value = "有效标识 (1:正常 0:停用)")

+ 0 - 8
src/main/java/com/dk/mdm/model/response/ivt/InboundResponse.java

@@ -249,14 +249,6 @@ public class InboundResponse  {
 
 
     /**
-     * 应付款单
-     */
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @ApiModelProperty(value = "有效标识 (1:正常 0:停用)")

+ 0 - 9
src/main/java/com/dk/mdm/model/response/ivt/OutboundResponse.java

@@ -239,15 +239,6 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
 
 
     /**
-     * 应付款单
-     */
-    @Excel(name = "应付款单")
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @Excel(name = "有效标识 (1:正常 0:停用)")

+ 0 - 8
src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java

@@ -196,14 +196,6 @@ public class InboundVO {
 
 
     /**
-     * 应付款单
-     */
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @ApiModelProperty(value = "有效标识 (1:正常 0:停用)")

+ 0 - 8
src/main/java/com/dk/mdm/model/vo/ivt/OutboundVO.java

@@ -206,14 +206,6 @@ public class OutboundVO{
 
 
     /**
-     * 应付款单
-     */
-    @ApiModelProperty(value = "应付款单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String payableId;
-
-
-    /**
      * 有效标识 (1:正常 0:停用)
      */
     @ApiModelProperty(value = "有效标识 (1:正常 0:停用)")