diff --git a/src/manifest.json b/src/manifest.json
index 49401d07..4622e0a5 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "wms",
"appid" : "__UNI__C9CF4BF",
"description" : "",
- "versionName" : "1.0.0",
- "versionCode" : 1,
+ "versionName" : "1.0.5",
+ "versionCode" : 5,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -74,6 +74,14 @@
"parameters" : {}
}
}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "src/static/logo/72x72.png",
+ "xhdpi" : "src/static/logo/96x96.png",
+ "xxhdpi" : "src/static/logo/144x144.png",
+ "xxxhdpi" : "src/static/logo/196x196.png"
+ }
}
},
"nativePlugins" : {
diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 242543f4..171b48f0 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -13,7 +13,7 @@
-
+
@@ -74,6 +74,10 @@
type: Boolean,
default: true
},
+ isShowStatus: {
+ type: Boolean,
+ default: true
+ },
},
watch: {
dataContent: {
diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue
index ee9407fc..142df77d 100644
--- a/src/mycomponents/detail/comJobDetailCard.vue
+++ b/src/mycomponents/detail/comJobDetailCard.vue
@@ -10,7 +10,7 @@
:isEdit="settingParam.allowModifyQty=='TRUE'"
:settingParam="settingParam"
@collapseChange="collapseChange"
- @updateData="updateData"
+ @updateData="updateData" :isShowStatus="isShowStatus"
>
@@ -60,8 +60,10 @@
type: Object,
default: null
},
-
-
+ isShowStatus: {
+ type: Boolean,
+ default: true
+ },
},
watch: {
diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue
index 9d44998e..aba61626 100644
--- a/src/mycomponents/location/locationCompare.vue
+++ b/src/mycomponents/location/locationCompare.vue
@@ -7,18 +7,18 @@
- {{title}}
+ {{title}}
-   {{recommendLocationCode}}
-  / {{locationCode}}
+   {{recommendLocationCode}}
+  / {{locationCode}}
- {{title}}
-   {{recommendLocationCode}}
+ {{title}}
+   {{recommendLocationCode}}
diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue
index f56df994..4ddd0e74 100644
--- a/src/mycomponents/package/packageCard.vue
+++ b/src/mycomponents/package/packageCard.vue
@@ -19,7 +19,7 @@
+ :handleQty="Number(dataContent.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus">
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 7f631f8b..30cad4ee 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -5,7 +5,7 @@
+ :isShowFromLocation="isShowFromLocation" :isShowStatus="isShowStatus">
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
index b362feed..4aa55e52 100644
--- a/src/mycomponents/recommend/recommend.vue
+++ b/src/mycomponents/recommend/recommend.vue
@@ -18,7 +18,7 @@
+ :handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus">
@@ -93,7 +93,19 @@
},
watch: {
-
+ // 模拟扫描功能
+ detail: {
+ handler(newVal, oldVal) {
+ if(newVal.scaned){
+ newVal.copyContent = "HPQ;V1.0;I" + newVal.itemCode + ";P" + newVal.packingNumber + ";B" + newVal.batch + ";Q" + newVal.qty
+ }else{
+ newVal.copyContent = ''
+ }
+ console.log('newVal.copyContent',newVal.copyContent)
+ },
+ immediate: true,
+ deep: true
+ }
},
methods: {
copy() {
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index 42490f0c..d1082ca4 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -15,7 +15,7 @@
-
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index 68d87e2f..3fd8393b 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -139,6 +139,10 @@
}, 1000);
// #endif
},
+ setItemCodeSimulate(itemCode,scanMsg) {
+ this.itemCode = itemCode;
+ this.scanMsg = scanMsg;
+ },
setItemCode(itemCode) {
this.itemCode = itemCode;
},
diff --git a/src/mycomponents/scan/winScanFgLabel.vue b/src/mycomponents/scan/winScanFgLabel.vue
index f0e5389f..552d3b0e 100644
--- a/src/mycomponents/scan/winScanFgLabel.vue
+++ b/src/mycomponents/scan/winScanFgLabel.vue
@@ -21,6 +21,8 @@
+
+
@@ -52,6 +54,11 @@
},
methods: {
+ //模拟扫描功能
+ simulateScan(item){
+ this.$refs.comscansimulate.setItemCodeSimulate(item.itemCode,item.copyContent)
+ this.$refs.comscansimulate.clickScanMsg();
+ },
openScanPopup(itemCode) {
setTimeout(res => {
this.$refs.popup.open('bottom')
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index d8181552..eef6b720 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -105,6 +105,10 @@
queryBalance: {
type: Boolean,
default: true
+ },
+ balanceFromInventoryStatuses:{//是否传fromInventoryStatuses
+ type: Boolean,
+ default: true
}
},
data() {
@@ -255,7 +259,8 @@
// title: '查询中...',
// mask: true
// })
- getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+ // 采购上架任务--大哥让去掉 fromInventoryStatuses
+ getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined,
res => {
uni.hideLoading();
if (res.success) {
@@ -279,7 +284,11 @@
if (this.allowNullBalance) {
this.allowNoneBalance(datas);
} else if (this.noShowBalanceMessage) {
- this.countCallBack(datas);
+ if(Array.isArray(datas)){
+ this.countCallBack(datas[0]);
+ }else{
+ this.countCallBack(datas);
+ }
} else {
this.mustHavaBalance(datas);
}
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index e534e8d7..ff86d8dc 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -247,6 +247,11 @@
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
+ if(params.subList.length==0){
+ uni.hideLoading()
+ this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
+ return
+ }
deliverJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 4d552454..1bcb962f 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -14,10 +14,12 @@
-
-
+
+
@@ -75,7 +77,8 @@
getBusinessType,
createItemInfo,
createDetailInfo,
- calcTreeHandleQty
+ calcTreeHandleQty,
+ calcHandleQty
} from '@/common/record.js';
import {
@@ -170,6 +173,8 @@
let balance = result.balance;
let label = result.label;
let pack = result.package;
+ let packUnit = pack.packUnit;
+ let packQty =pack.packQty
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
@@ -179,37 +184,36 @@
this.fromWarehouseCode = balance.warehouseCode;
}
if (item == undefined) {
- // 获取推荐库位
- // this.getRecommendLocation(balance, pack, toLocation => {
- var itemp = createItemInfo(balance, pack);
- let newDetail = createDetailInfo(balance, pack); //
- // newDetail.toLocationCode = toLocation.code;
- // newDetail.toWarehouseCode = toLocation.warehouseCode;
- itemp.subList.push(newDetail);
- var dataList = pack.subList
- this.detailSource.push(itemp)
- this.detailSource.forEach(res => {
- res.subList.forEach(pack => {
- pack.packList = dataList.filter(c => c.parentNumber == pack
- .packingNumber)
- pack.packList.forEach(pac => {
- pac.parentPackingNumber = pac.parentNumber;
- pac.packingNumber = pac.number;
- pac.inventoryStatus = "OK";
- pac.scaned = true;
- })
- })
- })
- // })
-
+
+ var itemp = createItemInfo(balance, pack);
+ let newDetail = createDetailInfo(balance, pack); //
+ newDetail.packUnit =packUnit;
+ newDetail.packQty=packQty;
+ itemp.subList.push(newDetail);
+ this.detailSource.push(itemp)
+ calcHandleQty(this.detailSource);
+
} else {
- var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
- balance.batch);
- if (itemDetail != undefined) {
- this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+ 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);
+ newDetail.packUnit =packUnit;
+ newDetail.packQty=packQty;
+ item.subList.push(newDetail);
+ calcHandleQty(this.detailSource);
+ } else {
+ if (detail.scaned == true) {
+ this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+ }
}
}
- // calcTreeHandleQty(this.detailSource);
},
//获取推荐库位
@@ -318,12 +322,6 @@
},
-
-
- updateData() {
- this.calcTreeHandleQty();
- },
-
removeItem(index, item) {
this.detailSource.splice(index, 1)
},
@@ -403,38 +401,6 @@
});
},
-
- getItemAndLocationRelations() {
- var itemList = []
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (detail.scaned) {
- detail.toLocationCode = this.toLocationCode;
- var filterResult = itemList.filter(res => {
- if (res.itemCode == item.itemCode &&
- res.locationCode == detail.toLocationCode &&
- res.batch == detail.batch &&
- res.inventoryStatus == detail.inventoryStatus) {
- return res
- }
- })
- //去掉重复元素
- if (filterResult.length == 0) {
- var result = {
- itemCode: item.itemCode,
- locationCode: detail.toLocationCode,
- batch: detail.batch,
- inventoryStatus: detail.inventoryStatus,
- }
- itemList.push(result)
- }
-
- }
- })
- })
- return itemList;
- },
-
setRecordParams() {
var subList = []
var creator = this.$store.state.user.id
@@ -467,7 +433,11 @@
toBatch:info.batch,
fromLocationCode:detail.locationCode,
toLocationCode:detail.toLocationCode,
- handleQty:detail.handleQty
+ handleQty:detail.handleQty,
+ fromPackUnit:detail.packUnit,
+ toPackUnit:detail.packUnit,
+ fromPackQty:detail.packQty,
+ toPackQty:detail.packQty
}
]
subList.push(submitItem)
@@ -532,15 +502,17 @@
})
},
- updateData() {
- // this.calcTreeHandleQty();
- for (var i = 0; i < this.detailSource.length; i++) {
- let item = this.detailSource[i];
- if (item.qty == 0) {
- this.detailSource.splice(i, 1)
- }
+ updateData() {
+ calcHandleQty(this.detailSource);
+ for (var i = 0; i < this.detailSource.length; i++) {
+ let item = this.detailSource[i];
+ if (item.qty == 0) {
+ this.detailSource.splice(i, 1)
}
- },
+ }
+ this.$forceUpdate();
+
+ },
clearData() {
this.fromLocationInfo = {};
@@ -548,6 +520,7 @@
this.fromWarehouseCode = '';
this.toWarehouseCode = '';
this.detailSource = [];
+ this.to
}
}
}
diff --git a/src/pages/issue/record/directIssue1.vue b/src/pages/issue/record/directIssue1.vue
new file mode 100644
index 00000000..4d552454
--- /dev/null
+++ b/src/pages/issue/record/directIssue1.vue
@@ -0,0 +1,557 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index d69caa27..69f04a56 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -108,6 +108,7 @@
setParams() {
this.detailSource.dueTime = getCurrDateOneMonthsTimes();
+ this.detailSource.isCallMaterialsLabel = "TRUE";
return this.detailSource
},
submit() {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index a6a257b0..4d2ccead 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -124,7 +124,7 @@
uni.clearStorage(); //清除缓存
if (process.env.NODE_ENV === 'development') {
this.username = "admin"
- this.password = "123456";
+ this.password = "win123456";
}
uni.setNavigationBarColor({
frontColor: '#ffffff',
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 324c66c1..2cb32dd4 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -332,15 +332,19 @@
let list = [];
res.data.forEach(item => {
list.push({
- itemNumber: item.itemCode, // 物品代码
+ itemCode:item.itemCode, // 物品代码
itemName: item.itemName, // 物品名称
- referenceOrderRow: item.poLine, // 订单行
- referenceOrderCode: item.poNumber, // 订单号
- supplierCode: item.supplierCode, // 供应商
+ packName: item.packName,// 包装名称
packageCode: item.number, // 包装号
- amount: item.qty, // 数量
+ batch:item.batch,//批次
+ parentNumber:item.parentNumber,//父包装号
+ itemType:item.itemType,//物料类型
+ asnNumber:item.asnNumber,//ASN
+ supplierCode: item.supplierCode, // 供应商
+ qty: item.qty, // 数量
+ printTimes:getCurrDateTime(), // 打印时间
barcodeString: item.barcodeString, // 标签信息
- barcodeBase64: ''
+ barcodeBase64: '',
})
})
this.showCommitSuccessMessage("提交成功
生成翻包记录
", list)
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 7bd7be06..b066203f 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -101,6 +101,9 @@
import packageTarget from '@/mycomponents/package/packageTarget.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import packUnit from '@/mycomponents/qty/packUnit.vue'
+ import {
+ getCurrDateTime
+ } from '@/common/basic.js';
export default {
components: {
@@ -303,7 +306,7 @@
},
commit() {
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
- if (this.toPackUnit == "包装规格") {
+ if (!this.toPackUnit||this.toPackUnit == "包装规格") {
this.showErrorMessage("请选择目标包装规格")
return;
}
@@ -342,7 +345,25 @@
overPackageRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成翻包记录
" + 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(), // 打印时间
+ barcodeString: item.barcodeString, // 标签信息
+ barcodeBase64: '',
+ })
+ })
+ this.showCommitSuccessMessage("提交成功
生成翻包记录
", list)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -414,12 +435,18 @@
this.fromLocationCode = code;
this.openScanPopup();
},
+
- showCommitSuccessMessage(hint) {
+ showCommitSuccessMessage(hint,pointData) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.detailSource = []
this.fromLocationCode = '';
this.dataContent = {}
+ if (pointData.length > 0) {
+ uni.navigateTo({
+ url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+ });
+ }
})
},
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 2bea1449..62bbe201 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -5,36 +5,53 @@
物品代码
- {{item.itemNumber}}
+ {{item.itemCode}}
物品名称
{{item.itemName}}
- 供应商
- {{item.supplierCode}}
+ 包装名称
+ {{item.packName}}
包装号
{{item.packageCode}}
- 订单行
- {{item.referenceOrderRow}}
+ 父包装号
+ {{item.parentNumber}}
+
+
+ ASN
+ {{item.asnNumber}}
+
+
+ 数量
+ {{item.qty}}
+
- 订单号
- {{item.referenceOrderCode}}
+ 批次
+ {{item.batch}}
- 数量
- {{item.amount}}
+ 物料类型
+ {{item.itemType}}
+
+
+ 供应商
+ {{item.supplierCode}}
+
+
+ 打印时间
+ {{item.printTimes}}
@@ -102,23 +119,31 @@
物品代码
-
${item.itemNumber}
+
${item.itemCode}
-
供应商
-
${item.supplierCode}
+
包装名称
+
${item.packName}
-
订单行
-
${item.referenceOrderRow}
+
父包装号
+
${item.parentNumber}
+
+
+
ASN
+
${item.asnNumber}
+
+
@@ -126,12 +151,20 @@
-
订单号
-
${item.referenceOrderRow}
+
批次
+
${item.batch}
-
数量
-
${item.amount}
+
物料类型
+
${item.itemType}
+
+
+
供应商
+
${item.supplierCode}
+
+
+
打印时间
+
${item.printTimes}
`
diff --git a/src/pages/pointProductReceipt/index.vue b/src/pages/pointProductReceipt/index.vue
index 28cb3a00..097b2fbb 100644
--- a/src/pages/pointProductReceipt/index.vue
+++ b/src/pages/pointProductReceipt/index.vue
@@ -12,8 +12,8 @@
{{item.itemName}}
- 物料描述
- {{item.itemDesc1}}
+ 包装名称
+ {{item.packName}}
包装号
@@ -37,8 +37,8 @@
{{item.batch}}
- 班次
- {{item.shiftCode}}
+ 物料类型
+ {{item.itemType}}
打印时间
@@ -117,20 +117,20 @@
${item.itemName}
- 物料描述
- {{item.itemDesc1}}
+ 包装名称
+ ${item.packName}
包装号
- {{item.relateNumber}}
+ ${item.relateNumber}
生产线
- {{item.productionLineCode}}
+ ${item.productionLineCode}
数量
- {{item.qty}}
+ ${item.qty}
@@ -139,15 +139,15 @@
批次
- {{item.batch}}
+ ${item.batch}
- 班次
- {{item.shiftCode}}
+ 物料类型
+ ${item.itemType}
打印时间
- {{item.printTimes}}
+ ${item.printTimes}
`
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 0ae80cc1..3e55d22f 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -13,8 +13,8 @@
-
@@ -36,7 +36,7 @@
-
+
@@ -202,7 +202,10 @@
that.detailSource.forEach(r => {
r.subList.forEach(s => {
if (this.scanedPackingNumber && this.scanedPackingNumber == s
- .packingNumber) s.scaned = true
+ .packingNumber) {
+ s.scaned = true
+ s.handleQty =s.qty
+ }
})
})
that.isCheckLocation = getSwitchInfoByCode(that.switchCode)
@@ -346,6 +349,7 @@
itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance;
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+ itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index b68fdafe..f7475548 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -342,6 +342,11 @@
column: "itemCode",
action: "==",
value: result.label.itemCode
+ },
+ {
+ column: "type",
+ action: "==",
+ value: this.type
},
// {
// column: "fromLocationCode",
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 4cb454b3..ac453cca 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -9,7 +9,7 @@
-
@@ -33,7 +33,7 @@
-
+
@@ -153,6 +153,7 @@
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
+ newDetail.fromInventoryStatus = balance.inventoryStatus;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
@@ -166,6 +167,7 @@
})
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
+ newDetail.fromInventoryStatus = balance.inventoryStatus;
item.subList.push(newDetail);
} else {
if (detail.scaned == true) {
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 61a8cd7f..7e1d2d5a 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -70,6 +70,7 @@
import {
getManagementPrecisions
} from '@/common/balance.js';
+ import { getCurrDateTime} from '@/common/basic.js';
import {
getProductReceiptJobDetail,
@@ -230,7 +231,11 @@
that.detailSource.forEach(r => {
r.subList.forEach(s => {
if (this.scanedPackingNumber && this.scanedPackingNumber == s
- .packingNumber) s.scaned = true
+ .packingNumber) {
+ s.scaned = true
+ //模拟扫描功能
+ this.$refs.scanPopup.simulateScan(s);
+ }
})
})
@@ -377,17 +382,19 @@
console.log('打印', res)
let pointData = []
res.data.forEach(item => {
- pointData.push({
- barcodeString: item.barcodeString, //标签
- itemCode: item.itemCode || '', //物品代码
- itemName: item.itemName || '', //物品名称
- itemDesc1: item.itemDesc1 || '', //物品描述
- relateNumber: item.relateNumber || '', //relateNumber包装号
- batch: item.batch || '', //批次
- productionLineCode: item.productionLineCode || '', //生产线
- shiftCode: item.shiftCode || '', //班次
- qty: item.qty || '', //数量
- printTimes: item.printTimes || '' //打印时间
+ pointData.push({
+ barcodeString: item.barcodeString, //标签
+ itemCode: item.itemCode || '', //物品代码
+ itemName: item.itemName || '', //物品名称
+ packName: item.packName || '', //包装名称
+ itemType: item.itemType || '', //物料类型
+ itemDesc1: item.itemDesc1 || '', //物品描述
+ relateNumber: item.relateNumber || '', //relateNumber包装号
+ batch: item.batch || '', //批次
+ productionLineCode: item.productionLineCode || '', //生产线
+ shiftCode: item.shiftCode || '', //班次
+ qty: item.qty || '', //数量
+ printTimes: getCurrDateTime() //打印时间
})
})
console.log('pointData', pointData)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 636f6177..001c95db 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -222,7 +222,10 @@
that.detailSource.forEach(r => {
r.subList.forEach(s => {
if (this.scanedPackingNumber && this.scanedPackingNumber == s
- .packingNumber) s.scaned = true
+ .packingNumber){
+ s.scaned = true
+ s.handleQty =s.qty
+ }
})
})
} else {
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 64db0566..7551de0a 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -14,7 +14,7 @@
-
@@ -41,7 +41,7 @@
-
+
@@ -345,6 +345,9 @@
scanedLength++;
}
})
+ //大哥让加的
+ itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+
if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index ac4570f6..2d4598dc 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -172,6 +172,7 @@
newDetail.poLine=poLine;
newDetail.poNumber=poNumber;
newDetail.supplierCode=supplierCode;
+ newDetail.fromInventoryStatus = balance.inventoryStatus;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
@@ -195,6 +196,8 @@
newDetail.poLine=poLine;
newDetail.poNumber=poNumber;
newDetail.supplierCode=supplierCode;
+ newDetail.fromInventoryStatus = balance.inventoryStatus;
+
item.subList.push(newDetail);
calcHandleQty(this.detailSource);
});
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 43ca82bc..da064ae4 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -185,7 +185,7 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
let that = this;
that.fromLocationList = [];
if (that.dataContent != null) {
- that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses)
+ that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
that.toLocation = that.dataContent[0];
that.toLocationCode = that.dataContent[0].toLocationCode;
that.fromLocationList = that.getFromLocationList();
@@ -567,15 +567,17 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
if (item != undefined) {
item.Locations.forEach(l => {
- let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
- .batch == record.batch);
+ let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+ .packingNumber == null || b.packingNumber == '') && b.batch ==
+ record.batch);
+
let rIndex = batch.Records.findIndex(r => r.packingNumber == record
.packingNumber && r
.batch == record.batch);
batch.Records.splice(rIndex, 1);
})
}
- this.$emit('updateData', item);
+ this.$emit('updateData', record);
}
});
},
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index f51b51c2..53ec9d9d 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -413,6 +413,7 @@
})
batch.handleQty = handleQty;
itemHandleQty = calc.add(itemHandleQty, handleQty)
+ this.$refs.comScanIssuePack.calcBatchHandleQty(batch)
}
})
}
diff --git a/src/static/logo/144x144.png b/src/static/logo/144x144.png
new file mode 100644
index 00000000..ac2d53de
Binary files /dev/null and b/src/static/logo/144x144.png differ
diff --git a/src/static/logo/196x196.png b/src/static/logo/196x196.png
new file mode 100644
index 00000000..931a7447
Binary files /dev/null and b/src/static/logo/196x196.png differ
diff --git a/src/static/logo/72x72.png b/src/static/logo/72x72.png
new file mode 100644
index 00000000..db7a5f75
Binary files /dev/null and b/src/static/logo/72x72.png differ
diff --git a/src/static/logo/96x96.png b/src/static/logo/96x96.png
new file mode 100644
index 00000000..4589c786
Binary files /dev/null and b/src/static/logo/96x96.png differ