diff --git a/SC-boot/.gradle/6.1/executionHistory/executionHistory.lock b/SC-boot/.gradle/6.1/executionHistory/executionHistory.lock new file mode 100644 index 00000000..b95cf384 Binary files /dev/null and b/SC-boot/.gradle/6.1/executionHistory/executionHistory.lock differ diff --git a/SC-boot/.gradle/6.1/fileChanges/last-build.bin b/SC-boot/.gradle/6.1/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/SC-boot/.gradle/6.1/fileChanges/last-build.bin differ diff --git a/SC-boot/.gradle/6.1/fileHashes/fileHashes.lock b/SC-boot/.gradle/6.1/fileHashes/fileHashes.lock new file mode 100644 index 00000000..99642762 Binary files /dev/null and b/SC-boot/.gradle/6.1/fileHashes/fileHashes.lock differ diff --git a/SC-boot/.gradle/6.1/gc.properties b/SC-boot/.gradle/6.1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/SC-boot/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/SC-boot/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 00000000..ab94d81e Binary files /dev/null and b/SC-boot/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/SC-boot/.gradle/buildOutputCleanup/cache.properties b/SC-boot/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..7dc3b20e --- /dev/null +++ b/SC-boot/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Apr 04 18:09:06 CST 2023 +gradle.version=6.1 diff --git a/SC-boot/.gradle/checksums/checksums.lock b/SC-boot/.gradle/checksums/checksums.lock new file mode 100644 index 00000000..9e492a2a Binary files /dev/null and b/SC-boot/.gradle/checksums/checksums.lock differ diff --git a/SC-boot/.gradle/vcs-1/gc.properties b/SC-boot/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java index e8e92ea5..2a278869 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.Jg_natural.entity.Jg_naturalEntity; @@ -19,6 +20,8 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -63,6 +66,9 @@ public class Jg_naturalController { @Autowired private Jg_naturalService jg_naturalService; + @Autowired + private PoundlistService poundlistService; + /** * 列表 @@ -302,6 +308,12 @@ public class Jg_naturalController { @Transactional public ActionResult delete(@PathVariable("id") String id) { Jg_naturalEntity entity = jg_naturalService.getInfo(id); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id); + List poundlistEntityList = poundlistService.list(queryWrapper); + if (poundlistEntityList.size()>0){ + return ActionResult.fail("该业务员已被使用,无法删除"); + } if (entity != null) { jg_naturalService.delete(entity); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 2c0dc76d..863ae28f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -147,8 +147,7 @@ public class PoundlistController { }else{ return ActionResult.success(list); } - } - else { + }else { return ActionResult.fail("当前状态不能生成销售订单"); } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 20eaf7e5..29ffc78a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -359,7 +359,11 @@ public class PurchaseorderController { // cn.hutool.core.io.FileUtil.del(temporaryFile); // FileUtil.upFile(file, filePath, fileName); DownloadVO vo = DownloadVO.builder().build(); - vo.setName(String.valueOf(resultList.get(0))); + + Optional> userOptional = Optional.ofNullable(resultList); + userOptional.ifPresent(o -> vo.setName(String.valueOf(o.get(0)))); + + //vo.setName(String.valueOf(resultList.get(0))); return ActionResult.success(vo); } else { return ActionResult.fail("选择文件不符合导入"); @@ -983,4 +987,4 @@ public class PurchaseorderController { } return ActionResult.success("删除成功"); } -} +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 49d28844..56d13915 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -34,6 +34,8 @@ import jnpf.materialvo.service.MaterialService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; +import jnpf.purchaseorder.entity.PurchaseorderitemEntity; +import jnpf.purchaseorder.service.PurchaseorderitemService; import jnpf.receiptin.entity.Receiptin_item0Entity; import jnpf.receiptin.service.Receiptin_item0Service; import jnpf.receiptout.entity.ReceiptoutEntity; @@ -166,6 +168,8 @@ public class SaleorderitemController { private CustomerService customerService; @Autowired private VehicleService vehicleService; + @Autowired + private PurchaseorderitemService purchaseorderitemService; /** * 修改磅单单价 @@ -540,36 +544,15 @@ public class SaleorderitemController { entitys.setSalesOrderId(entity.getId()); salesorder_item0Service.save(entitys); } -/* List ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class); - for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSourceNo(entity.getDocumentNo()); - receiptoutsoitemService.save(entitys); - } - List Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class); - for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderNo(entity.getDocumentNo()); - arinvoices_item0soitemService.save(entitys); - } - List CollectionsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getCollectionsoitemList(),CollectionsoitemEntity.class); - for(CollectionsoitemEntity entitys : CollectionsoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderNo(entity.getDocumentNo()); - collectionsoitemService.save(entitys); - } - List SalesbacksoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class); - for(SalesbacksoitemEntity entitys : SalesbacksoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderId(entity.getId()); - salesbacksoitemService.save(entitys); + if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ + if (StringUtils.isNotEmpty(saleorderitemCrForm.getPurchaseOrderId())){ + PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(saleorderitemCrForm.getPurchaseOrderId()); + if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){ + purchaseorderitemEntity.setIsTransfer("1"); + purchaseorderitemService.updateById(purchaseorderitemEntity); + } + } } - List PaymentsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getPaymentsoitemList(),PaymentsoitemEntity.class); - for(PaymentsoitemEntity entitys : PaymentsoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setPaymentno(entity.getDocumentNo()); - paymentsoitemService.save(entitys); - }*/ return ActionResult.success("创建成功"); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java index 0d902151..8fe729d6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java @@ -130,5 +130,10 @@ public class SaleorderitemCrForm { @TableField("bidSection") private String bidSection; + @TableField("isTransfer") + private String isTransfer; + @TableField("purchaseOrderId") + private String purchaseOrderId; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index 4a2b81e1..87653e32 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -745,9 +745,9 @@ public class TradeuploadController { public ActionResult info(@PathVariable("id") String id){ TradeuploadEntity entity= tradeuploadService.getInfo(id); TradeuploadInfoVO vo=JsonUtil.getJsonToBean(entity, TradeuploadInfoVO.class); -// if(vo.getCreatorTime()!=null){ -// vo.setCreatorTime(vo.getCreatorTime()); -// } + if(vo.getCreatorTime()!=null){ + vo.setCreatorTime(vo.getCreatorTime()); + } // vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace())); //子表 //副表 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java index b35d251c..87400ac4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.base.ActionResult; @@ -15,6 +16,8 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -63,6 +66,9 @@ public class VehicleController { @Autowired private VehicleService vehicleService; + @Autowired + private PoundlistService poundlistService; + @@ -317,9 +323,14 @@ public class VehicleController { @Transactional public ActionResult delete(@PathVariable("id") String id){ VehicleEntity entity= vehicleService.getInfo(id); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id); + List poundlistEntityList = poundlistService.list(queryWrapper); + if (poundlistEntityList.size()>0){ + return ActionResult.fail("该车辆已被使用,无法删除"); + } if(entity!=null){ vehicleService.delete(entity); - } return ActionResult.success("删除成功"); } diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index 2a285f4d..248abec3 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -403,10 +403,11 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { debugger - // this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) + // this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 debugger - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } @@ -420,7 +421,8 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue index 87ad23ce..30bc46c9 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue @@ -613,8 +613,12 @@ this.dataForm.invoicesitem0List.forEach((model, i) => { invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount); if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) } }) this.dataForm.invoiceAmount = invoiceAmount @@ -628,8 +632,14 @@ }) this.dataForm.invoicesitem0List.forEach((model, i) => { if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) + // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model.fullName,100))); + // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model.fullName),100) } }) }, diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index 1a832c64..8d0297a3 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -724,8 +724,9 @@ loading: false, isDetail: false, dataForm: { + isTransfer: '', + purchaseOrderId: '', documentNo: '', - contractId: '', customerId: '', contractName: '', @@ -999,6 +1000,8 @@ this.dataForm.contractNo = list[0].contractNo this.dataForm.contractName = list[0].contractName this.dataForm.customerName = list[0].customerName + this.dataForm.isTransfer = list.isTransfer + this.dataForm.purchaseOrderId = list .purchaseOrderId var num = 0 var amount = 0 var advance = 0 @@ -1009,7 +1012,7 @@ this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement) this.rateOptions.find((item) => { if (this.dataForm.salesorder_item0List[i].rate == item.id) { - this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price, (100 - item.fullName)), 100) + this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price, this.jnpf.floatAdd((1, this.jnpf.floatDiv(item.fullName,100)))) notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice) } }) diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue index a2bee79d..af551068 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue @@ -578,8 +578,16 @@ this.dataForm.invoicesitem0List.forEach((model, i) => { invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount); if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) + // model.amountNotTax = model.invoiceAmount * taxRateName / 100; + // model.taxAmount = model.invoiceAmount - model.amountNotTax + // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1, this.jnpf.floatDiv(taxRateName,100))); + // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,taxRateName),100) } }) this.dataForm.invoiceAmount = invoiceAmount @@ -593,8 +601,16 @@ }) this.dataForm.invoicesitem0List.forEach((model, i) => { if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) + // model.amountNotTax = model.invoiceAmount * taxRateName / 100; + // model.taxAmount = model.invoiceAmount - model.amountNotTax + // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(taxRateName,100))); + // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,taxRateName),100) } }) }, diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index bc680dd8..947260ec 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -78,7 +78,7 @@ + @selection-change="handleSelectionChange" custom-column border show-summary :summary-method="getSummaries"> @@ -345,6 +345,31 @@ this.initData() }, methods: { + getSummaries(param) { + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计'; + return; + } + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value)) && (index === 6 || index === 7)) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return this.jnpf.floatAdd(prev,curr); + } else { + return prev; + } + }, 0); + } else { + sums[index] = ''; + } + }); + + return sums; + }, downLoadPDF(){ if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) { this.$message({ @@ -530,6 +555,20 @@ }) return } + var flag = true; + this.multipleSelectionItem.forEach((item,index) => { + if(item.isTransfer == '1'){ + flag = flase; + } + }) + if(!flag){ + this.$message({ + type: 'error', + message: '此订单已经转销售', + duration: 2500 + }) + return + } console.log('aaaaaaa', this.multipleSelectionItem) var ids = ''; this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{ @@ -538,13 +577,18 @@ if(ids.length > 0){ ids = ids.substring(0, ids.length - 1); } + debugger request({ url: `/api/poundlist/Poundlist/createsale/${ids}`, method: 'post' }).then(res => { var list = [] for (let i = 0; i < res.data.length; i++) { + // res.data[i].isTransfer = '1' + // res.data[i].purchaseOrderId = this.multipleSelectionItem[0].id let _data = res.data[i] + _data.isTransfer = '1' + _data.purchaseOrderId = this.multipleSelectionItem[0].id list.push(_data) } if (list.length>0) { diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue index ebcf7e30..758c482c 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue @@ -490,10 +490,11 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { debugger - // this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) + // this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 debugger - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } @@ -506,7 +507,8 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index f54ba701..07112418 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -25,7 +25,7 @@ + popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20" > @@ -216,7 +216,7 @@ 取 消 确 定 - + 继续上传 @@ -600,16 +600,16 @@ method: 'get' }).then(res => { this.dataInfo(res.data) - // this.dataForm.businessId = this.$store.state.user.userInfo.userId; - // this.dataForm.businessName = this.$store.state.user.userInfo.userName; - // this.dataForm.poundDate = new Date().getTime(); + this.dataForm.businessId = this.$store.state.user.userInfo.userId; + this.dataForm.businessName = this.$store.state.user.userInfo.userName; + this.dataForm.poundDate = new Date().getTime(); this.loading = false }); } else { this.clearData(this.dataForm) - // this.dataForm.businessId = this.$store.state.user.userInfo.userId; - // this.dataForm.businessName = this.$store.state.user.userInfo.userName; - // this.dataForm.poundDate = new Date(); + this.dataForm.businessId = this.$store.state.user.userInfo.userId; + this.dataForm.businessName = this.$store.state.user.userInfo.userName; + this.dataForm.poundDate = new Date().getTime(); } }); this.$store.commit('generator/UPDATE_RELATION_DATA', {}) diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue index f779ba1f..eac17aee 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue @@ -600,16 +600,16 @@ method: 'get' }).then(res => { this.dataInfo(res.data) - // this.dataForm.businessId = this.$store.state.user.userInfo.userId; - // this.dataForm.businessName = this.$store.state.user.userInfo.userName; - // this.dataForm.poundDate = new Date().getTime(); + this.dataForm.businessId = this.$store.state.user.userInfo.userId; + this.dataForm.businessName = this.$store.state.user.userInfo.userName; + this.dataForm.poundDate = new Date().getTime(); this.loading = false }); } else { this.clearData(this.dataForm) - // this.dataForm.businessId = this.$store.state.user.userInfo.userId; - // this.dataForm.businessName = this.$store.state.user.userInfo.userName; - // this.dataForm.poundDate = new Date(); + this.dataForm.businessId = this.$store.state.user.userInfo.userId; + this.dataForm.businessName = this.$store.state.user.userInfo.userName; + this.dataForm.poundDate = new Date().getTime(); } }); this.$store.commit('generator/UPDATE_RELATION_DATA', {}) diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue index 74b93388..78470155 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue @@ -155,7 +155,7 @@ width="200">