diff --git a/pages.json b/pages.json
index b08a4b0..23d1d86 100644
--- a/pages.json
+++ b/pages.json
@@ -499,6 +499,13 @@
"navigationStyle": "custom"
}
}
+ ,{
+ "path" : "pages/zw/wl-list",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/zw/ll-instore.vue b/pages/zw/ll-instore.vue
index 8548e77..cda9109 100644
--- a/pages/zw/ll-instore.vue
+++ b/pages/zw/ll-instore.vue
@@ -6,34 +6,7 @@
- 日期
-
-
-
-
-
-
-
-
- 单据
-
-
-
-
-
-
-
- 点位码
-
-
-
-
-
-
-
- 托盘码
+ 托盘码/点位码
- | 选择 |
- 托盘码 |
+ 删除选择 |
点位码 |
+ 托盘码 |
+ 物料编码 |
+ 重量 |
+ 单据 |
-
+
|
- {{e.vehicle_code}} |
{{e.site_code}} |
+ {{e.vehicle_code}} |
+ {{e.material_code}} |
+ {{e.qty}} |
+ {{e.bill_code}} |
@@ -116,7 +95,7 @@
-
+
@@ -134,15 +113,19 @@
return {
singleDate: '',
title: '',
- options: [],
- index: '',
- options2: [{text:'当天', value: '1'}, {text:'前一天', value: '2'}],
- index2: '',
id: '',
code: '',
val1: '',
val2: '',
- dataList: [],
+ pkId: '',
+ pkObj: {},
+ // dataList: [],
+ dataList: [
+ {site_code: 's01', vehicle_code: 'v01', checked: false},
+ {site_code: 's02', vehicle_code: 'v02', checked: false},
+ {site_code: 's03', vehicle_code: 'v03', checked: false},
+ {site_code: 's04', vehicle_code: 'v04', checked: false}
+ ],
checkedArr: [],
pkId: '',
currentData: {},
@@ -155,13 +138,8 @@
this.id = options.id
},
created () {
- this._getFormDataList()
},
methods: {
- onSingleDateChange(e) {
- this.singleDate = e
- this._getFormDataList()
- },
handleChange (e) {
if (e) {
this._inCheck()
@@ -171,58 +149,45 @@
if (!this.val1 || !this.val2) {
return
}
- this.dataList.push({vehicle_code: this.val1, site_code: this.val2})
this.dataList.map(el => {
this.$set(el, 'checked', false)
})
},
- async _getPlate () {
- try {
- let res = await getPlate(this.val1)
- if (res.code === '200') {
- this.flag = true
- this.currentData = res.data
- setTimeout(() => {
- this.flag = false
- },1000)
- this.handleAdd()
- } else {
- uni.showToast({
- title: res.message,
- icon: 'none'
- })
- }
- } catch (e) {
- }
- },
+ // async _getPlate () {
+ // try {
+ // let res = await getPlate(this.val1)
+ // if (res.code === '200') {
+ // this.flag = true
+ // this.currentData = res.data
+ // setTimeout(() => {
+ // this.flag = false
+ // },1000)
+ // this.handleAdd()
+ // } else {
+ // uni.showToast({
+ // title: res.message,
+ // icon: 'none'
+ // })
+ // }
+ // } catch (e) {
+ // }
+ // },
toDel () {
this.dataList = this.dataList.filter(el => el.checked === false)
},
- async _getFormDataList () {
- try {
- let res = await getFormDataList(this.singleDate)
- if (res) {
- this.options = res.data
- } else {
- this.options = []
- }
- } catch (e) {
- this.options = []
- }
+ toChek (e) {
+ this.pkId = this.pkId === e.site_code ? '' : e.site_code
+ this.pkObj = this.pkId === e.site_code ? e : {}
},
- selectChange (e) {
- this.index = e
- },
- selectChange2 (e) {
- this.index2 = e
- },
- // toChek (e) {
- // this.pkId = this.pkId === e.vid ? '' : e.vid
- // this.pkObj = this.pkId === e.vid ? e : {}
- // },
toCheck (e) {
e.checked = !e.checked
this.checkedArr = this.dataList.filter(el => el.checked === true)
+ if (this.checkedArr.length > 0) {
+ this.dataList.map(el => {
+ this.$set(el, 'checked', false)
+ })
+ e.checked = !e.checked
+ }
},
clearUp () {
this.dataList = []
@@ -230,8 +195,9 @@
},
async _inCheck () {
try {
- let res = await inCheck(this.val2, this.val1)
+ let res = await inCheck(this.val1)
if (res.code === '200') {
+ this.dataList = res.data
this.handleAdd()
} else {
uni.showToast({
@@ -244,12 +210,12 @@
},
async _zwConfirmIn () {
this.disabled = true
- if (!this.index || !this.dataList.length) {
+ if (!this.dataList.length) {
this.disabled = false
return
}
try {
- let res = await zwConfirmIn(this.index, this.dataList)
+ let res = await zwConfirmIn(this.dataList)
if (res.code === '200') {
uni.showToast({
title: res.message,
diff --git a/pages/zw/manual-callmater.vue b/pages/zw/manual-callmater.vue
index d22fd32..b65a012 100644
--- a/pages/zw/manual-callmater.vue
+++ b/pages/zw/manual-callmater.vue
@@ -25,15 +25,15 @@
料桶号
-
+
- 物料信息
+ 物料编码
-
+
@@ -46,20 +46,31 @@
- 物料规格
+ 库位
-
+
- 物料编码
+ 数量(kg)
-
+
+
供应商编码
@@ -88,7 +99,7 @@
-
+
@@ -96,7 +107,7 @@
\ No newline at end of file
diff --git a/utils/getData4.js b/utils/getData4.js
index bd53872..7f0ed90 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -213,9 +213,9 @@ export const getAllIntoRegionMembers = (rcode) => request({
// 来料入库
// 来料入库接口
-export const zwConfirmIn = (fdcode, plist) => request({
+export const zwConfirmIn = (plist) => request({
url:'api/pda/iosIn/zwConfirmIn',
- data: {form_data_code: fdcode, param_list: plist}
+ data: {param_list: plist}
})
// 获取单据下拉清单
export const getFormDataList = (date) => request({
@@ -228,9 +228,9 @@ export const getPlate = (vcode) => request({
data: {vehicle_code: vcode}
})
// PDA来料入库校验点位和托盘码
-export const inCheck = (scode, vcode) => request({
+export const inCheck = (svcode) => request({
url:'api/pda/iosIn/inCheck',
- data: {site_code: scode, vehicle_code: vcode}
+ data: {site_vehicle_code: svcode}
})
// 空载具出入库
@@ -276,11 +276,23 @@ export const getPdaVehicleCodeBySectCode = (scode) => request({
url:'api/pda/iosOut/getPdaVehicleCodeBySectCode',
data: {sect_code: scode}
})
-// 根据料桶号获得物料、供应商详情
+// 根据料桶号获得物料、供应商详情（退料用）
export const getMaterialSuppByVehicleCode = (vcode) => request({
url:'api/pda/iosOut/getMaterialSuppByVehicleCode',
data: {vehicle_code: vcode}
})
+// 手工叫料获取库区
+export const getPdaCallMaterialSect = (pcode) => request({
+ url:'api/pda/iosIn/getPdaCallMaterialSect',
+ data: {point_code: pcode}
+})
+// 根据库区、物料信息获取库存信息
+export const getStructivtByMaterialAndSectCode = (scode, mcode) => request({
+ url:'api/pda/iosOut/getStructivtByMaterialAndSectCode',
+ data: {sect_code: scode, material_code: mcode}
+})
+
+
// 点位属性设置
export const updatePointType = (code, type) => request({
url:'api/schBasePoint/updatePointType',