diff --git a/src/common/storeGoodsProcessIn.js b/src/common/storeGoodsProcessIn.js index 7693a3f..053e48a 100644 --- a/src/common/storeGoodsProcessIn.js +++ b/src/common/storeGoodsProcessIn.js @@ -272,6 +272,7 @@ export function buildScanDetailFromScanResponse(res) { : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', + // 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖) order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll), order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight), diff --git a/src/common/storeGoodsProcessOut.js b/src/common/storeGoodsProcessOut.js index 334955d..280f280 100644 --- a/src/common/storeGoodsProcessOut.js +++ b/src/common/storeGoodsProcessOut.js @@ -237,6 +237,7 @@ export function buildScanDetailFromScanResponse(res) { : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', + // 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖) order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll), order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight), diff --git a/src/common/storeGoodsProcessReturnIn.js b/src/common/storeGoodsProcessReturnIn.js index 6ff8ff5..be0220f 100644 --- a/src/common/storeGoodsProcessReturnIn.js +++ b/src/common/storeGoodsProcessReturnIn.js @@ -233,6 +233,7 @@ export function buildScanDetailFromScanResponse(res) { : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', + // 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖) order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll), order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight), diff --git a/src/common/storeGoodsPurchaseIn.js b/src/common/storeGoodsPurchaseIn.js index 7ce15e4..ee3b116 100644 --- a/src/common/storeGoodsPurchaseIn.js +++ b/src/common/storeGoodsPurchaseIn.js @@ -288,6 +288,7 @@ export function buildScanDetailFromScanResponse(res) { : '', product_code: res.product_code || '', product_color_code: res.product_color_code || '', + // 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖) order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll), item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll), order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight), diff --git a/src/manifest.json b/src/manifest.json index e028445..97471cd 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "浩拓ERP", "appid" : "__UNI__F79F300", "description" : "浩拓ERP", - "versionName" : "1.1.15", - "versionCode" : 115, + "versionName" : "1.1.16", + "versionCode" : 116, "transformPx" : false, "app-plus" : { "optimization" : { diff --git a/src/pages/storegoods/storeGoodsProcessInMixin.js b/src/pages/storegoods/storeGoodsProcessInMixin.js index 0e111f1..7fe919a 100644 --- a/src/pages/storegoods/storeGoodsProcessInMixin.js +++ b/src/pages/storegoods/storeGoodsProcessInMixin.js @@ -610,6 +610,12 @@ export default { if (order) { this.form.item_data = order.item_data; this.auditStatus = order.audit_status; + // 本单匹数/本单数量:取这张单的总匹数、总数量 + this.scanDetail = { + ...this.scanDetail, + order_roll: order.total_roll, + order_weight: order.total_weight, + }; } }) .catch(() => null); diff --git a/src/pages/storegoods/storeGoodsProcessOutMixin.js b/src/pages/storegoods/storeGoodsProcessOutMixin.js index 90e3553..79c7634 100644 --- a/src/pages/storegoods/storeGoodsProcessOutMixin.js +++ b/src/pages/storegoods/storeGoodsProcessOutMixin.js @@ -453,6 +453,12 @@ export default { if (order) { this.form.item_data = order.item_data; this.auditStatus = order.audit_status; + // 本单匹数/本单数量:取这张单的总匹数、总数量 + this.scanDetail = { + ...this.scanDetail, + order_roll: order.total_roll, + order_weight: order.total_weight, + }; } }) .catch(() => null); diff --git a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js index 105c7c6..036025b 100644 --- a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js +++ b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js @@ -510,6 +510,12 @@ export default { if (order) { this.form.item_data = order.item_data; this.auditStatus = order.audit_status; + // 本单匹数/本单数量:取这张单的总匹数、总数量 + this.scanDetail = { + ...this.scanDetail, + order_roll: order.total_roll, + order_weight: order.total_weight, + }; } }) .catch(() => null); diff --git a/src/pages/storegoods/storeGoodsPurchaseInMixin.js b/src/pages/storegoods/storeGoodsPurchaseInMixin.js index 94a8c56..bb471fd 100644 --- a/src/pages/storegoods/storeGoodsPurchaseInMixin.js +++ b/src/pages/storegoods/storeGoodsPurchaseInMixin.js @@ -615,6 +615,12 @@ export default { if (order) { this.form.item_data = order.item_data; this.auditStatus = order.audit_status; + // 本单匹数/本单数量:取这张单的总匹数、总数量 + this.scanDetail = { + ...this.scanDetail, + order_roll: order.total_roll, + order_weight: order.total_weight, + }; } }) .catch(() => null);