Browse Source

重命名 零件号变成物料号

wms3.0_pda
lijuncheng 10 months ago
parent
commit
7bd3a71a36
  1. 16
      api/index.js
  2. 4
      api/request2.js
  3. 6
      common/basic.js
  4. 2
      common/classify.data.js
  5. 8
      common/scan.js
  6. 2
      common/style/new_style.css
  7. 8
      common/style/pdabasic.css
  8. 4
      mycomponents/item/itemDetailInfo.vue
  9. 6
      mycomponents/item/itemSelect.vue
  10. 6
      mycomponents/partCode/partCodeSelect.vue
  11. 8
      mycomponents/popup/selectList.vue
  12. 2
      mycomponents/record/recordComDetailCard.vue
  13. 8
      mycomponents/scan/winScanPackAndLocation.vue
  14. 2
      pages.json
  15. 2
      pages/container/coms/comContainerBindCard.vue
  16. 2
      pages/container/coms/comPalletRecord.vue
  17. 2
      pages/count/coms/comCountDetailCard.vue
  18. 6
      pages/count/job/countDetail.vue
  19. 6
      pages/count/record/countRecord.vue
  20. 2
      pages/customerReturn/coms/comReturnRecord.vue
  21. 10
      pages/deliver/coms/comDeliverRequestPopup.vue
  22. 2
      pages/deliver/coms/comScanDeliverPack.vue
  23. 2
      pages/deliver/job/deliverDetail.vue
  24. 12
      pages/demo/demo.vue
  25. 2
      pages/inspect/job/inspectResult.vue
  26. 2
      pages/issue-按批次推荐/coms/comIssueJobCard.vue
  27. 2
      pages/issue-按批次推荐/coms/comScanIssuePack.vue
  28. 12
      pages/issue-按批次推荐/job/issueDetail.vue
  29. 2
      pages/issue/coms/comScanIssuePack.vue
  30. 2
      pages/issue/job/issueDetail.vue
  31. 4
      pages/issue/js/issue.js
  32. 4
      pages/issue/record/issueRecord.vue
  33. 2
      pages/package/coms/comOverRecord.vue
  34. 2
      pages/package/coms/comPackageRecord.vue
  35. 8
      pages/package/record/mergePackageRecord.vue
  36. 2
      pages/productDismantle/coms/comProductJobCard.vue
  37. 2
      pages/productDismantle/coms/comProductRecord.vue
  38. 2
      pages/productPutaway/coms/comProductRecord.vue
  39. 2
      pages/productReceipt/coms/comProductRecord.vue
  40. 2
      pages/productionReceipt/coms/comProductionRecord.vue
  41. 2
      pages/productionReturn/coms/comReturnRecord.vue
  42. 2
      pages/productionReturn/coms/comScanReturnPack.vue
  43. 2
      pages/query/container.vue
  44. 14
      pages/query/item.vue
  45. 16
      pages/query/item_copy.vue
  46. 2
      pages/repleinsh/coms/comScanReplishPack.vue
  47. 2
      pages/repleinsh/job/repleinshDetail.vue
  48. 2
      pages/repleinsh/record/repleinshRecord.vue
  49. 2
      pages/unPlanned/coms/comReceiptRecord.vue

16
api/index.js

@ -140,14 +140,14 @@ export const getBalancesAsync = (params) => promise(
}); });
//根据零件、箱码、托码、批次、库位类型、库存状态查询库存 //根据物料、箱码、托码、批次、库位类型、库存状态查询库存
export const getBalancesByFilter = (params) => request( export const getBalancesByFilter = (params) => request(
devUrl + "/api/pda/inventory/balances/by-balances-request-many-parameter", { devUrl + "/api/pda/inventory/balances/by-balances-request-many-parameter", {
method: 'post', method: 'post',
data: params data: params
}); });
//根据零件、箱码、托码、批次、库位类型、库存状态查询库存 //根据物料、箱码、托码、批次、库位类型、库存状态查询库存
export const getBalancesByFilterAsync = (params) => promise( export const getBalancesByFilterAsync = (params) => promise(
devUrl + "/api/pda/inventory/balances/by-balances-request-many-parameter", { devUrl + "/api/pda/inventory/balances/by-balances-request-many-parameter", {
method: 'post', method: 'post',
@ -170,7 +170,7 @@ export const getBalancesByStatus = (params) => request(
data: params data: params
}); });
//根据库位和零件号查询库存 //根据库位和物料号查询库存
export const getBalancesByLocationAndItem = (params) => request( export const getBalancesByLocationAndItem = (params) => request(
devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode + devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode +
"&itemCode=" + params.itemCode, { "&itemCode=" + params.itemCode, {
@ -179,7 +179,7 @@ export const getBalancesByLocationAndItem = (params) => request(
}); });
//根据库位和零件号查询库存 //根据库位和物料号查询库存
export const getBalancesByLocationAndItemAsync = (params) => promise( export const getBalancesByLocationAndItemAsync = (params) => promise(
devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode + devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode +
"&itemCode=" + params.itemCode, { "&itemCode=" + params.itemCode, {
@ -203,15 +203,15 @@ export const summary = (params) => request(
data: params data: params
}); });
//零件 //物料
//查询零件信息 //查询物料信息
export const getitems = (code) => request( export const getitems = (code) => request(
devUrl + "/api/pda/item/" + code, { devUrl + "/api/pda/item/" + code, {
method: 'get', method: 'get',
data: code data: code
}); });
//根据库位查询零件 //根据库位查询物料
export const getItemsByLocation = (params) => promise( export const getItemsByLocation = (params) => promise(
devUrl + "/api/pda/inventory/balances/get-item-by-location", { devUrl + "/api/pda/inventory/balances/get-item-by-location", {
method: 'get', method: 'get',
@ -427,7 +427,7 @@ export const locationByType = (type) => request(
data: type data: type
}); });
//根据库位查询零件 //根据库位查询物料
export const getLocationByItem = (params) => promise( export const getLocationByItem = (params) => promise(
devUrl + "/api/pda/inventory/balances/get-location-by-item", { devUrl + "/api/pda/inventory/balances/get-location-by-item", {
method: 'get', method: 'get',

4
api/request2.js

@ -375,7 +375,7 @@ export function getBasicLocationByCode(code) {
/** /**
* 校验库位零件关系 * 校验库位物料关系
* @param {*} * @param {*}
* *
*/ */
@ -3509,7 +3509,7 @@ export function getBalanceByFilter(param) {
} }
/** /**
* 查询管理精度多个零件多个库位 * 查询管理精度多个物料多个库位
* @param {*} * @param {*}
* *
*/ */

6
common/basic.js

@ -476,7 +476,7 @@ export function getInspectReasonList(value) {
// else return '其他' // else return '其他'
// } // }
// //零件状态 // //物料状态
// export function getItemStatusStyle(val) { // export function getItemStatusStyle(val) {
// if (val == "wpztUNK") return 'item_unk' // if (val == "wpztUNK") return 'item_unk'
// else if (val == "wpztENABLE") return 'item_active' // else if (val == "wpztENABLE") return 'item_active'
@ -498,7 +498,7 @@ export function getInspectReasonList(value) {
// } // }
// //零件状态描述 // //物料状态描述
// export function getItemStatusDesc(val) { // export function getItemStatusDesc(val) {
// if (val == "wpztUNK") return '未知' // if (val == "wpztUNK") return '未知'
// else if (val == "wpztENABLE") return '可用' // else if (val == "wpztENABLE") return '可用'
@ -541,7 +541,7 @@ export function getInspectReasonList(value) {
// if (val == 0) return '未知' // if (val == 0) return '未知'
// else if (val == 1) return '库位盘点' // else if (val == 1) return '库位盘点'
// else if (val == 2) return '物品盘点' // else if (val == 2) return '物品盘点'
// else if (val == 3) return '库位零件盘点' // else if (val == 3) return '库位物料盘点'
// else return '其他' // else return '其他'
// } // }

2
common/classify.data.js

@ -1,7 +1,7 @@
export default [{ export default [{
"name": "库存查询", "name": "库存查询",
"children": [{ "children": [{
"name": "按零件查询库存", "name": "按物料查询库存",
"icon": "/static/menus/menu_search_lj.svg", "icon": "/static/menus/menu_search_lj.svg",
"url": "pages/query/item", "url": "pages/query/item",
"index": 1, "index": 1,

8
common/scan.js

@ -125,7 +125,7 @@ export function analyseScanInfo(scanMsg) {
//解析完工收货标签 //解析完工收货标签
//P2250229RAA;L220408;Q100;N62840610;SB0000107;UEA;DU571LS;FA;E2022-4-8 //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 物料号 //P:itemCode 物料号
//L:lot批次 //L:lot批次
@ -240,7 +240,7 @@ export function analyseProductLabelInfo(scanMsg) {
//解析天津mes标签 //解析天津mes标签
//1#2546319FL#254FL003#202207110009: //1#2546319FL#254FL003#202207110009:
//1.序号1,2.生产号2546311FL,3.零件号254FL004,4.批序号202207110009 //1.序号1,2.生产号2546311FL,3.物料号254FL004,4.批序号202207110009
export function analyseTJMesQRCode(scanMsg) { export function analyseTJMesQRCode(scanMsg) {
let scanResult = { let scanResult = {
success: false, success: false,
@ -269,7 +269,7 @@ export function analyseTJMesQRCode(scanMsg) {
seq: datas[0], //序号 seq: datas[0], //序号
produceNo: datas[1], //生产号 produceNo: datas[1], //生产号
// projectNo: datas[2], //项目号 // projectNo: datas[2], //项目号
itemCode: itemCode, //配置码(零件号) itemCode: itemCode, //配置码(物料号)
lot: datas[3], //批次 lot: datas[3], //批次
position: location //上层、下层 position: location //上层、下层
} }
@ -282,7 +282,7 @@ export function analyseTJMesQRCode(scanMsg) {
seq: seq, //序号 seq: seq, //序号
produceNo: 'N', //生产号 produceNo: 'N', //生产号
projectNo: 'N', //项目号 projectNo: 'N', //项目号
itemCode: 'N', //配置码(零件号) itemCode: 'N', //配置码(物料号)
lot: 'N', //批次 lot: 'N', //批次
position: '' position: ''
} }

2
common/style/new_style.css

@ -115,7 +115,7 @@ uni-page-head .uni-page-head__title {
} }
/* /*
零件状态 物料状态
未知可用隔离新增规划禁用 未知可用隔离新增规划禁用
*/ */

8
common/style/pdabasic.css

@ -417,7 +417,7 @@
/* //零件状态 /* //物料状态
export function getItemTypeStyle(val) { export function getItemTypeStyle(val) {
if (val == 0) return 'active' if (val == 0) return 'active'
else if (val == 1) return 'hold' else if (val == 1) return 'hold'
@ -428,7 +428,7 @@ export function getItemTypeStyle(val) {
} }
*/ */
/* 零件状态 */ /* 物料状态 */
.active { .active {
background-color: #5FCB94; background-color: #5FCB94;
color: #FFFFFF; color: #FFFFFF;
@ -460,7 +460,7 @@ export function getItemTypeStyle(val) {
font-weight: bolder; font-weight: bolder;
} }
/* 零件编号字体 */ /* 物料编号字体 */
.text-itemcode { .text-itemcode {
/* font-size: 26rpx; */ /* font-size: 26rpx; */
color: #000; color: #000;
@ -472,7 +472,7 @@ export function getItemTypeStyle(val) {
/* font-size: 22rpx; */ /* font-size: 22rpx; */
} }
/* 零件编号字体 */ /* 物料编号字体 */
.text-bolder { .text-bolder {
color: #000; color: #000;
font-weight: bolder; font-weight: bolder;

4
mycomponents/item/itemDetailInfo.vue

@ -2,11 +2,11 @@
<uni-popup ref="popup"> <uni-popup ref="popup">
<view class="uni-flex uni-column" style="background-color: white;width: 200px; height:60%;"> <view class="uni-flex uni-column" style="background-color: white;width: 200px; height:60%;">
<view class="uni-flex"> <view class="uni-flex">
<text>零件</text> <text>物料</text>
<text>{{dataContent.code}}</text> <text>{{dataContent.code}}</text>
</view> </view>
<view class="uni-flex"> <view class="uni-flex">
<text>零件名称</text> <text>物料名称</text>
<text>{{dataContent.name}}</text> <text>{{dataContent.name}}</text>
</view> </view>
<view class="uni-flex"> <view class="uni-flex">

6
mycomponents/item/itemSelect.vue

@ -1,9 +1,9 @@
<template> <template>
<view class="" style="background-color:#fff;"> <view class="" style="background-color:#fff;">
<view class="uni-flex uni-row" style="display: flex;align-items: center;"> <view class="uni-flex uni-row" style="display: flex;align-items: center;">
零件 物料
<uni-easyinput ref='scanInput' v-model="partCode" @confirm="confirmPartCode" @clear="clear" <uni-easyinput ref='scanInput' v-model="partCode" @confirm="confirmPartCode" @clear="clear"
style='font-size: 18px;padding: 10rpx 20rpx;' placeholder="请输入零件号" @iconClick=""> style='font-size: 18px;padding: 10rpx 20rpx;' placeholder="请输入物料号" @iconClick="">
</uni-easyinput> </uni-easyinput>
</view> </view>
<view class=""> <view class="">
@ -39,7 +39,7 @@
confirmPartCode() { confirmPartCode() {
if (this.partCode == '') { if (this.partCode == '') {
uni.showToast({ uni.showToast({
title: "请扫描零件" title: "请扫描物料"
}) })
return; return;
} }

6
mycomponents/partCode/partCodeSelect.vue

@ -1,9 +1,9 @@
<template> <template>
<view class="" style="background-color:#fff;"> <view class="" style="background-color:#fff;">
<view class="uni-flex uni-row" style="display: flex;align-items: center;"> <view class="uni-flex uni-row" style="display: flex;align-items: center;">
零件 物料
<uni-easyinput ref='scanInput' v-model="partCode" @confirm="confirmPartCode" @clear="clear" <uni-easyinput ref='scanInput' v-model="partCode" @confirm="confirmPartCode" @clear="clear"
style='font-size: 18px;padding: 10rpx 20rpx;' placeholder="请输入零件号" @iconClick=""> style='font-size: 18px;padding: 10rpx 20rpx;' placeholder="请输入物料号" @iconClick="">
</uni-easyinput> </uni-easyinput>
</view> </view>
<view class=""> <view class="">
@ -39,7 +39,7 @@
confirmPartCode() { confirmPartCode() {
if (this.partCode == '') { if (this.partCode == '') {
uni.showToast({ uni.showToast({
title: "请扫描零件" title: "请扫描物料"
}) })
return; return;
} }

8
mycomponents/popup/selectList.vue

@ -3,12 +3,12 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view class=""> <view class="">
<view class="uni-center" style="font-size: 40rpx;margin-top: 10rpx;margin-bottom: 10rpx;"> <view class="uni-center" style="font-size: 40rpx;margin-top: 10rpx;margin-bottom: 10rpx;">
选择零件 选择物料
</view> </view>
<u-line/> <u-line/>
<view style="margin: 20rpx;" v-for="(item, index) in showList" :key="index" > <view style="margin: 20rpx;" v-for="(item, index) in showList" :key="index" >
<view class="" style="padding: 10rpx;" @click="selectItem(item)"> <view class="" style="padding: 10rpx;" @click="selectItem(item)">
零件: {{item.itemCode}} 物料: {{item.itemCode}}
</view> </view>
<u-line/> <u-line/>
</view> </view>
@ -73,8 +73,8 @@
this.$forceUpdate() this.$forceUpdate()
this.$refs['popupItems'].open("center"); this.$refs['popupItems'].open("center");
} else { } else {
//线 //线
// this.showErrorMessage('线' + lineCode + ''); // this.showErrorMessage('线' + lineCode + '');
this.$refs['popupItems'].open("center"); this.$refs['popupItems'].open("center");
} }
}).catch(error => { }).catch(error => {

2
mycomponents/record/recordComDetailCard.vue

@ -129,7 +129,7 @@
methods: { methods: {
removeItem(e, dataContent) { removeItem(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

8
mycomponents/scan/winScanPackAndLocation.vue

@ -334,22 +334,22 @@
let status = getInventoryStatusDesc(this.inventoryStatus); let status = getInventoryStatusDesc(this.inventoryStatus);
switch (this.managementPrecision) { switch (this.managementPrecision) {
case 'BY_PACKAGING': case 'BY_PACKAGING':
condition = condition + '零件号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber + condition = condition + '物料号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber +
']<br>批次=[' + ']<br>批次=[' +
label.batch + label.batch +
']<br>库位=[' + this.fromLocationCode + ']' ']<br>库位=[' + this.fromLocationCode + ']'
break; break;
case 'BY_BATCH': case 'BY_BATCH':
condition = condition + '零件号=[' + label.itemCode + ']<br>批次=[' + condition = condition + '物料号=[' + label.itemCode + ']<br>批次=[' +
label.batch + label.batch +
']<br>库位=[' + this.fromLocationCode + ']' ']<br>库位=[' + this.fromLocationCode + ']'
break; break;
case 'BY_QUANTITY': case 'BY_QUANTITY':
condition = condition + '零件号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']' condition = condition + '物料号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']'
break; break;
case 'BY_UNIQUEID': case 'BY_UNIQUEID':
condition = condition + '零件号=[' + label.itemCode + ']' condition = condition + '物料号=[' + label.itemCode + ']'
break; break;
} }
if (this.inventoryStatus.length > 0) { if (this.inventoryStatus.length > 0) {

2
pages.json

@ -671,7 +671,7 @@
"path": "pages/query/item", "path": "pages/query/item",
"style": { "style": {
"enablePullDownRefresh": false, // "enablePullDownRefresh": false, //
"navigationBarTitleText": "按零件查询库存", "navigationBarTitleText": "按物料查询库存",
"titleNView": { "titleNView": {
"autoBackButton": "true", "autoBackButton": "true",
"buttons": [{}] "buttons": [{}]

2
pages/container/coms/comContainerBindCard.vue

@ -131,7 +131,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/container/coms/comPalletRecord.vue

@ -123,7 +123,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/count/coms/comCountDetailCard.vue

@ -97,7 +97,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

6
pages/count/job/countDetail.vue

@ -314,12 +314,12 @@
var inventoryStatus = result.balance.inventoryStatus; var inventoryStatus = result.balance.inventoryStatus;
var detail = this.detailSource.find(r => r.itemCode == itemCode); var detail = this.detailSource.find(r => r.itemCode == itemCode);
var itemEditInfo; var itemEditInfo;
// //
if (detail == undefined) { if (detail == undefined) {
// //
this.addNewItemCodeToList(result) this.addNewItemCodeToList(result)
} else { } else {
// //
itemEditInfo = detail.subList.find(item => { itemEditInfo = detail.subList.find(item => {
if (item.packingNumber == packingNumber && if (item.packingNumber == packingNumber &&

6
pages/count/record/countRecord.vue

@ -241,12 +241,12 @@
var itemCode = result.balance.itemCode; var itemCode = result.balance.itemCode;
var inventoryStatus = result.balance.inventoryStatus; var inventoryStatus = result.balance.inventoryStatus;
var detail = this.detailSource.find(r => r.itemCode == itemCode); var detail = this.detailSource.find(r => r.itemCode == itemCode);
// //
if (detail == undefined) { if (detail == undefined) {
// //
this.addNewItemCodeToList(result) this.addNewItemCodeToList(result)
} else { } else {
// //
this.itemEditInfo = detail.subList.find(item => { this.itemEditInfo = detail.subList.find(item => {
if (item.packingNumber == packingNumber && if (item.packingNumber == packingNumber &&

2
pages/customerReturn/coms/comReturnRecord.vue

@ -102,7 +102,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

10
pages/deliver/coms/comDeliverRequestPopup.vue

@ -26,10 +26,10 @@
<u-line /> <u-line />
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
<text>零件 : </text> <text>物料 : </text>
<view class="uni-flex u-col-center uni-row"> <view class="uni-flex u-col-center uni-row">
<u-input v-model="itemCode" :focus="itemCodeFocus" :border="true" <u-input v-model="itemCode" :focus="itemCodeFocus" :border="true"
placeholder="请输入需求零件" @confirm="itemCodeConfirm" /> placeholder="请输入需求物料" @confirm="itemCodeConfirm" />
<image src="/static/search.svg" mode="" <image src="/static/search.svg" mode=""
style=" width: 40rpx;height: 40rpx;margin-left: 10rpx;" @click="itemCodeClick"> style=" width: 40rpx;height: 40rpx;margin-left: 10rpx;" @click="itemCodeClick">
</image> </image>
@ -176,7 +176,7 @@
confirm() { confirm() {
if (this.itemCode == "" || !this.isCheckItemCode) { if (this.itemCode == "" || !this.isCheckItemCode) {
this.showErrorMessage("请输入零件", "itemCode") this.showErrorMessage("请输入物料", "itemCode")
return return
} }
if (this.qty == 0) { if (this.qty == 0) {
@ -194,7 +194,7 @@
}, },
checkItemCode() { checkItemCode() {
// //
getBasicItemByCode(this.itemCode).then(res => { getBasicItemByCode(this.itemCode).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.data != null && res.data.list.length > 0) { if (res.data != null && res.data.list.length > 0) {
@ -204,7 +204,7 @@
this.numberFocus = true this.numberFocus = true
this.uom = res.data.list[0].uom this.uom = res.data.list[0].uom
} else { } else {
this.showErrorMessage('未查找到零件【' + this.itemCode + '】', "itemCode"); this.showErrorMessage('未查找到物料【' + this.itemCode + '】', "itemCode");
} }
}).catch(error => { }).catch(error => {

2
pages/deliver/coms/comScanDeliverPack.vue

@ -243,7 +243,7 @@
let lot = result.label.batch; let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) { if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细', that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
res => { res => {
that.getfocus(); that.getfocus();
} }

2
pages/deliver/job/deliverDetail.vue

@ -302,7 +302,7 @@
cancel() { cancel() {
let that = this; let that = this;
this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的零件和目标库位信息?', res => { this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
if (res) { if (res) {
that.clearInfo(); that.clearInfo();
} }

12
pages/demo/demo.vue

@ -178,25 +178,25 @@
</view> </view>
<u-gap height="5" bg-color="#bbb"></u-gap> <u-gap height="5" bg-color="#bbb"></u-gap>
<!-- 零件组件 --> <!-- 物料组件 -->
<view> <view>
<view class="title-1"> <view class="title-1">
零件组件 物料组件
</view> </view>
<view class=""> <view class="">
<view class="title-2">零件 item</view> <view class="title-2">物料 item</view>
<view class="view-com"> <view class="view-com">
<view class="uni-flex uni-row "> <view class="uni-flex uni-row ">
<item :dataContent="detailDataContent"></item> <item :dataContent="detailDataContent"></item>
</view> </view>
</view> </view>
<view class="title-2">零件数量 itemQty</view> <view class="title-2">物料数量 itemQty</view>
<view class="view-com"> <view class="view-com">
<item-qty :dataContent="detailDataContent" :handleQty="recordDataContent.qty"></item-qty> <item-qty :dataContent="detailDataContent" :handleQty="recordDataContent.qty"></item-qty>
</view> </view>
<view class="title-2">零件数量 itemQty</view> <view class="title-2">物料数量 itemQty</view>
<view class="view-com"> <view class="view-com">
<partCodeSelect :list="list"></partCodeSelect> <partCodeSelect :list="list"></partCodeSelect>
</view> </view>
@ -309,7 +309,7 @@
</view> </view>
<view class=""> <view class="">
<view class="title-1"> <view class="title-1">
零件状态组件-itemStatus 物料状态组件-itemStatus
</view> </view>
<view class="uni-flex uni-row space-between" style="margin:20rpx"> <view class="uni-flex uni-row space-between" style="margin:20rpx">

2
pages/inspect/job/inspectResult.vue

@ -12,7 +12,7 @@
</view> </view>
<view class="pda-list-cell"> <view class="pda-list-cell">
<view class="pda-list-cell-left"> <view class="pda-list-cell-left">
<view class="uni-label">零件</view> <view class="uni-label">物料</view>
</view> </view>
<view class="pda-list-cell-db"> <view class="pda-list-cell-db">
<view class="uni-flex space-between"> <view class="uni-flex space-between">

2
pages/issue-按批次推荐/coms/comIssueJobCard.vue

@ -5,7 +5,7 @@
<view class="task_item"> <view class="task_item">
<view class="task_text"> <view class="task_text">
需求零件 : {{dataContent.itemCode}} 需求物料 : {{dataContent.itemCode}}
</view> </view>
<view class="task_text"> <view class="task_text">
需求库位 : {{dataContent.toLocationCode}} 需求库位 : {{dataContent.toLocationCode}}

2
pages/issue-按批次推荐/coms/comScanIssuePack.vue

@ -195,7 +195,7 @@
let item = that.requestLocation.Items.find(r => r.itemCode == itemCode); let item = that.requestLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) { if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细', that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
res => { res => {
that.getfocus(); that.getfocus();
} }

12
pages/issue-按批次推荐/job/issueDetail.vue

@ -196,7 +196,7 @@
return list; return list;
}, },
//: -> Items -> Locations-> Batchs -> Records //: -> Items -> Locations-> Batchs -> Records
createDetailInfo(location, detail) { createDetailInfo(location, detail) {
let that = this; let that = this;
var item = location.Items.find(r => var item = location.Items.find(r =>
@ -206,7 +206,7 @@
location.Items.push(item) location.Items.push(item)
} else { } else {
item.qty += detail.qty item.qty += detail.qty
// //
let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode); let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode);
if (location == undefined) { if (location == undefined) {
location = that.createLocationInfo(detail); location = that.createLocationInfo(detail);
@ -353,7 +353,7 @@
} else { } else {
let item = location.Items.find(r => r.itemCode == result.label.itemCode); let item = location.Items.find(r => r.itemCode == result.label.itemCode);
if (item == undefined || item == null) { if (item == undefined || item == null) {
this.showErrorMessage('未查找到零件【' + result.label.itemCode + '】的发料需求', callback => { this.showErrorMessage('未查找到物料【' + result.label.itemCode + '】的发料需求', callback => {
}) })
} else { } else {
@ -365,7 +365,7 @@
let bacth = this.createBatchInfo(result); let bacth = this.createBatchInfo(result);
item.Batchs.push(bacth); item.Batchs.push(bacth);
} else { } else {
this.showErrorMessage('未查找到零件【' + result.label.itemCode + '】对应的批次【' + result.label.batch + this.showErrorMessage('未查找到物料【' + result.label.itemCode + '】对应的批次【' + result.label.batch +
'】需求', callback => { '】需求', callback => {
}) })
@ -399,7 +399,7 @@
mask: true mask: true
}) })
let that = this; let that = this;
// //
let params = { let params = {
pageSize: 100, pageSize: 100,
pageIndex: 1, pageIndex: 1,
@ -554,7 +554,7 @@
cancel() { cancel() {
let that = this; let that = this;
showConfirmMsg('是否要清空已扫描的零件和目标库位信息?', confirm => { showConfirmMsg('是否要清空已扫描的物料和目标库位信息?', confirm => {
if (confirm) { if (confirm) {
that.clearInfo(); that.clearInfo();
} }

2
pages/issue/coms/comScanIssuePack.vue

@ -238,7 +238,7 @@
let lot = result.label.batch; let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) { if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细', that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
res => { res => {
that.getfocus(); that.getfocus();
} }

2
pages/issue/job/issueDetail.vue

@ -352,7 +352,7 @@
cancel() { cancel() {
let that = this; let that = this;
this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的零件和目标库位信息?', res => { this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
if (res) { if (res) {
that.clearInfo(); that.clearInfo();
} }

4
pages/issue/js/issue.js

@ -20,7 +20,7 @@ export function getDataSource(list, subList) {
return list; return list;
} }
//树形结构:需求库位 -> 零件Items -> 库位 Locations-> 批次Batchs -> 记录Records //树形结构:需求库位 -> 物料Items -> 库位 Locations-> 批次Batchs -> 记录Records
export function createDetailInfo(location, detail) { export function createDetailInfo(location, detail) {
var item = location.Items.find(r => var item = location.Items.find(r =>
r.itemCode == detail.itemCode) r.itemCode == detail.itemCode)
@ -29,7 +29,7 @@ export function createDetailInfo(location, detail) {
location.Items.push(item) location.Items.push(item)
} else { } else {
item.qty = calc.add(item.qty,detail.qty) item.qty = calc.add(item.qty,detail.qty)
//在零件下查找库位 //在物料下查找库位
let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode); let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode);
if (location == undefined) { if (location == undefined) {
location = createLocationInfo(detail); location = createLocationInfo(detail);

4
pages/issue/record/issueRecord.vue

@ -150,7 +150,7 @@
this.getRecommendInfo(item); this.getRecommendInfo(item);
} else { } else {
this.$refs.comMessage.showQuestionMessage('已经存在零件[' + item.itemCode + ']的需求信息,是否要修改?', res => { this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
if (res) { if (res) {
request.qty = item.qty; request.qty = item.qty;
that.detailSource.forEach(detail => { that.detailSource.forEach(detail => {
@ -383,7 +383,7 @@
}, },
// this.$refs.comMessage.showQuestionMessage('?', res => { // this.$refs.comMessage.showQuestionMessage('?', res => {
// if (res) { // if (res) {
// that.clearInfo(); // that.clearInfo();
// } // }

2
pages/package/coms/comOverRecord.vue

@ -123,7 +123,7 @@
methods: { methods: {
removeItem(e, dataContent) { removeItem(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/package/coms/comPackageRecord.vue

@ -124,7 +124,7 @@
methods: { methods: {
removeItem(e, dataContent) { removeItem(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

8
pages/package/record/mergePackageRecord.vue

@ -146,8 +146,8 @@
}) })
if (item == undefined) { if (item == undefined) {
if (this.currentItemCode != "" && this.currentItemCode != balance.itemCode) { if (this.currentItemCode != "" && this.currentItemCode != balance.itemCode) {
this.showErrorMessage("合包当前零件号[" + this.currentItemCode + "与扫描零件号[" + balance.itemCode + this.showErrorMessage("合包当前物料号[" + this.currentItemCode + "与扫描物料号[" + balance.itemCode +
"]不一致,请扫描相同零件号") "]不一致,请扫描相同物料号")
return; return;
} }
var itemp = createItemInfo(balance, pack); var itemp = createItemInfo(balance, pack);
@ -345,8 +345,8 @@
}, },
getToPackingNumber(result) { getToPackingNumber(result) {
if(this.currentItemCode!=result.label.itemCode){ if(this.currentItemCode!=result.label.itemCode){
this.showErrorMessage("合包当前零件号[" + this.currentItemCode + "与目标零件号[" + result.label.itemCode + this.showErrorMessage("合包当前物料号[" + this.currentItemCode + "与目标物料号[" + result.label.itemCode +
"]不一致,请扫描相同零件号") "]不一致,请扫描相同物料号")
return; return;
} }
this.toPackingNumber = result.label.packingNumber; this.toPackingNumber = result.label.packingNumber;

2
pages/productDismantle/coms/comProductJobCard.vue

@ -9,7 +9,7 @@
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
零件 : {{dataContent.itemCode}} 物料 : {{dataContent.itemCode}}
</view> </view>
</view> </view>

2
pages/productDismantle/coms/comProductRecord.vue

@ -115,7 +115,7 @@
methods: { methods: {
removeItem(e, dataContent) { removeItem(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/productPutaway/coms/comProductRecord.vue

@ -115,7 +115,7 @@
methods: { methods: {
removeItem(e, dataContent) { removeItem(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/productReceipt/coms/comProductRecord.vue

@ -121,7 +121,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/productionReceipt/coms/comProductionRecord.vue

@ -113,7 +113,7 @@
methods: { methods: {
removeItem(e,dataContent){ removeItem(e,dataContent){
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/productionReturn/coms/comReturnRecord.vue

@ -126,7 +126,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

2
pages/productionReturn/coms/comScanReturnPack.vue

@ -235,7 +235,7 @@
let lot = result.label.batch; let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) { if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细', that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
res => { res => {
that.getfocus(); that.getfocus();
} }

2
pages/query/container.vue

@ -133,7 +133,7 @@
this.containerInfo = res.data.list[0]; this.containerInfo = res.data.list[0];
this.tabChange(0) this.tabChange(0)
} else { } else {
this.showMessage('未查找到零件【' + code + '】'); this.showMessage('未查找到物料【' + code + '】');
} }
}).catch(error => { }).catch(error => {

14
pages/query/item.vue

@ -88,7 +88,7 @@
}, },
getScanCode(code) { getScanCode(code) {
if (code == "") { if (code == "") {
this.showMessage('零件号不能为空') this.showMessage('物料号不能为空')
return; return;
} }
this.itemCode = ''; this.itemCode = '';
@ -96,7 +96,7 @@
}, },
getItemInfo(code) { getItemInfo(code) {
uni.showLoading({ uni.showLoading({
title: "正在查询零件信息...", title: "正在查询物料信息...",
mask: true mask: true
}); });
@ -108,7 +108,7 @@
this.itemDetail = res.data.list[0]; this.itemDetail = res.data.list[0];
this.tabChange(0) this.tabChange(0)
} else { } else {
this.showMessage('未查找到零件【' + code + '】'); this.showMessage('未查找到物料【' + code + '】');
} }
}).catch(error => { }).catch(error => {
@ -136,7 +136,7 @@
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
} else { } else {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
@ -161,7 +161,7 @@
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
} else { } else {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
@ -201,7 +201,7 @@
if (res.data.total > 0) { if (res.data.total > 0) {
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
} else { } else {
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
@ -227,7 +227,7 @@
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
} else { } else {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);

16
pages/query/item_copy.vue

@ -134,7 +134,7 @@
}, },
getScanCode(code) { getScanCode(code) {
if (code == "") { if (code == "") {
this.showMessage('零件号不能为空') this.showMessage('物料号不能为空')
return; return;
} }
this.itemCode = ''; this.itemCode = '';
@ -145,7 +145,7 @@
}, },
getItemInfo(code) { getItemInfo(code) {
uni.showLoading({ uni.showLoading({
title: "正在查询零件信息...", title: "正在查询物料信息...",
mask: true mask: true
}); });
@ -157,7 +157,7 @@
this.itemDetail = res.data.list[0]; this.itemDetail = res.data.list[0];
this.getContentByTab(this.tabIndex); this.getContentByTab(this.tabIndex);
} else { } else {
this.showMessage('未查找到零件【' + code + '】'); this.showMessage('未查找到物料【' + code + '】');
} }
}).catch(error => { }).catch(error => {
@ -179,7 +179,7 @@
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.summarys = res.data.list; this.summarys = res.data.list;
} else { } else {
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
uni.hideLoading(); uni.hideLoading();
@ -198,7 +198,7 @@
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.balances = res.data.list; this.balances = res.data.list;
} else { } else {
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
uni.hideLoading(); uni.hideLoading();
@ -218,7 +218,7 @@
let params = { let params = {
pageSize: that.pageSize, pageSize: that.pageSize,
pageIndex: that.pageCurrent, pageIndex: that.pageCurrent,
itemCode: that.itemCode, // itemCode: that.itemCode, //
}; };
expectIn(params).then(res => { expectIn(params).then(res => {
this.occupieds = res.items; this.occupieds = res.items;
@ -255,7 +255,7 @@
if (res.data.total > 0) { if (res.data.total > 0) {
this.dataIn = res.data.list; this.dataIn = res.data.list;
} else { } else {
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
uni.hideLoading(); uni.hideLoading();
@ -275,7 +275,7 @@
if (res.data.total > 0) { if (res.data.total > 0) {
this.dataOut = res.data.list; this.dataOut = res.data.list;
} else { } else {
this.showMessage('未查找到零件【' + this.itemCode + '】'); this.showMessage('未查找到物料【' + this.itemCode + '】');
} }
}).catch(error => { }).catch(error => {
this.dataOut = ""; this.dataOut = "";

2
pages/repleinsh/coms/comScanReplishPack.vue

@ -235,7 +235,7 @@
let lot = result.label.batch; let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) { if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细', that.showErrorMessage('未查找到物料【' + itemCode + '】的发料明细',
res => { res => {
that.getfocus(); that.getfocus();
} }

2
pages/repleinsh/job/repleinshDetail.vue

@ -322,7 +322,7 @@
cancel() { cancel() {
let that = this; let that = this;
this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的零件和目标库位信息?', res => { this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
if (res) { if (res) {
that.clearInfo(); that.clearInfo();
} }

2
pages/repleinsh/record/repleinshRecord.vue

@ -180,7 +180,7 @@
this.getRecommendInfo(item); this.getRecommendInfo(item);
} else { } else {
this.$refs.comMessage.showQuestionMessage('已经存在零件[' + item.itemCode + ']的需求信息,是否要修改?', res => { this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
if (res) { if (res) {
request.qty = item.qty; request.qty = item.qty;
that.detailSource.forEach(detail => { that.detailSource.forEach(detail => {

2
pages/unPlanned/coms/comReceiptRecord.vue

@ -126,7 +126,7 @@
methods: { methods: {
removeData(e, dataContent) { removeData(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == "清空") {
this.$refs.comMessage.showQuestionMessage("确定清空零件及箱码信息?", this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => { res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')

Loading…
Cancel
Save