diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index 3fd8393b..c00a5016 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -139,7 +139,7 @@
}, 1000);
// #endif
},
- setItemCodeSimulate(itemCode,scanMsg) {
+ setItemCodeSimulate(itemCode, scanMsg) {
this.itemCode = itemCode;
this.scanMsg = scanMsg;
},
@@ -188,38 +188,53 @@
getMesPackInfo(this.itemCode).then(res => {
try {
if (res.data.list.length == 0) {
- throw new Error("没有查找到物料号【"+this.itemCode+"】对应的mes物料号")
+ throw new Error("没有查找到物料号【" + this.itemCode + "】对应的生产条码配置")
}
- var result = res.data.list[0]
- var partNumber = result.partNumber;
+ var result = res.data.list[0] //Mes条码标签解析规格
+ var partNumber = result.partNumber; //客户物料号
var lengthMat = result.lengthMat;
var lengthBc = result.lengthBc;
+
+ //因为Q5的客户物料进行了加密,没有解析规格,在生产条码配置中的Type配置成Q5
+ if (result.Type == 'P') {
+ let scanPartNumber = content.substr(0, lengthMat); //扫描的客户物料号
+ // let productDate = content.substr(lengthMat, 8);
+ // let batch = content.substr(lengthMat + 8, 3);
+ let order = content.substr(-8);
+ if (scanPartNumber != partNumber) {
+ that.clear();
+ throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber +
+ "】与生成条码配置表中的客户物料号【" + partNumber +
+ "】不一致")
+ }
-
- let itemCode = content.substr(0, lengthMat);
- let productDate = content.substr(lengthMat, 8);
- let batch = content.substr(lengthMat + 8, 3);
- let order = content.substr(-8);
- if (itemCode != partNumber) {
+ let scanResult = {
+ itemCode: scanPartNumber,
+ // productDate: productDate,
+ // batch: batch,
+ order: order,
+ qty: 1,
+ content: content,
+ success: true,
+ };
that.clear();
- throw new Error("解析错误:扫描物料号【" + itemCode + "】与查询物料号【" + partNumber +
- "】不一致")
-
+ that.$emit("getResult", scanResult);
+ } else {
+ //不进行解析,直接按照扫描的标签进行赋值
+ let scanResult = {
+ itemCode: this.itemCode,
+ // productDate: new Date(),
+ // batch: new Date(),
+ order: 0,
+ qty: 1,
+ content: content,
+ success: true,
+ };
+ that.clear();
+ that.$emit("getResult", scanResult);
}
-
- let scanResult = {
- itemCode: itemCode,
- productDate: productDate,
- batch: batch,
- order: order,
- qty: 1,
- content: content,
- success: true,
- };
- that.clear();
- that.$emit("getResult", scanResult);
} catch (error) {
- this.$refs.comMessage.showErrorMessage( error.message, res => {
+ this.$refs.comMessage.showErrorMessage(error.message, res => {
if (res) {
that.getfocus();
}
diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index a7b4a29d..2b30bafa 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -388,6 +388,11 @@
packingNumber:data.packingNumber,
qty: 0,
uom:data.uom,
+ itemName:packageInfo.itemName,
+ itemDesc1:packageInfo.itemDesc1,
+ itemDesc2:packageInfo.itemDesc2,
+ singlePrice:balance.singlePrice,
+ amount:balance.amount
}
}
let record = this.creatRecord(data, balance, packageInfo);
@@ -410,7 +415,9 @@
toLocationCode: this.toLocationCode,
supplierCode: label.supplierCode,
packUnit: packageInfo.packUnit,
- packQty: packageInfo.packQty
+ packQty: packageInfo.packQty,
+ singlePrice:balance.singlePrice,
+ amount:balance.amount
}
return record;
},
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 33d42430..e3ec36b4 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -5,7 +5,7 @@
物品代码
- {{item.itemCode}}
+ {{item.itemCode}}
物品名称
@@ -29,7 +29,7 @@
数量
- {{item.qty}}
+ {{item.qty}}
@@ -119,7 +119,7 @@
物品代码
-
${item.itemCode}
+
${item.itemCode}
数量
-
${item.qty}
+
${item.qty}
@@ -254,6 +254,10 @@
height: 100rpx;
line-height: 100rpx;
}
+ .bold-font{
+ font-weight: bold;
+ font-size: 28rpx;
+ }
.value {
border-bottom: 1px solid #b1b1b1;
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 50b15b5c..99784ba3 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -333,41 +333,26 @@
.fromLocationCode + "】已经扫描")
} else {
- this.addDetail(itemDetail, result);
- return;
+ // this.addDetail(itemDetail, result);
+ // return;
+
//暂时先不判断状态
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
- if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+ // if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续上架?', res => {
if (res) {
this.addDetail(itemDetail, result);
- // itemDetail.scaned = true;
- // itemDetail.handleQty = Number(result.balance.qty)
- // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- // itemDetail.balance = result.balance;
- // itemDetail.balance.balanceQty = Number(result.balance.qty)
- // itemDetail.balance.packQty = Number(result.package.packQty)
- // itemDetail.balance.packUnit = result.package.packUnit
- // this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
}
- } else {
- this.addDetail(itemDetail, result);
- // itemDetail.scaned = true;
- // itemDetail.handleQty = Number(result.balance.qty)
- // itemDetail.balance = result.balance;
- // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
- // itemDetail.balance.balanceQty = Number(result.balance.qty)
- // itemDetail.balance.packQty = Number(result.package.packQty)
- // itemDetail.balance.packUnit = result.package.packUnit
- // this.calcHandleQty();
- }
+ // } else {
+ // this.addDetail(itemDetail, result);
+ // }
}
}
}
diff --git a/src/pages/productReceipt/coms/comFgCard.vue b/src/pages/productReceipt/coms/comFgCard.vue
index 0250637d..3dccba14 100644
--- a/src/pages/productReceipt/coms/comFgCard.vue
+++ b/src/pages/productReceipt/coms/comFgCard.vue
@@ -7,10 +7,10 @@
零件号
{{detail.itemCode}}
-
+