Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_online_20240829
lijuncheng 5 months ago
parent
commit
ca78bd093b
  1. 12
      src/pages/package/record/overPackageRecord.vue
  2. 5
      src/pages/productPutaway/job/productPutawayJob.vue

12
src/pages/package/record/overPackageRecord.vue

@ -101,6 +101,9 @@
import packageTarget from '@/mycomponents/package/packageTarget.vue' import packageTarget from '@/mycomponents/package/packageTarget.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import packUnit from '@/mycomponents/qty/packUnit.vue' import packUnit from '@/mycomponents/qty/packUnit.vue'
import {
getCurrDateTime
} from '@/common/basic.js';
export default { export default {
components: { components: {
@ -343,24 +346,23 @@
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
let list = [] let list = []
let item = res.data; res.data.forEach(item => {
// res.data.forEach(item => {
list.push({ list.push({
itemCode:item.itemCode, // itemCode:item.itemCode, //
itemName: item.itemName, // itemName: item.itemName, //
packName: item.packName,// packName: item.packName,//
packageCode: item.toPackingNumber, // packageCode: item.toPackingNumber, //
batch:item.batch,// batch:item.toBatch,//
parentNumber:item.parentNumber,// parentNumber:item.parentNumber,//
itemType: item.itemType,// itemType: item.itemType,//
asnNumber:item.asnNumber,//ASN asnNumber:item.asnNumber,//ASN
supplierCode: item.supplierCode, // supplierCode: item.supplierCode, //
qty: item.qty, // qty: item.qty, //
printTimes:item.printTimes, // printTimes:getCurrDateTime(), //
barcodeString: item.barcodeString, // barcodeString: item.barcodeString, //
barcodeBase64: '', barcodeBase64: '',
}) })
// }) })
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list) this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

5
src/pages/productPutaway/job/productPutawayJob.vue

@ -343,6 +343,11 @@
action: "==", action: "==",
value: result.label.itemCode value: result.label.itemCode
}, },
{
column: "type",
action: "==",
value: this.type
},
// { // {
// column: "fromLocationCode", // column: "fromLocationCode",
// action: "==", // action: "==",

Loading…
Cancel
Save