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 84668d6a..8e93b6a1 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 @@ -63,6 +63,7 @@ import jnpf.saleorder.entity.SalesbacksoitemEntity; import jnpf.saleorder.entity.Salesorder_item0Entity; import jnpf.supplier.entity.SupplierEntity; import jnpf.supplier.service.SupplierService; +import jnpf.tradeupload.model.tradeupload.TradeuploadUpForm; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -1264,25 +1265,28 @@ public class PurchaseorderController { * @param id * @return */ - @GetMapping("noadvance/{id}") - public ActionResult noAdvance(@PathVariable("id") String id) { + @PutMapping("noadvance/{id}") + @Transactional + public ActionResult noAdvance(@PathVariable("id") String id,@RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) throws DataException { PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id); - QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); - purchaseorder_item0QueryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId()); - purchaseorder_item0QueryWrapper.lambda().eq(Purchaseorder_item0Entity::getAdvance,0); - purchaseorder_item0QueryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId); - - List poundlistIdList = purchaseorder_item0Service.listObjs(purchaseorder_item0QueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - List poundlistList = poundlistService.listByIds(poundlistIdList); - if (poundlistList.size()>0){ + QueryWrapper poundlistEntityQueryWrapper=new QueryWrapper<>(); + poundlistEntityQueryWrapper.lambda().eq(PoundlistEntity::getPurchaseorderId,entity.getId()); + poundlistEntityQueryWrapper.lambda().eq(PoundlistEntity::getAdvance,0); + poundlistEntityQueryWrapper.lambda().select(PoundlistEntity::getId); + + List poundlistIdList = poundlistService.listObjs(poundlistEntityQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + + if (poundlistIdList.size()>0){ + List poundlistList = poundlistService.listByIds(poundlistIdList); for (PoundlistEntity poundlistEntity: poundlistList) { poundlistEntity.setIsCollection("1"); - poundlistEntity.setPaymentDate(new Date()); + poundlistEntity.setPaymentDate(purchaseorderUpForm.getPaymentDate()); +// poundlistEntity.setPaymentDate(new Date()); } poundlistService.updateBatchById(poundlistList); - return ActionResult.success("不垫资回款预收成功"); + return ActionResult.success("不垫资回款预收成功"); }else { - return ActionResult.success("没有不垫资回款预收"); + return ActionResult.fail("该订单没有不垫资回款预收"); } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java index d9b01aaa..621c189f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java @@ -11,6 +11,8 @@ import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel; import jnpf.purchaseorder.model.purchaseorder.PurchasebackitemModel; import jnpf.purchaseorder.model.purchaseorder.CollectionitemModel; import lombok.Data; + +import java.util.Date; import java.util.List; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; @@ -123,6 +125,9 @@ public class PurchaseorderUpForm{ @JsonProperty("paymentTime") private String paymentTime; + @JsonProperty("PaymentDate") + private Date PaymentDate; + /** 子表数据 **/ @JsonProperty("purchaseorder_item0List") private List purchaseorder_item0List; diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml index f1002f17..740e1b17 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml @@ -491,7 +491,7 @@ - + @@ -509,7 +509,7 @@ IFNULL( ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ), 0 - ) buckleWeightSum + ) buckleWeightSums FROM jg_poundlist a WHERE @@ -840,7 +840,7 @@ SELECT F_FullName AS FFullName, COUNT( b.id ) AS bangdan, SUM( - Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 6 )) AS settlement, + Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 3 )) AS settlement, SUM( b.amount ) AS amout, SUM( b.amount ) - c.pay_price AS notPaypalAmounts, c.pay_price AS paypalamounts diff --git a/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue b/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue index 7cd4779c..e3f1870b 100644 --- a/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue +++ b/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue @@ -82,9 +82,11 @@ export default { this.list.map((val) => { listCount.amout = listCount.amout + val.amout; listCount.bangdan = listCount.bangdan + val.bangdan; - listCount.notPaypalAmounts = Math.round(listCount.notPaypalAmounts*100)/100 + val.notPaypalAmounts; + // listCount.notPaypalAmounts = Math.round(listCount.notPaypalAmounts*100)/100 + val.notPaypalAmounts; listCount.paypalamounts = Math.round(listCount.paypalamounts*100)/100 + val.paypalamounts; - listCount.settlement = Math.round(listCount.settlement*100)/100 + val.settlement; + // listCount.settlement = Math.round(listCount.settlement*100)/100 + val.settlement; + listCount.settlement = listCount.settlement + val.settlement; + listCount.notPaypalAmounts = listCount.notPaypalAmounts + val.notPaypalAmounts; return val; }); this.list = [...this.list, listCount]; diff --git a/SC-web/src/views/dashboard/admin/index.vue b/SC-web/src/views/dashboard/admin/index.vue index 311468f8..779de8fd 100644 --- a/SC-web/src/views/dashboard/admin/index.vue +++ b/SC-web/src/views/dashboard/admin/index.vue @@ -44,7 +44,7 @@
  • 上货量(吨)

    - +

    • @@ -218,7 +218,6 @@ export default { this.tadayPoundist.poundNum = res.data.poundNum; this.tadayPoundist.purchaseAmountSum = res.data.purchaseAmountSum; this.tadayPoundist.salesAmountSum = res.data.salesAmountSum; - this.tadayPoundist.settlementSum = res.data.settlementSum; this.tadayPoundist.buckleWeightSum = res.data.buckleWeightSum; } }).catch(() => { @@ -232,7 +231,7 @@ export default { }, }).then(res => { if (res.code == 200) { - this.tadayPoundist.buckleWeightSum = res.data.buckleWeightSum; + this.tadayPoundist.buckleWeightSums = res.data.buckleWeightSums; this.tadayPoundist.bangdannum = res.data.bangdannum; } }).catch(() => { diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue index 3566e1e9..66383ee9 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue @@ -875,9 +875,9 @@ export default { this.initData(); }, resetAll() { - // for (let key in this.query) { - // this.query[key] = undefined - // } + for (let key in this.query) { + this.query[key] = undefined + } this.listQuery = { currentPage: 1, pageSize: 20, diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/AdvanceForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/AdvanceForm.vue new file mode 100644 index 00000000..39a49068 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/AdvanceForm.vue @@ -0,0 +1,1002 @@ + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index 7a3a52c3..be15401d 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -452,6 +452,7 @@ + { - this.$message({ - type: "success", - message: res.msg, - duration: 2500, - onClose: () => { - this.initData(); - }, - }); + + var id = undefined; + id= this.multipleSelectionItem[0].id + + // id = row.id; + + this.formVisible7 = true; + this.$nextTick(() => { + this.$refs.JNPFForm7.init(id); }); }, + // noAdvance(row, isDetail) { + // if ( + // !this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1 + // ) { + // this.$message({ + // type: "error", + // message: "请选择一条数据", + // duration: 2500, + // }); + // return; + // } + // const list = this.multipleSelectionItem.join(); + // this.formVisible7 = true; + // this.$nextTick(() => { + // this.$refs.JNPFForm7.init(list); + // }); + // request({ + // url: + // "/api/purchaseorder/Purchaseorder/" + + // this.multipleSelectionItem[0].id, + // method: "get", + // }).then((res) => { + // id = row.id; + // this.formVisible7 = true; + // this.$nextTick(() => { + // this.$refs.JNPFForm7.init(id ,isDetail); + // }); + // + // }); + // }, + guidangHandle() { if (!this.multipleSelectionItem.length) { @@ -1414,6 +1444,10 @@ export default { this.formVisible6 = false; if (isrRefresh) this.reset(); }, + refresh7(isrRefresh) { + this.formVisible7 = false; + if (isrRefresh) this.reset(); + }, colseFlow(isrRefresh) { this.flowVisible = false; if (isrRefresh) this.reset();