Quellcode durchsuchen

清除出库单无用字段

fubin vor 2 Jahren
Ursprung
Commit
d9675e9852

+ 1 - 21
src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        out_id, out_no, out_type, from_id, from_no, org_id, staff_id, order_id, order_no, into_return_id, into_return_no, 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, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        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, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -17,10 +17,6 @@
                 <result column="from_no" property="fromNo"/>
                 <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
                 <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-                <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
-                <result column="order_no" property="orderNo"/>
-                <result column="into_return_id" property="intoReturnId" typeHandler="UuidTypeHandler"/>
-                <result column="into_return_no" property="intoReturnNo"/>
                 <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
                 <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
                 <result column="out_status" property="outStatus"/>
@@ -69,18 +65,6 @@
             <if test="staffId != null and staffId != ''">
                 AND staff_id = #{staffId}
             </if>
-            <if test="orderId != null and orderId != ''">
-                AND order_id = #{orderId}
-            </if>
-            <if test="orderNo != null and orderNo != ''">
-                AND order_no = #{orderNo}
-            </if>
-            <if test="intoReturnId != null and intoReturnId != ''">
-                AND into_return_id = #{intoReturnId}
-            </if>
-            <if test="intoReturnNo != null and intoReturnNo != ''">
-                AND into_return_no = #{intoReturnNo}
-            </if>
             <if test="cusId != null and cusId != ''">
                 AND cus_id = #{cusId}
             </if>
@@ -256,10 +240,6 @@
                 #{item.fromNo},
                 #{item.orgId}::uuid,
                 #{item.staffId}::uuid,
-                #{item.orderId}::uuid,
-                #{item.orderNo},
-                #{item.intoReturnId}::uuid,
-                #{item.intoReturnNo},
                 #{item.cusId}::uuid,
                 #{item.supId}::uuid,
                 #{item.outStatus},

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

@@ -99,40 +99,6 @@ public class Outbound extends PageInfo<Outbound> implements Serializable {
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")

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

@@ -100,40 +100,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")

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

@@ -100,40 +100,6 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")

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

@@ -100,40 +100,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")