lijuncheng 11 months ago
parent
commit
2187b54ca0
  1. 5
      common/record.js
  2. 2
      mycomponents/balance/moveStatus.vue
  3. 130
      pages/inventoryMove/coms/comMoveRecord.vue
  4. 1
      pages/inventoryMove/coms/comMoveRecordCard.vue
  5. 2
      pages/inventoryMove/coms/comMovebalance.vue
  6. 2
      pages/inventoryMove/record/okToHoldRecord.vue
  7. 425
      pages/package/record/mergePackageRecord.vue.b17252
  8. 429
      pages/package/record/mergePackageRecord.vue.y17252
  9. 2
      static/config.json

5
common/record.js

@ -23,6 +23,7 @@ export function createItemInfo(balance, pack) {
export function createDetailInfo(data, pack) { export function createDetailInfo(data, pack) {
data.scaned = true; data.scaned = true;
// data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus; // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus;
data.inventoryStatus = data.inventoryStatus;
let detail = {}; let detail = {};
Object.assign(detail, data) Object.assign(detail, data)
detail.balanceQty = Number(detail.qty) detail.balanceQty = Number(detail.qty)
@ -51,8 +52,8 @@ export function getBusinessType(typeCode, callback) {
businessType: '', businessType: '',
fromlocationTypeList: '', fromlocationTypeList: '',
tolocationTypeList: '', tolocationTypeList: '',
fromInventoryStatuses:'', fromInventoryStatuses: '',
toInventoryStatuses:'', toInventoryStatuses: '',
message: '' message: ''
}; };
getBusinesstypeByCode(typeCode).then(res => { getBusinesstypeByCode(typeCode).then(res => {

2
mycomponents/balance/moveStatus.vue

@ -1,7 +1,7 @@
<template> <template>
<view class="uni-row uni-flex center" style="font-size: 30rpx;"> <view class="uni-row uni-flex center" style="font-size: 30rpx;">
<status :status='fromInventoryStatus' :showDesc="true"></status> <status :status='fromInventoryStatus' :showDesc="true"></status>
<view class="uni-flex uni-row center" v-if='showToInventoryStatus && toInventoryStatus!=""'> <view class="uni-flex uni-row center" v-if='showToInventoryStatus && toInventoryStatus!=fromInventoryStatus'>
<text style="color:#909399 ; "> <text style="color:#909399 ; ">
> >
</text> </text>

130
pages/inventoryMove/coms/comMoveRecord.vue

@ -14,7 +14,6 @@
:allowEditStatus="allowEditStatus"> :allowEditStatus="allowEditStatus">
</com-move-record-card> </com-move-record-card>
</view> </view>
<u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -23,8 +22,8 @@
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
:locationTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation> :locationTypeList="toLocationTypeArray" :isShowEdit="allowEditStatus"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -35,7 +34,7 @@
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
</win-scan-pack-and-location> </win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
</view> </view>
@ -52,6 +51,7 @@
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import { import {
inventoryMoveRecordSubmit, inventoryMoveRecordSubmit,
getBasicLocationByCode,
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
@ -105,15 +105,16 @@
type: String, type: String,
default: "Move" default: "Move"
}, // }, //
toLocationCode: { // toLocationCode: {
type: String, // type: String,
default: "" // default: ""
}, // },
}, },
data() { data() {
return { return {
fromLocationCode: "", fromLocationCode: "",
// toLocationCode: "", fromLocationInfo: {},
toLocationCode: "",
toLocationInfo: {}, toLocationInfo: {},
toLocationTypeArray: [], toLocationTypeArray: [],
toInventoryStatus: "", toInventoryStatus: "",
@ -121,7 +122,6 @@
detailSource: [], // detailSource: [], //
title: "", title: "",
dataContent: {}, dataContent: {},
toWarehouseCode: "",
fromlocationTypeList: [], fromlocationTypeList: [],
tolocationTypeList: [], tolocationTypeList: [],
} }
@ -138,33 +138,58 @@
this.showErrorMessage(res.message) this.showErrorMessage(res.message)
} }
}); });
this.updateTitle(); this.initData();
}, },
onLoad() { onLoad() {
if (this.toLocationCode != '') {
getBasicLocationByCode(this.toLocationCode).then(res => {
if (res.data.total > 0) {
let result = res.data.list[0];
var type = result.type;
var available = result.available;
if (available == "TRUE") {
this.toLocationInfo = res.data.list[0];
} else {
this.showErrorMessage("扫描库位[" + this.code + "]不可用")
}
} else {
this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
}
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error)
})
}
}, },
methods: { methods: {
updateTitle() { initData() {
if (this.businessTypeCode == "Move") { if (this.businessTypeCode == "Move") {
this.title = "库存转移记录"; this.title = "库存转移记录";
this.toInventoryStatus = "OK" this.toInventoryStatus = "OK"
this.toLocationCode = ""
} else if (this.businessTypeCode == "HoldToOk") { } else if (this.businessTypeCode == "HoldToOk") {
this.title = "隔离转合格记录"; this.title = "隔离转合格记录";
this.toInventoryStatus = "OK" this.toInventoryStatus = "OK"
this.toLocationCode = "OK"
} else if (this.businessTypeCode == "HoldToScrap") { } else if (this.businessTypeCode == "HoldToScrap") {
this.title = "隔离转报废记录"; this.title = "隔离转报废记录";
this.toInventoryStatus = "SCRAP" this.toInventoryStatus = "SCRAP"
this.toLocationCode = "SCRAP"
} else if (this.businessTypeCode == "OkToHold") { } else if (this.businessTypeCode == "OkToHold") {
this.title = "合格转隔离记录"; this.title = "合格转隔离记录";
this.toInventoryStatus = "HOLD" this.toInventoryStatus = "HOLD"
this.toLocationCode = "HOLD"
} else if (this.businessTypeCode == "OktoScrap") { } else if (this.businessTypeCode == "OktoScrap") {
this.title = "合格转报废记录"; this.title = "合格转报废记录";
this.toInventoryStatus = "SCRAP" this.toInventoryStatus = "SCRAP"
this.toLocationCode = "HOLD"
} else if (this.businessTypeCode == "ScrapToHold") { } else if (this.businessTypeCode == "ScrapToHold") {
this.title = "报废转隔离记录"; this.title = "报废转隔离记录";
this.toInventoryStatus = "HOLD" this.toInventoryStatus = "HOLD"
this.toLocationCode = "HOLD"
} }
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.title title: this.title
@ -181,24 +206,17 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.scanFromLocationCode.openScanPopup(); this.$refs.scanFromLocationCode.openScanPopup();
}) })
},
getLocation(location) {
this.getfromLocationCode(location)
}, },
getfromLocationCode(location) { getFromLocation(location) {
this.fromLocationCode = location.code; this.fromLocationCode = location.code;
this.fromLocationInfo = location;
this.openScanPopup(); this.openScanPopup();
}, },
getToLocationCode(location, code) { getToLocation(location, code) {
this.toWarehouseCode = location.warehouseCode
this.toLocationCode = code; this.toLocationCode = code;
this.toLocationInfo = location;
}, },
getScanResult(result) { getScanResult(result) {
this.getDataSource(result)
},
getDataSource(result) {
var balance = result.balance; var balance = result.balance;
var pack = result.package; var pack = result.package;
var item = this.detailSource.find(res => { var item = this.detailSource.find(res => {
@ -208,9 +226,10 @@
}) })
if (item == undefined) { if (item == undefined) {
var itemp = createItemInfo(balance, pack); var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); // let newDetail = createDetailInfo(balance, pack);
newDetail.inventoryStatus = balance.inventoryStatus; // newDetail.inventoryStatus = balance.inventoryStatus;
newDetail.toInventoryStatus = this.toInventoryStatus; newDetail.toInventoryStatus = this.toInventoryStatus;
newDetail.toLocationCode = this.toLocationCode;
itemp.subList.push(newDetail); itemp.subList.push(newDetail);
this.detailSource.push(itemp) this.detailSource.push(itemp)
} else { } else {
@ -226,8 +245,9 @@
if (detail == undefined) { if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack); let newDetail = createDetailInfo(balance, pack);
newDetail.inventoryStatus = balance.inventoryStatus; // newDetail.inventoryStatus = balance.inventoryStatus;
newDetail.toInventoryStatus = this.toInventoryStatus newDetail.toInventoryStatus = this.toInventoryStatus;
newDetail.toLocationCode = this.toLocationCode;
item.subList.push(newDetail); item.subList.push(newDetail);
} else { } else {
this.showErrorMessage(balance.packingNumber + "已经在列表中") this.showErrorMessage(balance.packingNumber + "已经在列表中")
@ -236,8 +256,6 @@
calcHandleQty(this.detailSource); calcHandleQty(this.detailSource);
}, },
showErrorMessage(message) { showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => { this.$refs.comMessage.showErrorMessage(message, res => {
if (res) { if (res) {
@ -288,7 +306,7 @@
}, },
commit() { commit() {
if (this.toLocationCode == "") { if (this.toLocationCode == "") {
this.showMessage("请先选择目标库位") this.showErrorMessage("请先选择目标库位")
return; return;
} }
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
@ -336,7 +354,10 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
detail.toLocationCode = this.toLocationCode; if (detail.toLocationCode == '')
{
detail.toLocationCode = this.toLocationCode;
}
var filterResult = itemList.filter(res => { var filterResult = itemList.filter(res => {
if (res.itemCode == item.itemCode && if (res.itemCode == item.itemCode &&
detail.toLocationCode == res.locationCode) { detail.toLocationCode == res.locationCode) {
@ -365,45 +386,42 @@
if (detail.scaned) { if (detail.scaned) {
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; var subItem = {};
detail.itemName = detail.package.itemName; Object.assign(subItem, detail)
detail.itemDesc1 = detail.package.itemDesc1; subItem.itemCode = detail.itemCode;
detail.itemDesc2 = detail.package.itemDesc2; subItem.itemName = detail.package.itemName;
subItem.itemDesc1 = detail.package.itemDesc1;
subItem.itemDesc2 = detail.package.itemDesc2;
detail.fromInventoryStatus = detail.inventoryStatus; subItem.fromInventoryStatus = detail.inventoryStatus;
subItem.toInventoryStatus = detail.toInventoryStatus;
detail.fromPackingNumber = info.packingNumber; subItem.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber; subItem.toPackingNumber = info.packingNumber;
detail.fromContainerNumber = detail.containerNumber; subItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber subItem.toContainerNumber = detail.containerNumber
detail.fromBatch = info.batch; subItem.fromBatch = info.batch;
detail.toBatch = info.batch; subItem.toBatch = info.batch;
detail.fromLocationCode = detail.locationCode; subItem.fromLocationCode = detail.locationCode;
subItem.toLocationCode = detail.toLocationCode;
// if (this.businessType != '') { subItem.package = null;
// detail.toLocationCode = this.toLocationCode; subItem.Records = null;
// detail.toInventoryStatus = this.toInventoryStatus;
// }
subList.push(detail) subList.push(subItem)
} }
}) })
}) })
this.dataContent.subList = subList; this.dataContent.subList = subList;
this.dataContent.creator = creator; this.dataContent.creator = creator;
this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode; this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
this.dataContent.toWarehouseCode = this.toWarehouseCode; this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
this.dataContent.businessType = this.businessTypeCode; this.dataContent.businessType = this.businessTypeCode;
return this.dataContent; return this.dataContent;
}, }
} }
} }
</script> </script>

1
pages/inventoryMove/coms/comMoveRecordCard.vue

@ -171,7 +171,6 @@
}); });
}, },
confirm(qty) { confirm(qty) {
this.editItem.qty = qty;
this.editItem.handleQty = qty; this.editItem.handleQty = qty;
this.$emit('updateData') this.$emit('updateData')
} }

2
pages/inventoryMove/coms/comMovebalance.vue

@ -9,7 +9,7 @@
<location v-if="isShowLocation" :locationCode="dataContent.locationCode"></location> <location v-if="isShowLocation" :locationCode="dataContent.locationCode"></location>
</view> </view>
<view> <view>
<qty :isShowStatus="dataContent.inventoryStatus==dataContent.toInventoryStatus" <qty :isShowStatus="false"
v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent" v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
:isShowStdPack="isShowStdPack"></qty> :isShowStdPack="isShowStdPack"></qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty" <compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"

2
pages/inventoryMove/record/okToHoldRecord.vue

@ -1,6 +1,6 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<comMoveRecord businessTypeCode='OkToHold' toLocationCode="HOLD" > </comMoveRecord> <comMoveRecord businessTypeCode='OkToHold' > </comMoveRecord>
</view> </view>
</template> </template>

425
pages/package/record/mergePackageRecord.vue.b17252

@ -1,425 +0,0 @@
<template>
<view class="page-wraper">
<view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view>
<view class="page-wraper" v-if="detailSource.length>0">
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card>
</view>
<u-line />
</view>
</scroll-view>
</view>
<packageTarget title="目标箱码" :isShowEdit="true" :packingNumber="toPackingNumber"
@getScanResult='getToPackingNumber'></packageTarget>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
</view>
</view>
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location>
<com-message ref="comMessage"></com-message>
</view>
</template>
<script>
import {
goHome,
getInventoryStatusDesc,
getDirectoryItemArray
} from '@/common/basic.js';
import {
getBusinessType,
createItemInfo,
createDetailInfo,
calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
import packageTarget from '@/mycomponents/package/packageTarget.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: {
winScanButton,
winScanPack,
requiredLocation,
comBlankView,
winScanLocation,
comMessage,
winScanPackAndLocation,
recommendBalance,
packageTarget,
recordComDetailCard
},
data() {
return {
id: '',
receiptJob: {},
received: false,
isShowPackingCode: true,
scanCount: 0,
jobContent: {}, //任务内容
subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
toLocationInfo: {},
businessTypeInfo: {},
fromLocationInfo: {},
fromLocationCode: "",
toLocationInfo: {},
toLocationCode: "",
isShowLocation: false,
fromlocationTypeList: [],
tolocationTypeList: [],
allowModifyLocation: false,
inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态
businessType: {},
toPackingNumber: ""
};
},
onLoad(option) {
var typeCode = "MergePackage"
getBusinessType(typeCode, res => {
if (res.success) {
this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup();
} else {
this.$refs.comMessage.showBreakMessage(res.message);
}
});
},
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}
},
//拦截返回按钮事件
onBackPress(e) {},
onPullDownRefresh() {},
mounted() {},
methods: {
scanPopupPack() {
this.$refs.scanPopupPack.openScanPopup();
},
getScanResult(result) {
let balance = result.balance;
let label = result.label;
let pack = result.package;
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
}
})
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
var detail = item.subList.find(r => {
if (r.packingNumber == balance.packingNumber &&
r.batch == balance.batch &&
r.locationCode == balance.locationCode &&
r.inventoryStatus == balance.inventoryStatus) {
return r;
}
})
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
item.subList.push(newDetail);
} else {
if (detail.scaned == true) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
}
}
}
this.calcHandleQty();
},
calcHandleQty() {
calcHandleQty(this.detailSource)
this.$forceUpdate();
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
}
});
},
updateData() {
this.calcHandleQty();
},
removeItem(index, item) {
this.detailSource.splice(index, 1)
},
removePack() {
for (var i = 0; i < this.detailSource.length; i++) {
var item = this.detailSource[i];
if (item.subList.length == 0) {
this.detailSource.splice(i, 1)
}
}
this.updateData();
},
openScanPopup() {
if (this.fromLocationCode == "") {
this.showFromLocationPopup();
return
}
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
},
showFromLocationPopup() {
this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup();
})
},
closeScanPopup() {
this.$refs.scanPopup.closeScanPopup();
},
scanPopupGetFocus() {
this.$refs.scanPopup.getfocus();
},
scanLocationCode(location, code) {
this.toLocationCode = code
this.toLocationCode = location;
},
commit() {
if (this.toLocationCode == "") {
this.showMessage("请先选择目标库位")
return;
}
//允许部分提交
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
// (this.id, params).then(res => {
// uni.hideLoading()
// if (res.data) {
// var hint = res.data.Number;
// this.showCommitSuccessMessage("提交成功" + hint, )
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
},
setParams() {
var params = {
requestNumber: this.jobContent.requestNumber,
jobNumber: "",
asnNumber: this.jobContent.asnNumber,
ppNumber: this.jobContent.ppNumber,
supplierCode: this.jobContent.supplierCode,
ReceiptDock: this.jobContent.ReceiptDock,
carrierCode: this.jobContent.carrierCode,
transferMode: this.jobContent.transferMode,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
fromWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode,
OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
executeTime: "2023-08-4 16:30:11", //执行时间
activeDate: "2023-08-4 16:30:11", //生效时间
available: "1", //是否可用 0不可用,1可用
requestTime: this.jobContent.requestTime,
dueTime: "2023-08-4 16:30:11", //截止时间
departmentCode: this.jobContent.departmentCode,
UserPositionCode: "", //岗位
interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
Number: this.jobContent.Number,
businessType: this.jobContent.businessType,
remark: this.jobContent.remark,
creationTime: this.jobContent.creationTime,
Creatorld: this.jobContent.Creatorld,
creatorName: this.jobContent.creatorName,
extraProperties: this.jobContent.extraProperties,
Siteld: this.jobContent.Siteld,
Code: "",
subList: [
],
}
this.detailSource.forEach(res => {
res.subList.forEach(res1 => {
if (res1.scaned) {
res1.record.FromLocationGroupCode = "";
res1.record.FromAreaCode = "";
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.VisualInspectResult = ""; //目检结果
res1.record.VisualInspectPhotos = ""; //目检照片
res1.record.FailedReason = ""; //不合格原因
res1.record.MassDefect = ""; //质量缺陷
res1.record.SinglePrice = ""; //单价
res1.record.Amount = ""; //金额
res1.record.Code = "";
res1.record.JobDetailID = res1.record.id;
res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
params.subList.push(res1.record)
}
})
})
return params;
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {}
});
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
}
});
},
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
},
afterCloseMessage() {
this.scanPopupGetFocus();
},
closeScanMessage() {
this.scanPopupGetFocus();
},
getLocation(location, code) {
this.getFromLocationCode(location, code)
},
getFromLocationCode(location, code) {
this.fromLocationInfo = location;
this.fromLocationCode = code;
this.openScanPopup();
},
getToLocationCode(location, code) {
if (this.fromLocationCode == code) {
uni.showToast({
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
duration: 2000
})
return
}
this.ToLocationCodeInfo = location;
this.toLocationCode = code;
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = '';
})
},
updateData() {
this.calcHandleQty();
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
if (item.qty == 0) {
this.detailSource.splice(i, 1)
}
}
},
getToPackingNumber(result) {
this.toPackingNumber = result.label.packingNumber;
}
}
}
</script>
<style scoped lang="scss">
page {
width: 100%;
height: 100%;
background-color: #fff;
}
.page-wraper {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
.page-main {
flex: 1;
position: relative;
}
.page-main-scroll {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
.page-main-list {
/* height: 80rpx;
line-height: 80rpx; */
text-align: center;
background: #e0e0e0;
}
</style>

429
pages/package/record/mergePackageRecord.vue.y17252

@ -1,429 +0,0 @@
<template>
<view class="page-wraper">
<view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view>
<view class="page-wraper" v-if="detailSource.length>0">
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card>
</view>
<u-line />
</view>
</scroll-view>
</view>
<packageTarget title="目标箱码" :isShowEdit="true" :packingNumber="toPackingNumber"
@getScanResult='getToPackingNumber'></packageTarget>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
</view>
</view>
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location>
<com-message ref="comMessage"></com-message>
</view>
</template>
<script>
import {
goHome,
getInventoryStatusDesc,
getDirectoryItemArray
} from '@/common/basic.js';
import {
getBusinessType,
createItemInfo,
createDetailInfo,
calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
import packageTarget from '@/mycomponents/package/packageTarget.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: {
winScanButton,
winScanPack,
requiredLocation,
comBlankView,
winScanLocation,
comMessage,
winScanPackAndLocation,
recommendBalance,
packageTarget,
recordComDetailCard
},
data() {
return {
id: '',
receiptJob: {},
received: false,
isShowPackingCode: true,
scanCount: 0,
jobContent: {}, //任务内容
subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源
scrollTop: 0,
old: {
scrollTop: 0
},
locationTypeList: [],
toLocationInfo: {},
businessTypeInfo: {},
fromLocationInfo: {},
fromLocationCode: "",
toLocationInfo: {},
toLocationCode: "",
isShowLocation: false,
fromlocationTypeList: [],
tolocationTypeList: [],
allowModifyLocation: false,
inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态
businessType: {},
toPackingNumber: ""
};
},
onLoad(option) {
var typeCode = "MergePackage"
getBusinessType(typeCode, res => {
if (res.success) {
this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup();
} else {
this.$refs.comMessage.showBreakMessage(res.message);
}
});
},
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}
},
//拦截返回按钮事件
onBackPress(e) {},
onPullDownRefresh() {},
mounted() {},
methods: {
scanPopupPack() {
this.$refs.scanPopupPack.openScanPopup();
},
getScanResult(result) {
let balance = result.balance;
let label = result.label;
let pack = result.package;
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
}
})
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
var detail = item.subList.find(r => {
if (r.packingNumber == balance.packingNumber &&
r.batch == balance.batch &&
r.locationCode == balance.locationCode &&
r.inventoryStatus == balance.inventoryStatus) {
return r;
}
})
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
item.subList.push(newDetail);
} else {
if (detail.scaned == true) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
}
}
}
this.calcHandleQty();
},
calcHandleQty() {
calcHandleQty(this.detailSource)
this.$forceUpdate();
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
}
});
},
updateData() {
this.calcHandleQty();
},
removeItem(index, item) {
this.detailSource.splice(index, 1)
},
removePack() {
for (var i = 0; i < this.detailSource.length; i++) {
var item = this.detailSource[i];
if (item.subList.length == 0) {
this.detailSource.splice(i, 1)
}
}
this.updateData();
},
openScanPopup() {
if (this.fromLocationCode == "") {
this.showFromLocationPopup();
return
}
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
},
showFromLocationPopup() {
this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup();
})
},
closeScanPopup() {
this.$refs.scanPopup.closeScanPopup();
},
scanPopupGetFocus() {
this.$refs.scanPopup.getfocus();
},
scanLocationCode(location, code) {
this.toLocationCode = code
this.toLocationCode = location;
},
commit() {
if (this.toLocationCode == "") {
this.showMessage("请先选择目标库位")
return;
}
//允许部分提交
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
// (this.id, params).then(res => {
// uni.hideLoading()
// if (res.data) {
// var hint = res.data.Number;
// this.showCommitSuccessMessage("提交成功" + hint, )
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
},
setParams() {
var params = {
requestNumber: this.jobContent.requestNumber,
jobNumber: "",
asnNumber: this.jobContent.asnNumber,
ppNumber: this.jobContent.ppNumber,
supplierCode: this.jobContent.supplierCode,
ReceiptDock: this.jobContent.ReceiptDock,
carrierCode: this.jobContent.carrierCode,
TransferMode: this.jobContent.TransferMode,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
fromWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode,
OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
executeTime: "2023-08-4 16:30:11", //执行时间
activeDate: "2023-08-4 16:30:11", //生效时间
available: "1", //是否可用 0不可用,1可用
requestTime: this.jobContent.requestTime,
dueTime: "2023-08-4 16:30:11", //截止时间
departmentCode: this.jobContent.departmentCode,
UserPositionCode: "", //岗位
interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
Number: this.jobContent.Number,
businessType: this.jobContent.businessType,
remark: this.jobContent.remark,
creationTime: this.jobContent.creationTime,
Creatorld: this.jobContent.Creatorld,
creatorName: this.jobContent.creatorName,
extraProperties: this.jobContent.extraProperties,
Siteld: this.jobContent.Siteld,
Code: "",
subList: [
],
}
this.detailSource.forEach(res => {
res.subList.forEach(res1 => {
if (res1.scaned) {
res1.record.FromLocationGroupCode = "";
res1.record.FromAreaCode = "";
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.VisualInspectResult = ""; //目检结果
res1.record.VisualInspectPhotos = ""; //目检照片
res1.record.FailedReason = ""; //不合格原因
res1.record.MassDefect = ""; //质量缺陷
res1.record.SinglePrice = ""; //单价
res1.record.Amount = ""; //金额
res1.record.Code = "";
res1.record.JobDetailID = res1.record.id;
res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
params.subList.push(res1.record)
}
})
})
return params;
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {}
});
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
}
});
},
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
},
afterCloseMessage() {
this.scanPopupGetFocus();
},
closeScanMessage() {
this.scanPopupGetFocus();
},
getLocation(location, code) {
this.getFromLocationCode(location, code)
},
getFromLocationCode(location, code) {
this.fromLocationInfo = location;
this.fromLocationCode = code;
this.openScanPopup();
},
getToLocationCode(location, code) {
if (this.fromLocationCode == code) {
uni.showToast({
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
duration: 2000
})
return
}
this.ToLocationCodeInfo = location;
this.toLocationCode = code;
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = '';
})
},
updateData() {
this.calcHandleQty();
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
if (item.qty == 0) {
this.detailSource.splice(i, 1)
}
}
},
getToPackingNumber(result) {
this.toPackingNumber = result.label.packingNumber;
}
}
}
</script>
<style scoped lang="scss">
page {
width: 100%;
height: 100%;
background-color: #fff;
}
.page-wraper {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
.page-main {
flex: 1;
position: relative;
}
.page-main-scroll {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
.page-main-list {
/* height: 80rpx;
line-height: 80rpx; */
text-align: center;
background: #e0e0e0;
}
</style>

2
static/config.json

@ -18,7 +18,7 @@
"request_url": { "request_url": {
"name": "request_url", "name": "request_url",
"value": "http://192.168.0.230:12080/admin-api", "value": "http://192.168.0.176:12080/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api",
"chefang": "http://192.168.0.176:12080/admin-api", "chefang": "http://192.168.0.176:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api",

Loading…
Cancel
Save