diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java index 16516021..b7fc54ae 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java @@ -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 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_item1queryWrapper = new QueryWrapper<>(); Arinvoices_item1queryWrapper.lambda().eq(Arinvoices_item1Entity::getArinvoicesId, entity.getId()); diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue index c1f491c8..cd1a0af8 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue @@ -28,7 +28,7 @@ 生成采购 - 生成销售 + 生成销售
@@ -118,6 +118,7 @@ +
@@ -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({ diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index fa989910..9e381fe3 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -874,6 +874,7 @@ this.dataForm.advanceAmount = advance; this.dataForm.num = num; this.dataForm.price = amount; + debugger this.$store.commit('generator/UPDATE_RELATION_DATA', {}) }, // 表单提交 diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue index 65fdbeec..b77b6a8b 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue @@ -371,7 +371,7 @@ debugger let sum = 0; for (let i =0;i 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] diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue index f28ff883..49898045 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue @@ -27,8 +27,8 @@ - + @@ -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;