Browse Source

器具绑定和器具解绑

wms3.0_pda
lijuncheng 11 months ago
parent
commit
b5e8ef78f7
  1. 16
      api/request2.js
  2. 4
      pages.json
  3. 0
      pages/container/coms/comPalletRecord.vue
  4. 4
      pages/container/record/containerBindRecord.vue
  5. 6
      pages/container/record/containerUnBindRecord.vue
  6. 266
      pages/package/record/overPackageRecord.vue

16
api/request2.js

@ -2984,25 +2984,25 @@ export function repleinshRecordSubmit(params) {
}
/**
* 托盘绑定 提交
* 器具绑定 提交
* @param {*} params
*/
export function bindPalledtRecordSubmit(params) {
export function containerBindRecordSubmit(params) {
return request({
url: baseApi + "/magic-api/pda/job/putaway/jobSubmit",
method: "put",
url: baseApi + "/wms/container-main/containerBind",
method: "post",
data: params,
});
}
/**
* 托盘解绑 提交
* 器具解绑 提交
* @param {*} params
*/
export function unbindPalledtRecordSubmit(params) {
export function containerUnBindRecordSubmit(params) {
return request({
url: baseApi + "/magic-api/pda/job/putaway/jobSubmit",
method: "put",
url: baseApi + "/wms/container-main/containerUnBind",
method: "post",
data: params,
});
}

4
pages.json

@ -1668,14 +1668,14 @@
},
{
"path": "pages/pallet/record/bindPalletRecord",
"path": "pages/container/record/containerBindRecord",
"style": {
"navigationBarTitleText": "器具绑定",
"enablePullDownRefresh": false
}
},
{
"path": "pages/pallet/record/unBindPalletRecord",
"path": "pages/container/record/containerUnBindRecord",
"style": {
"navigationBarTitleText": "器具解绑",
"enablePullDownRefresh": false

0
pages/pallet/coms/comPalletRecord.vue → pages/container/coms/comPalletRecord.vue

4
pages/pallet/record/bindPalletRecord.vue → pages/container/record/containerBindRecord.vue

@ -48,6 +48,10 @@
</template>
<script>
import {
containerBindRecordSubmit
} from '@/api/request2.js';
import {
goHome,
} from '@/common/basic.js';

6
pages/pallet/record/unBindPalletRecord.vue → pages/container/record/containerUnBindRecord.vue

@ -44,8 +44,8 @@
<script>
import {
getContainerDetailByNumber
} from '@/api/request.js';
containerUnBindRecordSubmit
} from '@/api/request2.js';
import {
goHome
} from '@/common/basic.js';
@ -68,7 +68,7 @@
import targetContainer from "@/mycomponents/container/targetContainer.vue"
import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import comPalletRecord from '@/pages/pallet/coms/comPalletRecord.vue'
import comPalletRecord from '@/pages/container/coms/comPalletRecord.vue'
export default {
components: {

266
pages/package/record/overPackageRecord.vue

@ -9,10 +9,11 @@
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-package-record :dataContent="item" @removeItem="removeItem(index,item)"
@updateData="updateData" @removePack='updateData'>
</com-package-record>
<record-com-detail-card :dataContent="item" :index="index"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card>
</view>
<u-line />
</view>
</scroll-view>
</view>
@ -21,26 +22,28 @@
<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' allowModifyLocation="false">
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
</win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location>
<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
<win-scan-pack title="翻包标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack>
<com-message ref="comMessage"></com-message>
</view>
</template>
<script>
import {
overPackageRecordSubmit
} from '@/api/request2.js';
import {
goHome
} from '@/common/basic.js';
@ -60,13 +63,13 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.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 comPackageRecord from '@/pages/package/coms/comPackageRecord.vue'
import packageTarget from '@/mycomponents/package/packageTarget.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: {
@ -78,8 +81,8 @@
comMessage,
winScanPackAndLocation,
recommendBalance,
recordComDetailCard,
comPackageRecord
packageTarget,
recordComDetailCard
},
data() {
return {
@ -88,27 +91,27 @@
detailSource: [], //
locationTypeList: [],
fromLocationCode: "",
toLocationCode: "",
isShowLocation: false,
fromlocationTypeList: [],
tolocationTypeList: [],
allowModifyLocation: false,
inInventoryStatus: "", //
outInventoryStatus: "", //
businessType: {}
businessType: {},
dataContent: {}
};
},
onLoad(option) {
// var typeCode = "SplitPackage"
// 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);
// }
// });
var typeCode = "OverPackage"
getBusinessType(typeCode, res => {
if (res.success) {
this.businessType = res.businessType;
this.fromlocationTypeList = res.fromlocationTypeList;
this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup();
} else {
this.showErrorMessage(res.message)
}
});
},
//
onNavigationBarButtonTap(e) {
@ -121,11 +124,10 @@
onPullDownRefresh() {},
mounted() {
this.showFromLocationPopup();
},
mounted() {},
methods: {
showScanPopupPack() {
scanPopupPack() {
this.$refs.scanPopupPack.openScanPopup();
},
@ -141,69 +143,35 @@
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
newDetail.scaned = false;
newDetail.Records = [];
newDetail.handleQty = 0
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
}
this.$refs.scanPopup.closeScanPopup();
this.showScanPopupPack();
},
getScanPackResult(result) {
var packingNumber = result.label.packingNumber;
var batch = result.label.batch;
var qty = result.label.qty;
var itemCode = result.label.itemCode;
var uom = result.package.uom;
var item = this.detailSource.find(r => r.itemCode == itemCode);
if (item == undefined) {
this.showMessage("物料号【" + itemCode + "】不在列表中")
} else {
var temp = {
scaned: true,
packingNumber: packingNumber,
batch: batch,
qty: Number(qty),
LabelQty: Number(qty),
stdPackUnit: result.package.stdPackUnit,
stdPackQty: result.package.stdPackQty,
uom: uom
}
var sumQty = 0;
item.subList[0].Records.forEach(function(item1, index) {
sumQty += item1.qty;
});
if ((Number(qty) + sumQty) > item.subList[0].qty) {
this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" +
sumQty +
"】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!");
return;
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 + "]已经在列表中")
}
}
item.subList[0].Records.push(temp)
this.$forceUpdate();
}
this.calcHandleQty();
},
calcHandleQty() {
for (let detail of this.detailSource[0].subList) {
let hQty = 0;
if (detail.Records.length > 0) {
detail.Records.forEach(r => {
hQty += Number(r.qty)
})
}
detail.handleQty = hQty;
}
calcHandleQty(this.detailSource)
this.$forceUpdate();
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
@ -212,15 +180,21 @@
});
},
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 == "") {
@ -248,32 +222,58 @@
},
commit() {
if (this.toLocationCode == "") {
this.showMessage("请先选择目标库位")
return;
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
overPackageRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
this.showErrorMessage("没有要扫描的数据")
}
//
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 subList = []
var creator = this.$store.state.user.id
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
var subItem = {};
Object.assign(subItem, detail)
subItem.itemCode = detail.itemCode;
subItem.itemName = detail.package.itemName;
subItem.itemDesc1 = detail.package.itemDesc1;
subItem.itemDesc2 = detail.package.itemDesc2;
subItem.fromInventoryStatus = detail.inventoryStatus;
subItem.fromQty = detail.qty
subItem.fromPackingNumber = detail.packingNumber;
subItem.fromBatch = detail.batch;
subItem.fromLocationCode = detail.locationCode;
subItem.package =""
subList.push(subItem)
}
})
})
this.dataContent.subList = subList;
this.dataContent.creator = creator;
return this.dataContent;
},
showMessage(message) {
@ -307,32 +307,62 @@
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.detailSource = []
this.fromLocationCode = '';
this.dataContent ={}
})
},
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)
}
}
},
}
}
</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>

Loading…
Cancel
Save