@@ -1839,6 +1856,7 @@ export default {
purchaseOrderMultiple: e.purchaseOrderMultiple,
businessNum: e.businessNum,
businessPrice: e.businessPrice,
+ // salePrice:e.salePrice,
tax: e.inputTaxRate,
taxCount: e.taxCount,
}
@@ -2051,6 +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.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) //采购不含税总价
@@ -2285,6 +2304,7 @@ export default {
salesMainUnitId: '',
businessNum: undefined,
businessPrice: undefined,
+ salePrice: undefined,
tax: undefined,
taxCount: undefined,
notTaxPrice: undefined,
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
index 8be3f8de..aa2a8531 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
@@ -100,8 +100,13 @@
v-has="'btn_batchRemove'">批量删除
-->
生成销售订单
+ @click="addSaleHandle()">合并生成销售订单
+
+ 不合并生成销售订单
+
+
@@ -592,6 +597,47 @@ export default {
this.flowListVisible = true
}
},
+
+
+ addSaleHandle1() {
+ if (!this.multipleSelectionItem.length) {
+ this.$message({
+ type: 'error',
+ message: '请选择一条数据',
+ duration: 1500,
+ })
+ return
+ }
+ const data = this.multipleSelectionItem
+ let selectData = []
+ selectData = JSON.parse(JSON.stringify(data))
+ const firstData = selectData[0]
+ selectData.forEach((item, index) => {
+ if (item.saleContractNo !== firstData.saleContractNo) {
+ this.$message({
+ type: 'error',
+ message: '订单' + item.code + '与订单' + firstData.code + '的销售合同号不一致',
+ duration: 1500,
+ })
+ }
+ if (item.isTransfer == '2') {
+ this.$message({
+ type: 'error',
+ message: '订单' + item.code + '已经生成过销售订单',
+ duration: 1500,
+ })
+ }
+ })
+ selectData.flag = '采购转销售1'
+ if (!this.saleFlowList.length) {
+ this.$message({ type: 'error', message: '流程不存在' });
+ } else if (this.saleFlowList.length === 1) {
+ this.selectSaleFlow(this.saleFlowList[0], selectData)
+ } else {
+ this.flowListVisible = true
+ }
+ },
+
selectSaleFlow(item, selectData) {
let data = {
id: '',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
index d4bf5410..a7a99a33 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
@@ -1996,14 +1996,31 @@ export default {
notTaxCount: 0,
lastSalePrice: item.lastSalePrice,
ordLn: item.ordLn,
+ businessPrice: item.salePrice,
}
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)
+ // console.log(price1, 'price1', price2, 'price2', prices, 'prices');
+ 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)
+
+ // floatMul
} else {
// this.dataForm.businessOrderProductRelationalList.push(item)
let item1 = {
@@ -2024,6 +2041,8 @@ export default {
notTaxCount: 0,
lastSalePrice: item.lastSalePrice,
ordLn: item.ordLn,
+ businessPrice: item.salePrice,
+
}
this.dataForm.businessOrderProductRelationalList.push(item1)
@@ -2031,6 +2050,79 @@ export default {
}
})
})
+ } else if (data.flag == '采购转销售1') {
+
+ this.productCreate = true
+ this.dataForm.orderType = '3'
+ this.dataForm.businessLineId = data[0].businessLineId
+ this.dataForm.counterpartOrderCode = data[0].counterpartOrderCode
+ this.dataForm.urgentOrder = data[0].urgentOrder
+ this.dataForm.deliveryType = data[0].deliveryType
+ this.dataForm.saleContractNo = data[0].saleContractNo
+ data.forEach((val, index) => {
+ this.dataForm.isTransferSource.push(val.id)
+ val.businessOrderProductRelationalList.forEach((item, index) => {
+
+ if (this.dataForm.businessOrderProductRelationalList.length == 0) {
+ // this.dataForm.businessOrderProductRelationalList.push(item);
+ let item1 = {
+ productId: item.productId,
+ businessNum: item.businessNum,
+ businessPrice: undefined,
+ name: item.name,
+ spec: item.spec,
+ code: item.code,
+ inventoryUnitId: item.inventoryUnitId,
+ realBound: item.realBound,
+ useBound: item.useBound,
+ saleNumDay: item.saleNumDay,
+ salesMainUnitId: item.salesMainUnitId,
+ tax: item.tax,
+ taxCount: 0,
+ notTaxPrice: 0,
+ notTaxCount: 0,
+ lastSalePrice: item.lastSalePrice,
+ ordLn: item.ordLn,
+ businessPrice: item.salePrice,
+
+ }
+ this.dataForm.businessOrderProductRelationalList.push(item1)
+
+
+ } else {
+ // const product = this.dataForm.businessOrderProductRelationalList.find(net => net.productId == item.productId)
+ // if (product) {
+ // product.businessNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
+ // } else {
+ // this.dataForm.businessOrderProductRelationalList.push(item)
+ let item1 = {
+ productId: item.productId,
+ businessNum: item.businessNum,
+ businessPrice: undefined,
+ name: item.name,
+ spec: item.spec,
+ code: item.code,
+ inventoryUnitId: item.inventoryUnitId,
+ realBound: item.realBound,
+ useBound: item.useBound,
+ saleNumDay: item.saleNumDay,
+ salesMainUnitId: item.salesMainUnitId,
+ tax: item.tax,
+ taxCount: 0,
+ notTaxPrice: 0,
+ notTaxCount: 0,
+ lastSalePrice: item.lastSalePrice,
+ ordLn: item.ordLn,
+ businessPrice: item.salePrice,
+
+ }
+ this.dataForm.businessOrderProductRelationalList.push(item1)
+
+ // }
+ }
+ })
+ })
+
}
if (data.flag == '发货凭证生成销售订单') {
this.productCreate = true