|
|
|
@ -30,7 +30,8 @@ |
|
|
|
<view class=""> |
|
|
|
<record-com-detail-card :dataContent="item" :index="index" |
|
|
|
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack" |
|
|
|
:isShowFromLocation="false" :isShowToLocation="false"> |
|
|
|
:isShowFromLocation="false" :isShowToLocation="false" :isSpecial='true' |
|
|
|
:isShowNumView='false' :isShowParentToLocation='false' :isShowStatus='false'> |
|
|
|
</record-com-detail-card> |
|
|
|
</view> |
|
|
|
<view class='split_line'></view> |
|
|
|
@ -42,7 +43,7 @@ |
|
|
|
<view class="uni-flex u-col-center space-between padding_10" |
|
|
|
style="background-color:ghostwhite; width: 100%; "> |
|
|
|
<view class=""> |
|
|
|
<view class="uni-flex uni-row"> |
|
|
|
<!-- <view class="uni-flex uni-row"> |
|
|
|
<text>目标包装规格:</text> |
|
|
|
<view class="uni-flex u-col-center uni-row" @click="showPackage"> |
|
|
|
<view class="" style="margin-left: 5rpx;width: 100%;"> |
|
|
|
@ -52,7 +53,7 @@ |
|
|
|
@confirm="confirmSelect"> |
|
|
|
</u-select> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
|
|
|
|
</view> |
|
|
|
<view class=" uni-flex uni-row"> |
|
|
|
@ -60,7 +61,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
|
<!-- <win-scan-button @goScan='openScanPopup'></win-scan-button> --> |
|
|
|
</view> |
|
|
|
|
|
|
|
<winComScanBalance ref="scanPopup" |
|
|
|
@ -81,7 +82,8 @@ |
|
|
|
import { |
|
|
|
overPackageRecordSubmit, |
|
|
|
getPackUnitByItemCode, |
|
|
|
getBalanceByParams |
|
|
|
getBalanceByParams, |
|
|
|
printPurchaseLabel |
|
|
|
} from '@/api/request2.js'; |
|
|
|
import { |
|
|
|
deepCopyData, |
|
|
|
@ -167,16 +169,6 @@ |
|
|
|
uni.setNavigationBarTitle({ |
|
|
|
title: option.title |
|
|
|
}) |
|
|
|
this.getBusinessType(); |
|
|
|
|
|
|
|
// this.$nextTick(()=>{ |
|
|
|
// if(uni.getStorageSync('overPackageRecordPointParams')){ |
|
|
|
// const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams') |
|
|
|
// this.dataContent.printerUuid = overPackageRecordPointParams.printDeafult.value; |
|
|
|
// this.dataContent.modelCode = overPackageRecordPointParams.templateDeafult.value; |
|
|
|
// this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
}, |
|
|
|
//返回首页 |
|
|
|
onNavigationBarButtonTap(e) { |
|
|
|
@ -258,6 +250,7 @@ |
|
|
|
let balance = result.balance; |
|
|
|
let label = result.label; |
|
|
|
let pack = result.package; |
|
|
|
console.log(result) |
|
|
|
this.fromPackUnit = pack.packUnit; |
|
|
|
this.fromPack = pack; |
|
|
|
if(this.fromLocationCode&&this.fromLocationCode!=balance.locationCode){ |
|
|
|
@ -277,11 +270,13 @@ |
|
|
|
} |
|
|
|
var itemp = createItemInfo(balance, pack); |
|
|
|
let newDetail = createDetailInfo(balance, pack); // |
|
|
|
if(balance.lableQty){ |
|
|
|
newDetail.handleQty =balance.lableQty |
|
|
|
} |
|
|
|
newDetail.handleQty =0 |
|
|
|
newDetail.qty =label.qty |
|
|
|
newDetail.parentNumber =pack.parentNumber; |
|
|
|
newDetail.packingNumber =pack.number |
|
|
|
newDetail.boardNumber =pack.number.substring(pack.number.length - 5); |
|
|
|
newDetail.flippedNumber =1 |
|
|
|
newDetail.everyPackageQty =Math.ceil(newDetail.qty /newDetail.flippedNumber ) |
|
|
|
itemp.subList.push(newDetail); |
|
|
|
this.detailSource.push(itemp) |
|
|
|
this.itemCode = balance.itemCode; |
|
|
|
@ -298,11 +293,13 @@ |
|
|
|
}) |
|
|
|
if (detail == undefined) { |
|
|
|
let newDetail = createDetailInfo(balance, pack); |
|
|
|
if(balance.lableQty){ |
|
|
|
newDetail.handleQty =balance.lableQty |
|
|
|
} |
|
|
|
newDetail.handleQty =0 |
|
|
|
newDetail.qty =label.qty |
|
|
|
newDetail.parentNumber =pack.parentNumber; |
|
|
|
newDetail.packingNumber =pack.number |
|
|
|
newDetail.boardNumber =pack.number.substring(pack.number.length - 5); |
|
|
|
newDetail.flippedNumber =1 |
|
|
|
newDetail.everyPackageQty =Math.ceil(newDetail.qty /newDetail.flippedNumber ) |
|
|
|
item.subList.push(newDetail); |
|
|
|
this.scanPopupGetFocus() |
|
|
|
} else { |
|
|
|
@ -311,7 +308,6 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
this.calcHandleQty(); |
|
|
|
}, |
|
|
|
|
|
|
|
calcHandleQty() { |
|
|
|
@ -366,25 +362,12 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
commit() { |
|
|
|
// if(!this.dataContent.printerUuid){ |
|
|
|
// this.showErrorMessage("请选择打印机") |
|
|
|
// return; |
|
|
|
// } |
|
|
|
// if(!this.dataContent.modelCode){ |
|
|
|
// this.showErrorMessage("请选择打印模板") |
|
|
|
// return; |
|
|
|
// } |
|
|
|
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { |
|
|
|
if (!this.toPackUnit || this.toPackUnit == "包装规格") { |
|
|
|
this.showErrorMessage("请选择目标包装规格") |
|
|
|
return; |
|
|
|
} |
|
|
|
if(this.fromPackUnit==this.toPackUnit){ |
|
|
|
this.showErrorMessage("来源包装规格与目标包装规格一致,不能进行翻包操作") |
|
|
|
return; |
|
|
|
this.$refs.comMessage.showQuestionMessage("是否确认翻包?", res => { |
|
|
|
if (res) { |
|
|
|
this.submitJob() |
|
|
|
} |
|
|
|
|
|
|
|
this.checkSubmit(); |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
this.showErrorMessage("没有要扫描的数据") |
|
|
|
@ -420,44 +403,18 @@ |
|
|
|
}); |
|
|
|
|
|
|
|
var params = this.setParams(); |
|
|
|
console.log(params) |
|
|
|
|
|
|
|
overPackageRecordSubmit(params).then(res => { |
|
|
|
uni.hideLoading() |
|
|
|
|
|
|
|
// if (res.data == '打印任务已发送，等待打印机处理！') { |
|
|
|
// this.showCommitSuccessMessage(res.data) |
|
|
|
// const overPackageRecordPointParams = { |
|
|
|
// printDeafult:this.printDeafult, |
|
|
|
// templateDeafult:this.templateDeafult, |
|
|
|
// } |
|
|
|
// uni.setStorageSync('overPackageRecordPointParams',overPackageRecordPointParams) |
|
|
|
// this.detailSource = [] |
|
|
|
// }else { |
|
|
|
// this.showErrorMessage(res.data) |
|
|
|
// } |
|
|
|
if (res.data) { |
|
|
|
let list = [] |
|
|
|
res.data.forEach(item => { |
|
|
|
list.push({ |
|
|
|
itemCode: item.itemCode, // 物品代码 |
|
|
|
itemName: item.itemName, // 物品名称 |
|
|
|
packName: item.packName, // 包装名称 |
|
|
|
packageCode: item.toPackingNumber, // 包装号 |
|
|
|
batch: item.toBatch, //批次 |
|
|
|
parentNumber: item.parentNumber, //父包装号 |
|
|
|
itemType: item.itemType, //物料类型 |
|
|
|
asnNumber: item.asnNumber, //ASN |
|
|
|
supplierCode: item.supplierCode, // 供应商 |
|
|
|
qty: item.qty, // 数量 |
|
|
|
printTimes: getCurrDateTime(), // 打印时间 |
|
|
|
productionLineCode: item.productionLineCode, //生产线 |
|
|
|
barcodeString: item.barcodeString, // 标签信息 |
|
|
|
barcodeBase64: '', |
|
|
|
}) |
|
|
|
printPurchaseLabel('REC3920250403-0002').then(res1=>{ |
|
|
|
this.showCommitSuccessMessage('提交成功\n生成翻包记录！',res1.data.list) |
|
|
|
}).catch(err=>{ |
|
|
|
console.log(55,err) |
|
|
|
}) |
|
|
|
this.showCommitSuccessMessage("提交成功\n生成翻包记录\n", list) |
|
|
|
|
|
|
|
}else { |
|
|
|
this.showErrorMessage("提交失败[" + res.msg + "]") |
|
|
|
this.showErrorMessage(res.data) |
|
|
|
} |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading() |
|
|
|
@ -467,46 +424,30 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
setParams() { |
|
|
|
|
|
|
|
var subList = [] |
|
|
|
var obj = {} |
|
|
|
var creator = this.$store.state.user.id |
|
|
|
this.detailSource.forEach(item => { |
|
|
|
item.subList.forEach(detail => { |
|
|
|
if (detail.scaned) { |
|
|
|
var subItem = deepCopyData(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.handleQty |
|
|
|
subItem.fromParentPackingNumber =detail.parentNumber; |
|
|
|
subItem.fromPackingNumber = detail.packingNumber; |
|
|
|
subItem.fromBatch = detail.batch; |
|
|
|
subItem.fromLocationCode = detail.locationCode; |
|
|
|
subItem.fromPackUnit = detail.packUnit; |
|
|
|
subItem.fromPackQty = detail.packQty; |
|
|
|
|
|
|
|
subItem.toPackQty = this.toPackQty; |
|
|
|
subItem.toPackUnit = this.toPackUnit; |
|
|
|
subItem.package = "" |
|
|
|
subList.push(subItem) |
|
|
|
// var subItem = deepCopyData(detail); |
|
|
|
obj.locationCode = detail.locationCode; |
|
|
|
obj.fromPackingNumber = detail.packingNumber |
|
|
|
obj.fromBatch = detail.batch |
|
|
|
obj.fromInventoryStatus = detail.inventoryStatus |
|
|
|
obj.itemCode = detail.itemCode |
|
|
|
obj.fromPackUnit = detail.packUnit |
|
|
|
obj.fromPackQty = detail.packQty |
|
|
|
obj.toPackUnit = detail.packUnit |
|
|
|
obj.toPackQty = detail.packQty |
|
|
|
obj.flippedNumber = detail.flippedNumber |
|
|
|
obj.everyPackageQty = detail.everyPackageQty |
|
|
|
obj.qty = detail.qty |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
this.dataContent.subList = subList; |
|
|
|
this.dataContent.creator = creator; |
|
|
|
return this.dataContent; |
|
|
|
|
|
|
|
return obj; |
|
|
|
}, |
|
|
|
// printCode(e){ |
|
|
|
// this.dataContent.printerUuid = e.value; |
|
|
|
// this.printDeafult = e |
|
|
|
// }, |
|
|
|
// templateCode(e){ |
|
|
|
// this.dataContent.modelCode = e.value; |
|
|
|
// this.templateDeafult = e |
|
|
|
// }, |
|
|
|
showMessage(message) { |
|
|
|
this.$refs.comMessage.showMessage(message, res => { |
|
|
|
if (res) {} |
|
|
|
@ -538,11 +479,8 @@ |
|
|
|
this.toPackUnitShow ="请选择" |
|
|
|
this.toPackQty = "" |
|
|
|
if (pointData.length > 0) { |
|
|
|
pointData.forEach(item=>{ |
|
|
|
item.fromLocationCode = fromLocationCode |
|
|
|
}) |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pages/point/index?points=${JSON.stringify(pointData)}` |
|
|
|
url: `/pages/pointSplitLabel/index?points=${JSON.stringify(pointData)}` |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
