Merge branch 'dev' into dev_jinji
This commit is contained in:
王奎兴
+4
-2
@@ -165,6 +165,8 @@ public class StorageLocation extends BaseVOEntity{
|
||||
@ApiModelProperty("是否作废: 1-否 2-是")
|
||||
@Excel(name = "是否作废: 1-否 2-是")
|
||||
private Integer nullify;
|
||||
@ApiModelProperty("库位条码")
|
||||
@Excel(name = "库位条码")
|
||||
private String locationBarCode;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
+4
-2
@@ -165,6 +165,8 @@ public class StorageLocationPO extends BaseVOEntity{
|
||||
@Excel(name = "是否作废: 1-否 2-是")
|
||||
private Integer nullify;
|
||||
|
||||
@ApiModelProperty("库位条码")
|
||||
@Excel(name = "库位条码")
|
||||
private String locationBarCode;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
+5
-1
@@ -204,4 +204,8 @@ public class StorageLocationDO extends BaseVOEntity{
|
||||
@ApiModelProperty("坐标-层 终止")
|
||||
@Excel(name = "坐标-层 终止")
|
||||
private String coordinateLayerEnd;
|
||||
}
|
||||
|
||||
@ApiModelProperty("库位条码")
|
||||
@Excel(name = "库位条码")
|
||||
private String locationBarCode;
|
||||
}
|
||||
+7
@@ -122,5 +122,12 @@ public class Warehouse extends BaseVOEntity{
|
||||
@Excel(name = "是否启用: 1-否 2-是")
|
||||
private Integer isEnable;
|
||||
|
||||
@ApiModelProperty("任务模式")
|
||||
@Excel(name = "任务模式")
|
||||
private String taskMode;
|
||||
|
||||
@ApiModelProperty("作业模式")
|
||||
@Excel(name = "作业模式")
|
||||
private String workMode;
|
||||
|
||||
}
|
||||
+6
@@ -124,5 +124,11 @@ public class WarehousePO extends BaseVOEntity{
|
||||
private Integer isEnable;
|
||||
@ApiModelProperty("库区集合")
|
||||
private List<StorageSectionPO> storageSectionList;
|
||||
@ApiModelProperty("任务模式")
|
||||
@Excel(name = "任务模式")
|
||||
private String taskMode;
|
||||
|
||||
@ApiModelProperty("作业模式")
|
||||
@Excel(name = "作业模式")
|
||||
private String workMode;
|
||||
}
|
||||
+8
@@ -131,4 +131,12 @@ public class WarehouseDO extends BaseVOEntity{
|
||||
private String orgIds;
|
||||
@ApiModelProperty("组织id 集合")
|
||||
private List<Long> orgIdList;
|
||||
|
||||
@ApiModelProperty("任务模式")
|
||||
@Excel(name = "任务模式")
|
||||
private String taskMode;
|
||||
|
||||
@ApiModelProperty("作业模式")
|
||||
@Excel(name = "作业模式")
|
||||
private String workMode;
|
||||
}
|
||||
+5
-1
@@ -212,7 +212,11 @@ public class StorageLocationDTO extends BaseVOEntity{
|
||||
@Excel(name = "坐标-层 终止")
|
||||
private String coordinateLayerEnd;
|
||||
|
||||
@ApiModelProperty("库位条码")
|
||||
@Excel(name = "库位条码")
|
||||
private String locationBarCode;
|
||||
|
||||
public interface Edit {}
|
||||
|
||||
public interface BatchInsert {}
|
||||
}
|
||||
}
|
||||
+8
@@ -136,4 +136,12 @@ public class WarehouseDTO extends BaseVOEntity{
|
||||
private String orgIds;
|
||||
@ApiModelProperty("组织id 集合")
|
||||
private List<Long> orgIdList;
|
||||
|
||||
@ApiModelProperty("任务模式")
|
||||
@Excel(name = "任务模式")
|
||||
private String taskMode;
|
||||
|
||||
@ApiModelProperty("作业模式")
|
||||
@Excel(name = "作业模式")
|
||||
private String workMode;
|
||||
}
|
||||
+2
-1
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateByName" column="update_by_name" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="locationBarCode" column="LOCATION_BAR_CODE" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.storage_location_classify, a.storage_location_classify_name, a.storage_location_type, a.storage_location_type_name,
|
||||
a.mixing_strategy, a.mixing_strategy_name, a.storage_location_group_id, a.storage_location_group_code, a.storage_location_group_name,
|
||||
a.weight_limit, a.volume_limit, a.location_size, a.location_length, a.location_width, a.location_height,
|
||||
a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark,
|
||||
a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, a.LOCATION_BAR_CODE,
|
||||
a.opening_up, a.nullify, a.status, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag
|
||||
from storage_location a
|
||||
LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1
|
||||
|
||||
+8
-1
@@ -37,11 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="updateByName" column="update_by_name" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="isEnable" column="IS_ENABLE" />
|
||||
<result property="workMode" column="WORK_MODE" />
|
||||
<result property="taskMode" column="TASK_MODE" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
<sql id="selectWarehousePo">
|
||||
select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name, warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name, director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region, usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag, IS_ENABLE from warehouse
|
||||
select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name,
|
||||
warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name,
|
||||
director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region,
|
||||
usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by,
|
||||
update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE
|
||||
from warehouse
|
||||
</sql>
|
||||
|
||||
<sql id="selectWarehousePo1">
|
||||
|
||||
Reference in New Issue
Block a user