diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java index cac3833..ea52385 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java @@ -110,4 +110,9 @@ public class PdmBomCallMaterial implements Serializable { */ private String confirm_time; + /** + * 出库点位 + */ + private String point_code; + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml index 91d14be..dedacda 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml @@ -94,11 +94,13 @@ mb.material_name, mb.material_spec, mst.bill_code, + bom.point_code, late.storagevehicle_code FROM st_ivt_iostorinvdtl dtl LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id + LEFT JOIN pdm_bom_callmaterial bom ON bom.bom_code = dtl.source_bill_code LEFT JOIN md_pb_groupplate late ON mb.material_id = late.material_id AND dtl.pcsn = late.pcsn AND late.status = '1' AND dtl.plan_qty = late.qty where diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java index b76f403..421aaa4 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java @@ -34,4 +34,9 @@ public class IOStorInvDtlDto extends IOStorInvDtl { * 载具编号 */ private String storagevehicle_code; + + /** + * 出库点位 + */ + private String point_code; } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue index 7a5083c..1a4617c 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue @@ -217,6 +217,25 @@ + + + + + + + +
@@ -249,6 +268,7 @@ + @@ -287,6 +307,7 @@ import pagination from '@crud/Pagination' import rrOperation from '@crud/RR.operation' import crudGroup from '@/views/wms/basedata/group/group' import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo' +import crudPoint from '@/views/wms/sch/point/schBasePoint' const defaultForm = { bom_code: null, @@ -335,6 +356,7 @@ export default { permission: {}, materList: [], deviceList: [], + pointList: [], rules: { material_code: [ { required: true, message: '物料编码不能为空', trigger: 'blur' } @@ -345,6 +367,9 @@ export default { bom_type: [ { required: true, message: '工单类型不能为空', trigger: 'blur' } ], + point_code: [ + { required: true, message: '出库点位不能为空', trigger: 'blur' } + ], call_qty: [ { required: true, message: '叫料重量不能为空', trigger: 'blur' } ] @@ -358,6 +383,10 @@ export default { crudDeviceinfo.getDevice({}).then(res => { this.deviceList = res }) + const area_type = 'INOUR01' + crudPoint.getPointList({ 'region_code': area_type }).then(res => { + this.pointList = res + }) this.initQuery() }, methods: { diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue index ff0689b..8db7b8b 100644 --- a/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue +++ b/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue @@ -191,7 +191,7 @@ import crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorat const defaultForm = { bill_code: '', - stor_id: '', + stor_id: '1582991156504039424', stor_code: '', stor_name: '', bill_status: '10', diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue b/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue index 68d1682..876927a 100644 --- a/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue +++ b/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue @@ -62,6 +62,7 @@ + diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index 0f57189..5072ac1 100644 --- a/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -163,6 +163,7 @@ { return [] } @@ -318,6 +323,11 @@ export default { this.tableDtl = newValue } }, + pointCode: { + handler(newValue, oldValue) { + this.form2.point_code = newValue + } + }, rowmst: { handler(newValue, oldValue) { this.mstrow = newValue diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/index.vue b/wms/nladmin-ui/src/views/wms/st/outbill/index.vue index 608b988..1b72e95 100644 --- a/wms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/wms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -203,7 +203,7 @@
- + @@ -262,6 +262,7 @@ export default { checkrows: [], storlist: [], billtypelist: [], + pointCode: null, storId: null } }, @@ -383,6 +384,7 @@ export default { checkoutbill.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => { this.openParam = res this.storId = this.currentRow.stor_id + this.pointCode = res[0].point_code this.divShow = true this.mstrow = this.currentRow })