yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购生成销售订单修改

Browse Source
jg-waiwang-pro
vayne 3 months ago
parent 065e9a52d1
commit bee34eae3a
5 changed files with 56 additions and 40 deletions
Show Stats Download Patch File Download Diff File

12
jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml
Unescape View File

@ -17,14 +17,14 @@ spring:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写)
# host: 222.71.165.188
host: 221.214.32.166
host: 222.71.165.188
# host: 221.214.32.166
port: 3309
username: root
# password: linus,.123
# db-name: jnpf_jigang_test
password: qawsed,.123
db-name: jnpf_init
password: linus,.123
db-name: jnpf_jigang_test
# password: qawsed,.123
# db-name: jnpf_init
db-schema: #金仓达梦选填
prepare-url: #自定义url

2
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
Unescape View File

@ -2069,7 +2069,7 @@ export default {
item.voucherProductId = item.voucherProductId
if (item.purchaseAmount !== 0) {
item.businessPrice = this.jnpf.floatDiv(item.purchaseAmount, item.netWeight).toFixed(6)
item.salePrice = this.jnpf.floatDiv(item.saleAmount, item.netWeight).toFixed(6)
item.salePrice = item.saleAmount
item.taxCount = this.jnpf.floatMul(item.businessNum, item.businessPrice).toFixed(2) //采购含税总价
item.notTaxPrice = this.jnpf.floatDiv(item.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6) //采购不含税单价
item.notTaxCount = this.jnpf.floatMul(item.businessNum, item.notTaxPrice).toFixed(2) //采购不含税总价

10
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
Unescape View File

@ -527,7 +527,7 @@ export default {
})
},
inBoundNotice(row) {
// if (row.erpMark != '200') {
// if (row.yunguanMark != 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
@ -608,6 +608,14 @@ export default {
})
return
}
if (this.multipleSelectionItem.length > 1) {
this.$message({
type: 'error',
message: '只能选择一条订单',
duration: 1500,
})
return
}
const data = this.multipleSelectionItem
let selectData = []
selectData = JSON.parse(JSON.stringify(data))

70
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
Unescape View File

@ -1991,36 +1991,42 @@ export default {
saleNumDay: item.saleNumDay,
salesMainUnitId: item.salesMainUnitId,
tax: item.tax,
taxCount: 0,
notTaxPrice: 0,
notTaxCount: 0,
taxCount: item.salePrice, //销售含税小计,,
lastSalePrice: item.lastSalePrice,
ordLn: item.ordLn,
businessPrice: item.salePrice,
businessPrice: 0, //销售单价
notTaxPrice: 0, //销售不含税单价
notTaxCount: 0 //销售不含税总价
}
item1.businessPrice = this.jnpf.floatDiv(item.salePrice, item.businessNum).toFixed(6), //销售单价
item1.notTaxPrice = this.jnpf.floatDiv(item1.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6), //销售不含税单价
item1.notTaxCount = this.jnpf.floatMul(item.businessNum, item1.notTaxPrice).toFixed(2) //销售不含税总价
this.dataForm.businessOrderProductRelationalList.push(item1)
} else {
const product = this.dataForm.businessOrderProductRelationalList.find(net => net.productId == item.productId)
// console.log(item, product, '--------------');
if (product) {
// product.businessPrice = this.jnpf.floatAdd(product.businessPrice, item.salePrice)
// product.businessPrice = this.jnpf.floatDiv(product.businessPrice, product.businessNum)
// product.businessPrice = this.jnpf.floatDiv(item.businessPrice, item.businessNum)
// product.businessPrice = this.jnpf.floatDiv(this.jnpf.floatAdd(product.businessPrice, item.businessPrice), this.jnpf.floatAdd(product.businessNum, item.businessNum))
var price1 = this.jnpf.floatMul(product.businessPrice, product.businessNum)
var price2 = this.jnpf.floatMul(item.salePrice, item.businessNum)
var prices = this.jnpf.floatAdd(price1, price2)
// var price1 = this.jnpf.floatMul(product.businessPrice, product.businessNum)
// var price2 = this.jnpf.floatMul(item.salePrice, item.businessNum)
// var prices = this.jnpf.floatAdd(price1, price2)
// console.log(price1, 'price1', price2, 'price2', prices, 'prices');
var pricesNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
product.businessPrice = this.jnpf.floatDiv(prices, pricesNum)
// var pricesNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
// product.businessPrice = this.jnpf.floatDiv(prices, pricesNum)
// product.businessPrice = this.jnpf.floatDiv(this.jnpf.floatAdd(this.jnpf.floatMul(product.businessPrice, item.businessPrice), this.jnpf.floatMul(product.businessNum, item.businessNum)), product.businessNum)
product.businessNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
// product.businessNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
// floatMul
product.taxCount = this.jnpf.floatAdd(product.taxCount, item.salePrice) //含税小计合并
product.businessNum = this.jnpf.floatAdd(product.businessNum, item.businessNum) //数量合并
product.businessPrice = this.jnpf.floatDiv(product.taxCount, product.businessNum).toFixed(6) //销售单价
product.notTaxPrice = this.jnpf.floatDiv(product.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6) //销售不含税单价
product.notTaxCount = this.jnpf.floatMul(product.notTaxPrice, product.businessNum).toFixed(2) //销售不含税小计
} else {
// this.dataForm.businessOrderProductRelationalList.push(item)
let item1 = {
@ -2036,14 +2042,16 @@ export default {
saleNumDay: item.saleNumDay,
salesMainUnitId: item.salesMainUnitId,
tax: item.tax,
taxCount: 0,
notTaxPrice: 0,
notTaxCount: 0,
taxCount: item.salePrice, //销售含税小计,
lastSalePrice: item.lastSalePrice,
ordLn: item.ordLn,
businessPrice: item.salePrice,
businessPrice: 0, //销售单价
notTaxPrice: 0, //销售不含税单价
notTaxCount: 0 //销售不含税总价
}
item1.businessPrice = this.jnpf.floatDiv(item.salePrice, item.businessNum).toFixed(6), //销售单价
item1.notTaxPrice = this.jnpf.floatDiv(item1.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6), //销售不含税单价
item1.notTaxCount = this.jnpf.floatMul(item.businessNum, item1.notTaxPrice).toFixed(2) //销售不含税总价
this.dataForm.businessOrderProductRelationalList.push(item1)
}
@ -2068,7 +2076,6 @@ export default {
let item1 = {
productId: item.productId,
businessNum: item.businessNum,
businessPrice: undefined,
name: item.name,
spec: item.spec,
code: item.code,
@ -2078,17 +2085,17 @@ export default {
saleNumDay: item.saleNumDay,
salesMainUnitId: item.salesMainUnitId,
tax: item.tax,
taxCount: 0,
notTaxPrice: 0,
notTaxCount: 0,
taxCount: item.salePrice, //销售含税小计
lastSalePrice: item.lastSalePrice,
ordLn: item.ordLn,
businessPrice: item.salePrice,
businessPrice: 0, //销售单价
notTaxPrice: 0, //销售不含税单价
notTaxCount: 0 //销售不含税总价
}
item1.businessPrice = this.jnpf.floatDiv(item.salePrice, item.businessNum).toFixed(6), //销售单价
item1.notTaxPrice = this.jnpf.floatDiv(item1.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6), //销售不含税单价
item1.notTaxCount = this.jnpf.floatMul(item.businessNum, item1.notTaxPrice).toFixed(2) //销售不含税总价
this.dataForm.businessOrderProductRelationalList.push(item1)
} else {
// const product = this.dataForm.businessOrderProductRelationalList.find(net => net.productId == item.productId)
// if (product) {
@ -2098,7 +2105,6 @@ export default {
let item1 = {
productId: item.productId,
businessNum: item.businessNum,
businessPrice: undefined,
name: item.name,
spec: item.spec,
code: item.code,
@ -2108,14 +2114,16 @@ export default {
saleNumDay: item.saleNumDay,
salesMainUnitId: item.salesMainUnitId,
tax: item.tax,
taxCount: 0,
notTaxPrice: 0,
notTaxCount: 0,
taxCount: item.salePrice, //销售含税小计
lastSalePrice: item.lastSalePrice,
ordLn: item.ordLn,
businessPrice: item.salePrice,
businessPrice: 0, //销售单价
notTaxPrice: 0, //销售不含税单价
notTaxCount: 0 //销售不含税总价
}
item1.businessPrice = this.jnpf.floatDiv(item.salePrice, item.businessNum).toFixed(6), //销售单价
item1.notTaxPrice = this.jnpf.floatDiv(item1.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6), //销售不含税单价
item1.notTaxCount = this.jnpf.floatMul(item.businessNum, item1.notTaxPrice).toFixed(2) //销售不含税总价
this.dataForm.businessOrderProductRelationalList.push(item1)
// }

2
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
Unescape View File

@ -454,7 +454,7 @@ export default {
})
},
outBoundNotice(row) {
// if (row.erpMark != '200') {
// if (row.yunguanMark != 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',

Write Preview
Loading…
Cancel
Save