入库

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -109,8 +109,6 @@
         <result column="channel_name" property="channelName" />
         <result column="cus_from_name" property="cusFromName" />
         <result column="return_address" property="returnAddress" />
-        <result column="return_contact_name" property="returnContactName" />
-        <result column="return_contact_phone" property="returnContactPhone" />
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
     </resultMap>
@@ -333,9 +331,7 @@
         sys.f_get_name_i18n(tdktype.kind_name_i18n, 'zh_CN') AS  "intoTypeName",
         sys.f_get_name_i18n(tdk.kind_name_i18n, 'zh_CN') AS  "intoStatusName",
         tmd.data_value                                   as into_reason_name,
-        tmp.return_address,
-        tmp.contact_name AS return_contact_name,
-        tmp.contact_phone AS return_contact_phone
+        tmp.return_address
         FROM dkic_b.t_psi_inbound tpi
         <include refid="Join_Table"/>
         <include refid="Condition"/>

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -327,22 +327,6 @@ public class InboundItem  extends PageInfo<InboundItem> implements Serializable
     private String whId;
 
 
-    @ApiModelProperty(value = "源入库单ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sIntoId;
-
-    @ApiModelProperty(value = "源入库单明细ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sIntoItemId;
-
-    @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sPurId;
-
-    @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sPurItemId;
-
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -286,7 +286,6 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     private String opDbUser;
 
     @ApiModelProperty(value = "源出库单ID")
-<<<<<<< HEAD
     @JsonProperty(value = "sOutId")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sOutId;
@@ -306,22 +305,6 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderItemId;
 
-=======
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sOutId;
->>>>>>> 7e9e0188d981cf9811cfa58100ee8a187827e9a8
-
-    @ApiModelProperty(value = "源出库单明细ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sOutItemId;
-
-    @ApiModelProperty(value = "源销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sOrderId;
-
-    @ApiModelProperty(value = "源销售明细ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sOrderItemId;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -317,21 +317,6 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "库存业务类型（入库4种，出库4中）")
     private String inventoryDocCode;
 
-    @ApiModelProperty(value = "源入库单ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sIntoId;
-
-    @ApiModelProperty(value = "源入库单明细ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sIntoItemId;
-
-    @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sPurId;
-
-    @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String sPurItemId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -275,18 +275,6 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "订单明细ID")
     private String orderItemId;
 
-    @ApiModelProperty(value = "源出库单ID")
-    private String sOutId;
-
-    @ApiModelProperty(value = "源出库单明细ID")
-    private String sOutItemId;
-
-    @ApiModelProperty(value = "源销售订单ID")
-    private String sOrderId;
-
-    @ApiModelProperty(value = "源销售明细ID")
-    private String sOrderItemId;
-
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outboundOutQty;