sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_online_20240829
lijuncheng 5 months ago
parent
65984a7747 f48c13b295
commit
e2f56a429a
11 changed files with 118 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.hella13
  2. 2
      .env.hella14
  3. 2
      .env.hella15
  4. 2
      .env.hella16
  5. 2
      .env.hella8
  6. 2
      .env.hella9
  7. 2
      .env.production
  8. 2
      .env.test
  9. 2
      src/mycomponents/item/itemCompareQty.vue
  10. 44
      src/mycomponents/scan/winScanPackAndLocation.vue
  11. 147
      src/pages/purchaseReturn/job/returnDetail.vue

2
.env.hella13
View File

@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
VITE_TENANT='[{"text":"长春","value":1}]' VITE_TENANT='[{"text":"长春","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'

2
.env.hella14
View File

@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
VITE_TENANT='[{"text":"长春","value":1}]' VITE_TENANT='[{"text":"长春","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'

2
.env.hella15
View File

@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api
VITE_TENANT='[{"text":"长春","value":1}]' VITE_TENANT='[{"text":"长春","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com' VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com'

2
.env.hella16
View File

@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com' VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com'

2
.env.hella8
View File

@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
VITE_TENANT='[{"text":"成都","value":2}]' VITE_TENANT='[{"text":"成都","value":2}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径

2
.env.hella9
View File

@ -5,7 +5,7 @@ VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
VITE_TENANT='[{"text":"成都","value":2}]' VITE_TENANT='[{"text":"成都","value":2}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'

2
.env.production
View File

@ -1,7 +1,7 @@
VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'

2
.env.test
View File

@ -6,7 +6,7 @@ VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'

2
src/mycomponents/item/itemCompareQty.vue
View File

@ -3,7 +3,7 @@
<view> <view>
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>
<view style="word-break: break-all;width: 30%;display: flex;justify-content:flex-end;margin-right: 10rpx;"> <view style="width: 30%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true" <recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"
:objTextStyle='objTextStyle'></recommend-qty> :objTextStyle='objTextStyle'></recommend-qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"

44
src/mycomponents/scan/winScanPackAndLocation.vue
View File

@ -88,7 +88,7 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
//不提示库存 //不提示库存错误
noShowBalanceMessage: { noShowBalanceMessage: {
type: Boolean, type: Boolean,
default: false default: false
@ -102,6 +102,10 @@
type: String, type: String,
default: "HPQ,HMQ" default: "HPQ,HMQ"
}, },
queryBalance: {
type: Boolean,
default: true
}
}, },
data() { data() {
return { return {
@ -246,23 +250,27 @@
checkPackage(result) { checkPackage(result) {
if (result.label != null) { if (result.label != null) {
this.scanResult = result; this.scanResult = result;
// uni.showLoading({ if (this.queryBalance == true) {
// title: '查询中...', // uni.showLoading({
// mask: true // title: '查询中...',
// }) // mask: true
getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses, // })
res => { getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
uni.hideLoading(); res => {
if (res.success) { uni.hideLoading();
this.managementPrecision = res.managementPrecision if (res.success) {
this.afterQueryBalance(res.data.list); this.managementPrecision = res.managementPrecision
} else { this.afterQueryBalance(res.data.list);
this.showErrorMessage(res.message, res => { } else {
this.packGetFocus(); this.showErrorMessage(res.message, res => {
}) this.packGetFocus();
} })
// uni.hideLoading(); }
}); // uni.hideLoading();
});
} else {
this.packCallBack(null);
}
} }
}, },

147
src/pages/purchaseReturn/job/returnDetail.vue
View File

@ -35,7 +35,7 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :queryBalance='false'></win-scan-pack-and-location>
<return-detail-info-popup ref="jobDetailPopup"></return-detail-info-popup> <return-detail-info-popup ref="jobDetailPopup"></return-detail-info-popup>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
@ -240,78 +240,95 @@
r.batch == batch && r.batch == batch &&
r.fromLocationCode == result.fromLocationCode r.fromLocationCode == result.fromLocationCode
}) })
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); // let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
//不存在提示 //不存在提示
if (itemDetail == undefined) { if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>未找到记录") .fromLocationCode + "】<br>未找到明细")
return; return;
} else { } else {
itemDetail = detail.subList.find(r => { if (itemDetail.scaned) {
return r.packingNumber == packingNumber && this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
r.batch == batch && .fromLocationCode + "】已经扫描")
r.fromLocationCode == result.fromLocationCode && return;
r.inventoryStatus == result.balance.inventoryStatus
})
//箱码、批次、库位、状态不一致
if (itemDetail == undefined) {
itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber &&
r.batch == batch &&
r.fromLocationCode == result.fromLocationCode
})
if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
return;
}
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续退货?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.inventoryStatus =result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.packQty = result.package.packQty
itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
} else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
});
}
} else { } else {
// 箱码、批次、库位、状态一致 itemDetail.scaned = true;
if (itemDetail.scaned) { itemDetail.handleQty = Number(result.label.qty);
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描") itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
return;
} else { // itemDetail.balance = result.balance;
itemDetail.scaned = true; // itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.handleQty = Number(result.balance.qty); // itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus; // itemDetail.balance.packUnit = result.package.packUnit
itemDetail.inventoryStatus =result.balance.inventoryStatus; // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; // itemDetail.inventoryStatus =result.balance.inventoryStatus;
itemDetail.balance.balanceQty = Number(result.balance.qty); // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.packQty = Number(result.package.packQty) // itemDetail.inventoryStatus =result.balance.inventoryStatus;
itemDetail.balance.packUnit = result.package.packUnit // itemDetail.balance = result.balance;
this.calcHandleQty(); // itemDetail.balance.balanceQty = Number(result.balance.qty);
} // itemDetail.balance.packQty = Number(result.package.packQty)
// itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty();
} }
// if (itemDetail == undefined) {
// itemDetail = detail.subList.find(r => {
// return r.packingNumber == packingNumber &&
// r.batch == batch &&
// r.fromLocationCode == result.fromLocationCode
// })
// if (itemDetail.scaned) {
// this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
// .fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
// return;
// }
// let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
// if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
// this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
// ']不一致,是否继续退货?', res => {
// if (res) {
// itemDetail.scaned = true;
// itemDetail.handleQty = Number(result.balance.qty);
// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
// itemDetail.inventoryStatus =result.balance.inventoryStatus;
// itemDetail.balance = result.balance;
// itemDetail.balance.balanceQty = result.balance.qty;
// itemDetail.balance.packQty = result.package.packQty
// itemDetail.balance.packUnit = result.package.packUnit
// this.calcHandleQty();
// } else {
// this.scanPopupGetFocus();
// }
// });
// } else {
// this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
// itemStatus +
// ']不一致,不允许转移!', res => {
// this.scanPopupGetFocus();
// });
// }
// } else {
// // 箱码、批次、库位、状态一致
// if (itemDetail.scaned) {
// this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
// .fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
// return;
// } else {
// itemDetail.scaned = true;
// itemDetail.handleQty = Number(result.balance.qty);
// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
// itemDetail.inventoryStatus =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();
// }
// }
} }
} }

Write Preview
Loading…
Cancel
Save