diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml index f905ada..f0d8b06 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -13,7 +13,7 @@ AND wo.workorder_code LIKE CONCAT('%', #{query.workorder_code}, '%') - AND wo.point_code LIKE CONCAT('%', #{query.point_code}, '%') + AND LOWER(wo.point_code) LIKE LOWER(CONCAT('%', #{query.point_code}, '%')) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java index c74a8fa..2dfc2ad 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java @@ -135,5 +135,7 @@ public class SchBaseVehiclematerialgroup implements Serializable { private String material_code; @TableField(exist = false) private String material_spec; + @TableField(exist = false) + private String region_name; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml index 0ceeb66..fb6fb45 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml @@ -7,8 +7,10 @@ , ma.material_name , ma.material_code , ma.material_spec + , po.region_name FROM sch_base_vehiclematerialgroup vg LEFT JOIN md_base_material ma ON vg.material_id = ma.material_id + LEFT JOIN sch_base_point po ON po.point_code = vg.point_code WHERE 1 = 1 AND vg.vehicle_code = #{query.vehicle_code} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java index 6d3c787..40a4739 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java @@ -50,7 +50,7 @@ public class SchBasePoint implements Serializable { private String can_vehicle_type; @ApiModelProperty(value = "载具允许最大数量") - private BigDecimal vehicle_max_qty; + private Integer vehicle_max_qty; @ApiModelProperty(value = "载具类型") private String vehicle_type; @@ -59,31 +59,31 @@ public class SchBasePoint implements Serializable { private String vehicle_code; @ApiModelProperty(value = "载具数量") - private BigDecimal vehicle_qty; + private Integer vehicle_qty; @ApiModelProperty(value = "块") - private BigDecimal block_num; + private Integer block_num; @ApiModelProperty(value = "排") - private BigDecimal row_num; + private Integer row_num; @ApiModelProperty(value = "列") - private BigDecimal col_num; + private Integer col_num; @ApiModelProperty(value = "层") - private BigDecimal layer_num; + private Integer layer_num; @ApiModelProperty(value = "入库顺序") - private BigDecimal in_order_seq; + private Integer in_order_seq; @ApiModelProperty(value = "出库顺序") - private BigDecimal out_order_seq; + private Integer out_order_seq; @ApiModelProperty(value = "入空载具顺序") - private BigDecimal in_empty_seq; + private Integer in_empty_seq; @ApiModelProperty(value = "出空载具顺序") - private BigDecimal out_empty_seq; + private Integer out_empty_seq; @ApiModelProperty(value = "父点位编码") private String parent_point_code; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java index 671eda8..736c3ea 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java @@ -37,7 +37,7 @@ public class SchBasePointDto implements Serializable { private String can_vehicle_type; /** 载具允许最大数量 */ - private BigDecimal vehicle_max_qty; + private Integer vehicle_max_qty; /** 载具类型 */ private String vehicle_type; @@ -46,31 +46,31 @@ public class SchBasePointDto implements Serializable { private String vehicle_code; /** 载具数量 */ - private BigDecimal vehicle_qty; + private Integer vehicle_qty; /** 块 */ - private BigDecimal block_num; + private Integer block_num; /** 排 */ - private BigDecimal row_num; + private Integer row_num; /** 列 */ - private BigDecimal col_num; + private Integer col_num; /** 层 */ - private BigDecimal layer_num; + private Integer layer_num; /** 入库顺序 */ - private BigDecimal in_order_seq; + private Integer in_order_seq; /** 出库顺序 */ - private BigDecimal out_order_seq; + private Integer out_order_seq; /** 入空载具顺序 */ - private BigDecimal in_empty_seq; + private Integer in_empty_seq; /** 出空载具顺序 */ - private BigDecimal out_empty_seq; + private Integer out_empty_seq; /** 父点位编码 */ private String parent_point_code; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index e9aa837..2009b9c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -129,7 +129,7 @@ public class SchBasePointServiceImpl extends ServiceImpl + + + + - + + + {{ item.point_name }} + {{ item.point_code }} + + + - + @@ -66,14 +91,6 @@ - - - - - + - + @@ -185,7 +210,11 @@ - + + + @@ -223,6 +252,7 @@ import pagination from '@crud/Pagination' import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue' import WorkOrderDialog from '@/views/wms/sch/group/WorkOrderDialog.vue' +import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint' const defaultForm = { vehicle_code: null, @@ -278,6 +308,7 @@ export default { }, created() { this.getWorkShopList() + this.getPointList() }, data() { return { @@ -286,6 +317,7 @@ export default { rules: { }, workShopList: [], + pointList: [], choose: '物料', materialDialog: false, workOrderDialog: false @@ -308,6 +340,11 @@ export default { this.workOrderDialog = true } }, + getPointList() { // 获取点位列表 + crudSchBasePoint.getPointList().then(res => { + this.pointList = res + }) + }, tableChanged(row) { this.form.material_name = row.material_name this.form.material_id = row.material_id @@ -322,6 +359,10 @@ export default { this.form.material_id = null this.form.material_spec = null this.form.material_code = null + }, + setPointName(data) { + var point = this.pointList.find(item => item.point_code === data) + this.form.point_name = point.point_name } } } diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue index 0b12167..e8f4b26 100644 --- a/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/nladmin-ui/src/views/wms/sch/point/index.vue @@ -218,7 +218,7 @@ - + @@ -262,7 +262,11 @@ - + + + @@ -324,7 +328,7 @@ const defaultForm = { vehicle_max_qty: null, vehicle_type: null, vehicle_code: null, - vehicle_qty: null, + vehicle_qty: 0, block_num: null, row_num: null, col_num: null,