yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
bawei 2 years ago
parent 6273645f61 4a89296ff4
commit a2ac5b4e57
7 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File

7
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
Unescape View File

@ -406,6 +406,13 @@ public class ArinvoicesController {
if(entity!=null){
ArinvoicesEntity subentity=JsonUtil.getJsonToBean(arinvoicesUpForm, ArinvoicesEntity.class);
arinvoicesService.update(id, subentity);
ArinvoicesEntity arinvoicesEntity= arinvoicesService.getInfo(id);
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,arinvoicesEntity.getSalesOrderId());
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
saleorderitemEntity.setInvoiceNum(arinvoicesEntity.getInvoiceQuantity());
saleorderitemEntity.setInvoiceAmount(arinvoicesEntity.getInvoiceAmount());
saleorderitemService.updateById(saleorderitemEntity);
QueryWrapper<Arinvoices_item1Entity> Arinvoices_item1queryWrapper = new QueryWrapper<>();
Arinvoices_item1queryWrapper.lambda().eq(Arinvoices_item1Entity::getArinvoicesId, entity.getId());

7
SC-web/src/views/scm/basicInformation/poundlist/index.vue
Unescape View File

@ -28,7 +28,7 @@
</el-button>
<el-button type="text" icon="el-icon-check" @click="handleBatchCaigou()">生成采购
</el-button>
<el-button type="text" icon="el-icon-close" @click="handleBatchXiaoshou()">生成销售
<el-button type="text" icon="el-icon-close" @click="createSale()">生成销售
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -118,6 +118,7 @@
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<JNPF-Form2 v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2" />
<JNPF-Form3 v-if="formVisible3" ref="JNPFForm3" @refresh="refresh3" />
<JNPF-Form4 v-if="formVisible" ref="JNPFForm4" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
</div>
@ -131,6 +132,7 @@
import JNPFForm from './Form'
import JNPFForm2 from './PurchaseOrderForm'
import JNPFForm3 from './PurchaseOrderForm'
import JNPFForm4 from './salesForm'
import ExportBox from './ExportBox'
import {
getDataInterfaceRes
@ -142,6 +144,7 @@
JNPFForm,
JNPFForm2,
JNPFForm3,
JNPFForm4,
ExportBox,
Detail
},
@ -456,7 +459,7 @@
// this.list = _list
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm5.init(list)
this.$refs.JNPFForm4.init(list)
})
}else {
this.$message({

1
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
Unescape View File

@ -874,6 +874,7 @@
this.dataForm.advanceAmount = advance;
this.dataForm.num = num;
this.dataForm.price = amount;
debugger
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
// 表单提交

4
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -371,7 +371,7 @@
debugger
let sum = 0;
for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
sum = sum + this.dataForm.arinvoices_item0List[i].invoiceQuantity
sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].invoiceQuantity)
}
this.dataForm.invoiceQuantity = sum
debugger
@ -379,7 +379,7 @@
involceAmountSum(){
let sum = 0;
for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
sum = sum + this.dataForm.arinvoices_item0List[i].involceAmount
sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].involceAmount)
}
this.dataForm.invoiceAmount = sum
},

1
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -295,6 +295,7 @@ width="150" >
url: `/api/saleorder/Saleorderitem/delivery/${ids}`,
method: 'post'
}).then(res => {
debugger
const list = [];
for (let i = 0; i < res.data.length; i++) {
let _data = res.data[i]

6
SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
Unescape View File

@ -27,8 +27,8 @@
</el-col>
<el-col :span="8" >
<el-form-item label="来源单号"
prop="salesId" >
<popupSelect v-model="dataForm.salesId"
prop="sourceNo" >
<popupSelect v-model="dataForm.sourceNo"
placeholder="请选择" clearable field="salesId" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
@ -324,7 +324,7 @@
this.visible = true;
this.dataForm.amount = list[0].price;
this.dataForm.num = list[0].num;
this.dataForm.salesId = list[0].id;
this.dataForm.sourceNo = list[0].id;
this.dataForm.customerId = list[0].customerId;
debugger
this.dataForm.receiptout_item0List = list[0].list;

6
SC-web/src/views/system/menu/components/dataAuthorize/index.vue
Unescape View File

@ -30,7 +30,7 @@
<el-table-column prop="conditionText" label="过滤条件" />
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<tableOpts :editDisabled="scope.row.enCode === 'jnpf_alldata'"
<tableOpts :editDisabled="scope.row.enCode === 'linkage_alldata'"
@edit="addOrUpdateHandle(scope.row.id)" @del="handleDel(scope.row.id)" />
</template>
</el-table-column>
@ -242,7 +242,7 @@ export default {
},
addHandle() {
let isAllData = this.dataAuthorizeSchemeList.filter(
o => o.enCode === "jnpf_alldata"
o => o.enCode === "linkage_alldata"
);
if (!!isAllData.length)
return this.$message({
@ -253,7 +253,7 @@ export default {
if (this.tabActiveName === "dataAuthorizeScheme") {
let data = {
moduleId: this.moduleId,
enCode: "jnpf_alldata",
enCode: "linkage_alldata",
fullName: "全部数据"
};
createDataScheme(data)

Write Preview
Loading…
Cancel
Save