|
@@ -46,6 +46,7 @@ function codeListPrint(data, domId) {
|
|
|
boxNum,//箱号
|
|
|
packaging,
|
|
|
qrCodeId,
|
|
|
+ otherStates,//总码单标记 1
|
|
|
} = item
|
|
|
// let theNumber = Number(printFormat) //小包装:1 大包装:2
|
|
|
let theNumber = packaging == 3 ? 2 : 1; //车丝和小包装都是1 大包装是2
|
|
@@ -59,6 +60,9 @@ function codeListPrint(data, domId) {
|
|
|
// let qrCodeData = '123456';
|
|
|
// let temp = id + '@' + uuid + '@' + canisterNum + '@' + suttle + '@' + grossWeight + '@' + lotNum + '@' + productName + '@' + productSpecifications + '@' + productColor + '@' + levels + '@' + qrCode + '@' + boxNum
|
|
|
let temp = id + '@' + qrCodeId + '@' + canisterNum + '@' + suttle + '@' + grossWeight + '@' + qrCode
|
|
|
+ if (otherStates == 1) {
|
|
|
+ temp += "@" + 1; //总码单标识
|
|
|
+ }
|
|
|
console.log('二维码数据:', productName, temp);
|
|
|
// let resStr = encodeURIComponent(temp)
|
|
|
if (printFormat == 3) {//打印英文版
|