需求#1391

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java

@@ -34,25 +34,21 @@ import javax.persistence.Table;
 @Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "物流费用管理")
 public class WmsLogisticsCosts extends BaseBean {
-
     private static final long serialVersionUID = -5307311210847854654L;
-    @Column(name = "ORGANIZE_NAME")
-    @ApiParam(value = "工厂名称")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String organizeName;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
+    private Integer transportType;
 
     @Column(name = "PLACE_OF_ORIGIN")
-    @ApiParam(value = "发出地")
+    @ApiParam(value = "发出地存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String placeOfOrigin;
 
-    @Column(name = "DESTINATION_WAREHOUSE")
-    @ApiParam(value = "目的仓库")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String destinationWarehouse;
-
     @Column(name = "SHIPPING_FLAG")
-    @ApiParam(value = "发往地")
+    @ApiParam(value = "发往地存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
 
@@ -61,16 +57,26 @@ public class WmsLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String logisticsVendorNo;
 
+    @Column(name = "part_no")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "part_name")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partName;
+
     @Column(name = "SALES_UNIT")
     @ApiParam(value = "计价单位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String salesUnit;
 
-    @Column(name = "TRANSPORT_TYPE")
+    @Column(name = "TRANSPORT_MODE")
     @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
-    private Integer transportType;
+    private Integer transportMode;
 
     @Column(name = "price")
     @ApiParam(value = "单价")
@@ -83,7 +89,7 @@ public class WmsLogisticsCosts extends BaseBean {
     private String startDate;
 
     @Column(name = "END_DATE")
-    @ApiParam(value = "结束日期")
+    @ApiParam(value = "失效日期")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String endDate;