diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index e23ba0529..62e3beb62 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -52,7 +52,7 @@
region.region_name
FROM
ST_IVT_StructIvt ivt
- LEFT JOIN sch_base_point point ON ivt.struct_id = point.point_id
+ LEFT JOIN sch_base_point point ON ivt.struct_id = point.source_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java
index ecfb086ec..b9a26b8fa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java
@@ -2,17 +2,23 @@ package org.nl.wms.pda.mps.eum;
public enum RegionTypeEnum {
A_SB("01","A生箔区","1578627451293143040"),
- B_SB("02","B生箔区",""),
- C_SB("03","C生箔区",""),
- D_SB("04","D生箔区",""),
+ B_SB("02","B生箔区","1578635789271699456"),
+ C_SB("03","C生箔区","1578635917692899328"),
+ D_SB("04","D生箔区","1578636178561830912"),
A_FQ("05","A分切区","1578628922277498880"),
- B_FQ("06","B分切区",""),
- C_FQ("07","C分切区",""),
- D_FQ("08","D分切区",""),
+ B_FQ("06","B分切区","1587360208328462336"),
+ C_FQ("07","C分切区","1587360496145797120"),
+ D_FQ("08","D分切区","1587360569458036736"),
A_HKZC("09","A烘烤暂存区","1578657813205487616"),
- B_HKZC("10","B烘烤暂存区",""),
- C_HKZC("11","C烘烤暂存区",""),
- D_HKZC("12","D烘烤暂存区","");
+ B_HKZC("10","B烘烤暂存区","1587360656355627008"),
+ C_HKZC("11","C烘烤暂存区","1587360700223852544"),
+ D_HKZC("12","D烘烤暂存区","1587360741864902656"),
+ ZC01("13","主存区","1582991348217286656"),
+ KTP01("14","空托盘区","1582991511971303424"),
+ ZZ01("15","中转区","1582995342054526976"),
+ LKRK("16","密集库入库输送线","1585164789083148288"),
+ LKCK("17","密集库出库输送线","1585167595403874304"),
+ XN01("18","虚拟区","1586913215886004224");
private String name;
private String code;
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index 895d698b7..1111f4651 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -57,7 +57,7 @@
-
+
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
index 08e2ff53e..4369e8d0f 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -360,6 +360,8 @@ export default {
return
}
this.materShow = true
+ this.nowindex = index
+ this.nowrow = row
/* checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
this.materType = res.materType
this.nowindex = index
@@ -379,6 +381,7 @@ export default {
tableChanged(rows) {
const tablemap = new Map()
rows.forEach((item) => {
+ debugger
if (this.form.tableData.length !== 0) {
this.flagnow = false
for (let i = 0; i < this.form.tableData.length; i++) {
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
index 1a12c2f3b..ff8097203 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
@@ -1,6 +1,6 @@
@@ -230,6 +229,7 @@ import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import StructIvt from '@/views/wms/st/outbill/StructIvt'
import PointDialog from '@/views/wms/pub/PointDialog'
import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import crudPoint from '@/views/wms/sch/point/point'
export default {
name: 'DivDialog',
@@ -277,10 +277,7 @@ export default {
},
sects: [],
invtypelist: [],
- pointList: [
- { 'label': '出入库站点1', 'value': 'IVN001' },
- { 'label': '出入库站点2', 'value': 'IVN002' }
- ],
+ pointList: [],
rules: {
}
}
@@ -310,6 +307,11 @@ export default {
checkoutbill.getInvTypes().then(res => {
this.invtypelist = res
})
+ const area_type = '1585167595403874304'
+
+ crudPoint.getPoint({ 'area_type': area_type }).then(res => {
+ this.pointlist = res
+ })
},
methods: {
close() {