From 7bd3a71a364d022bdac1e142a2c8bc7c0fb39f0b Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 16 Jan 2024 16:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7=E5=8F=98=E6=88=90=E7=89=A9=E6=96=99=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 16 ++++++++-------- api/request2.js | 4 ++-- common/basic.js | 6 +++--- common/classify.data.js | 2 +- common/scan.js | 8 ++++---- common/style/new_style.css | 2 +- common/style/pdabasic.css | 8 ++++---- mycomponents/item/itemDetailInfo.vue | 4 ++-- mycomponents/item/itemSelect.vue | 6 +++--- mycomponents/partCode/partCodeSelect.vue | 6 +++--- mycomponents/popup/selectList.vue | 8 ++++---- mycomponents/record/recordComDetailCard.vue | 2 +- mycomponents/scan/winScanPackAndLocation.vue | 8 ++++---- pages.json | 2 +- pages/container/coms/comContainerBindCard.vue | 2 +- pages/container/coms/comPalletRecord.vue | 2 +- pages/count/coms/comCountDetailCard.vue | 2 +- pages/count/job/countDetail.vue | 6 +++--- pages/count/record/countRecord.vue | 6 +++--- pages/customerReturn/coms/comReturnRecord.vue | 2 +- pages/deliver/coms/comDeliverRequestPopup.vue | 10 +++++----- pages/deliver/coms/comScanDeliverPack.vue | 2 +- pages/deliver/job/deliverDetail.vue | 2 +- pages/demo/demo.vue | 12 ++++++------ pages/inspect/job/inspectResult.vue | 2 +- .../coms/comIssueJobCard.vue | 2 +- .../coms/comScanIssuePack.vue | 2 +- pages/issue-按批次推荐/job/issueDetail.vue | 12 ++++++------ pages/issue/coms/comScanIssuePack.vue | 2 +- pages/issue/job/issueDetail.vue | 2 +- pages/issue/js/issue.js | 4 ++-- pages/issue/record/issueRecord.vue | 4 ++-- pages/package/coms/comOverRecord.vue | 2 +- pages/package/coms/comPackageRecord.vue | 2 +- pages/package/record/mergePackageRecord.vue | 8 ++++---- .../productDismantle/coms/comProductJobCard.vue | 2 +- pages/productDismantle/coms/comProductRecord.vue | 2 +- pages/productPutaway/coms/comProductRecord.vue | 2 +- pages/productReceipt/coms/comProductRecord.vue | 2 +- .../coms/comProductionRecord.vue | 2 +- pages/productionReturn/coms/comReturnRecord.vue | 2 +- .../productionReturn/coms/comScanReturnPack.vue | 2 +- pages/query/container.vue | 2 +- pages/query/item.vue | 14 +++++++------- pages/query/item_copy.vue | 16 ++++++++-------- pages/repleinsh/coms/comScanReplishPack.vue | 2 +- pages/repleinsh/job/repleinshDetail.vue | 2 +- pages/repleinsh/record/repleinshRecord.vue | 2 +- pages/unPlanned/coms/comReceiptRecord.vue | 2 +- 49 files changed, 112 insertions(+), 112 deletions(-) diff --git a/api/index.js b/api/index.js index ab6423f7..e2f0294e 100644 --- a/api/index.js +++ b/api/index.js @@ -140,14 +140,14 @@ export const getBalancesAsync = (params) => promise( }); -//根据零件、箱码、托码、批次、库位类型、库存状态查询库存 +//根据物料、箱码、托码、批次、库位类型、库存状态查询库存 export const getBalancesByFilter = (params) => request( devUrl + "/api/pda/inventory/balances/by-balances-request-many-parameter", { method: 'post', data: params }); -//根据零件、箱码、托码、批次、库位类型、库存状态查询库存 +//根据物料、箱码、托码、批次、库位类型、库存状态查询库存 export const getBalancesByFilterAsync = (params) => promise( devUrl + "/api/pda/inventory/balances/by-balances-request-many-parameter", { method: 'post', @@ -170,7 +170,7 @@ export const getBalancesByStatus = (params) => request( data: params }); -//根据库位和零件号查询库存 +//根据库位和物料号查询库存 export const getBalancesByLocationAndItem = (params) => request( devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode + "&itemCode=" + params.itemCode, { @@ -179,7 +179,7 @@ export const getBalancesByLocationAndItem = (params) => request( }); -//根据库位和零件号查询库存 +//根据库位和物料号查询库存 export const getBalancesByLocationAndItemAsync = (params) => promise( devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode + "&itemCode=" + params.itemCode, { @@ -203,15 +203,15 @@ export const summary = (params) => request( data: params }); -//零件 -//查询零件信息 +//物料 +//查询物料信息 export const getitems = (code) => request( devUrl + "/api/pda/item/" + code, { method: 'get', data: code }); -//根据库位查询零件 +//根据库位查询物料 export const getItemsByLocation = (params) => promise( devUrl + "/api/pda/inventory/balances/get-item-by-location", { method: 'get', @@ -427,7 +427,7 @@ export const locationByType = (type) => request( data: type }); -//根据库位查询零件 +//根据库位查询物料 export const getLocationByItem = (params) => promise( devUrl + "/api/pda/inventory/balances/get-location-by-item", { method: 'get', diff --git a/api/request2.js b/api/request2.js index e3886e99..d1791264 100644 --- a/api/request2.js +++ b/api/request2.js @@ -375,7 +375,7 @@ export function getBasicLocationByCode(code) { /** - * 校验库位零件关系 + * 校验库位物料关系 * @param {*} * */ @@ -3509,7 +3509,7 @@ export function getBalanceByFilter(param) { } /** - * 查询管理精度，多个零件，多个库位 + * 查询管理精度，多个物料，多个库位 * @param {*} * */ diff --git a/common/basic.js b/common/basic.js index 4df664c5..b725be39 100644 --- a/common/basic.js +++ b/common/basic.js @@ -476,7 +476,7 @@ export function getInspectReasonList(value) { // else return '其他' // } -// //零件状态 +// //物料状态 // export function getItemStatusStyle(val) { // if (val == "wpztUNK") return 'item_unk' // else if (val == "wpztENABLE") return 'item_active' @@ -498,7 +498,7 @@ export function getInspectReasonList(value) { // } -// //零件状态描述 +// //物料状态描述 // export function getItemStatusDesc(val) { // if (val == "wpztUNK") return '未知' // else if (val == "wpztENABLE") return '可用' @@ -541,7 +541,7 @@ export function getInspectReasonList(value) { // if (val == 0) return '未知' // else if (val == 1) return '库位盘点' // else if (val == 2) return '物品盘点' -// else if (val == 3) return '库位零件盘点' +// else if (val == 3) return '库位物料盘点' // else return '其他' // } diff --git a/common/classify.data.js b/common/classify.data.js index 4870927a..ea61158a 100644 --- a/common/classify.data.js +++ b/common/classify.data.js @@ -1,7 +1,7 @@ export default [{ "name": "库存查询", "children": [{ - "name": "按零件查询库存", + "name": "按物料查询库存", "icon": "/static/menus/menu_search_lj.svg", "url": "pages/query/item", "index": 1, diff --git a/common/scan.js b/common/scan.js index 73fe2759..f8635d6f 100644 --- a/common/scan.js +++ b/common/scan.js @@ -125,7 +125,7 @@ export function analyseScanInfo(scanMsg) { //解析完工收货标签 //P2250229RAA;L220408;Q100;N62840610;SB0000107;UEA;DU571LS;FA;E2022-4-8 -//P零件号，L批次，Q数量，N生产计划号，S箱码,U计量单位,D生产线，F班次，E日期，M零件名称(待添加) +//P物料号，L批次，Q数量，N生产计划号，S箱码,U计量单位,D生产线，F班次，E日期，M物料名称(待添加) //解析规则 //P:itemCode 物料号 //L:lot批次 @@ -240,7 +240,7 @@ export function analyseProductLabelInfo(scanMsg) { //解析天津mes标签 //1#2546319FL#254FL003#202207110009: -//1.序号1，2.生产号2546311FL，3.零件号254FL004，4.批序号202207110009 +//1.序号1，2.生产号2546311FL，3.物料号254FL004，4.批序号202207110009 export function analyseTJMesQRCode(scanMsg) { let scanResult = { success: false, @@ -269,7 +269,7 @@ export function analyseTJMesQRCode(scanMsg) { seq: datas[0], //序号 produceNo: datas[1], //生产号 // projectNo: datas[2], //项目号 - itemCode: itemCode, //配置码(零件号) + itemCode: itemCode, //配置码(物料号) lot: datas[3], //批次 position: location //上层、下层 } @@ -282,7 +282,7 @@ export function analyseTJMesQRCode(scanMsg) { seq: seq, //序号 produceNo: 'N', //生产号 projectNo: 'N', //项目号 - itemCode: 'N', //配置码(零件号) + itemCode: 'N', //配置码(物料号) lot: 'N', //批次 position: '' } diff --git a/common/style/new_style.css b/common/style/new_style.css index 6d4c4bc7..f7f1c40c 100644 --- a/common/style/new_style.css +++ b/common/style/new_style.css @@ -115,7 +115,7 @@ uni-page-head .uni-page-head__title { } /* -零件状态 +物料状态 未知，可用，隔离，新增，规划，禁用 */ diff --git a/common/style/pdabasic.css b/common/style/pdabasic.css index d52e32ec..7b7f368a 100644 --- a/common/style/pdabasic.css +++ b/common/style/pdabasic.css @@ -417,7 +417,7 @@ -/* //零件状态 +/* //物料状态 export function getItemTypeStyle(val) { if (val == 0) return 'active' else if (val == 1) return 'hold' @@ -428,7 +428,7 @@ export function getItemTypeStyle(val) { } */ -/* 零件状态 */ +/* 物料状态 */ .active { background-color: #5FCB94; color: #FFFFFF; @@ -460,7 +460,7 @@ export function getItemTypeStyle(val) { font-weight: bolder; } -/* 零件编号字体 */ +/* 物料编号字体 */ .text-itemcode { /* font-size: 26rpx; */ color: #000; @@ -472,7 +472,7 @@ export function getItemTypeStyle(val) { /* font-size: 22rpx; */ } -/* 零件编号字体 */ +/* 物料编号字体 */ .text-bolder { color: #000; font-weight: bolder; diff --git a/mycomponents/item/itemDetailInfo.vue b/mycomponents/item/itemDetailInfo.vue index 14c757a1..6649a075 100644 --- a/mycomponents/item/itemDetailInfo.vue +++ b/mycomponents/item/itemDetailInfo.vue @@ -2,11 +2,11 @@ - 零件号 + 物料号 {{dataContent.code}} - 零件名称 + 物料名称 {{dataContent.name}} diff --git a/mycomponents/item/itemSelect.vue b/mycomponents/item/itemSelect.vue index 631cf749..6a059ffc 100644 --- a/mycomponents/item/itemSelect.vue +++ b/mycomponents/item/itemSelect.vue @@ -1,9 +1,9 @@