From 5a9f59d1728c28fd291251922336267cc30a7e2e Mon Sep 17 00:00:00 2001 From: tengxi <971623072@qq.com> Date: Mon, 13 Feb 2023 16:15:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/payment/entity/PaymentEntity.java | 10 +- .../jnpf/payment/mapper/PaymentMapper.java | 1 + .../controller/PaymentdocController.java | 99 +- .../model/paymentdoc/PaymentdocCrForms.java | 121 +++ SC-web/package-lock.json | 36 +- .../scm/basicInformation/areasetting/Form.vue | 63 +- .../scm/basicInformation/paymentdoc/Form.vue | 887 +++++++++--------- .../scm/basicInformation/paymentdoc/index.vue | 701 +++++++------- 8 files changed, 1075 insertions(+), 843 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForms.java diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java index afab1714..483230df 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java @@ -31,7 +31,7 @@ public class PaymentEntity { private String creatorUserName; @TableField("CREATOR_TIME") - private Date creatorTime; + private String creatorTime; @TableField("LAST_MODIFY_USER_ID") private String lastModifyUserId; @@ -40,7 +40,7 @@ public class PaymentEntity { private String lastModifyUserName; @TableField("LAST_MODIFY_TIME") - private Date lastModifyTime; + private String lastModifyTime; @TableField("DELETE_USER_ID") private String deleteUserId; @@ -49,7 +49,7 @@ public class PaymentEntity { private String deleteUserName; @TableField("DELETE_TIME") - private Date deleteTime; + private String deleteTime; @TableField("DELETE_MARK") private String deleteMark; @@ -73,10 +73,10 @@ public class PaymentEntity { private BigDecimal requestedamount; @TableField("BUSINESSDATE") - private Date businessdate; + private String businessdate; @TableField("DUEDATE") - private Date duedate; + private String duedate; @TableField("STATUS") private String status; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java index 004524dc..d484280e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java @@ -15,3 +15,4 @@ import jnpf.payment.entity.PaymentEntity; public interface PaymentMapper extends BaseMapper { } + diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index 7682cb7f..624dd289 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -13,23 +13,19 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; -import jnpf.collection.entity.CollectionEntity; -import jnpf.collection.service.CollectionService; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; import jnpf.payment.entity.PaymentEntity; +import jnpf.payment.entity.Payment_item0Entity; +import jnpf.payment.mapper.PaymentMapper; +import jnpf.payment.model.payment.PaymentCrForm; import jnpf.payment.service.PaymentService; +import jnpf.payment.service.Payment_item0Service; import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; import jnpf.paymentdoc.model.paymentdoc.*; import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination; -import jnpf.entity.*; import jnpf.paymentdoc.entity.Paymentdoc_item0Entity; import jnpf.util.*; -import jnpf.base.util.*; -import jnpf.base.vo.ListVO; -import jnpf.util.context.SpringContext; -import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import lombok.Cleanup; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -38,13 +34,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import jnpf.paymentdoc.entity.PaymentdocEntity; import jnpf.paymentdoc.service.PaymentdocService; -import jnpf.paymentdoc.entity.Paymentdoc_item0Entity; import jnpf.paymentdoc.service.Paymentdoc_item0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.multipart.MultipartFile; + import javax.validation.Valid; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import jnpf.util.GeneraterSwapUtil; @@ -83,6 +77,10 @@ public class PaymentdocController { private Paymentdoc_item0Service paymentdoc_item0Service; @Autowired private PaymentService paymentService; + @Autowired + private PaymentMapper paymentMapper; + @Autowired + private Payment_item0Service payment_item0Service; /** * 付款申请 @@ -90,25 +88,62 @@ public class PaymentdocController { * @param * @return */ -// @PostMapping("/paymentapplylist") -// public ActionResult paymentapplylist( @PathVariable("id") String id,@RequestBody @Valid PaymentdocCrForm paymentdocCrForm){ -// -// PaymentEntity paymentEntity = new PaymentEntity(); +// @GetMapping("/{id}") + @PostMapping("/paymentapplylist") + public ActionResult paymentapplylist(@RequestBody PaymentdocCrForms paymentdocCrForms) throws DataException { + + PaymentEntity paymentEntity = new PaymentEntity(); + + PaymentCrForm paymentCrForm =new PaymentCrForm(); // String mainId =RandomUtil.uuId(); // UserInfo userInfo=userProvider.get(); -// -// paymentEntity.setCreatorUserName(paymentdocCrForm.getCreatorUserName()); +// paymentEntity.setCreatorUserName(paymentdocUpForms.getCreatorUserName()); // paymentEntity.setCreatorTime(new Date()); -// -// PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class); + PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class); // entity.setId(mainId); -// paymentService.save(entity); -// -// -// paymentdocCrForm.setIsPay("1"); -// paymentdocService.update(paymentdocCrForm); -// return ActionResult.success("创建成功"); -// } + + PaymentdocEntity paymentdocEntity=paymentdocService.getById(paymentdocCrForms.getId()); + //添加到付款单 +// paymentEntity.setId(paymentdocUpForms.getId()); + + paymentEntity.setDocumentno(generaterSwapUtil.getBillNumber("payment" ,false)); + paymentEntity.setPaymentno(paymentdocCrForms.getDocumentNo()); + paymentEntity.setPaymentamount(paymentdocCrForms.getPaymentAmount()); + paymentEntity.setRequestedamount(paymentdocCrForms.getRamount()); + paymentEntity.setBusinessdate(paymentdocCrForms.getBusinessDate()); + paymentEntity.setDuedate(paymentdocCrForms.getDueDate()); + paymentEntity.setStatus(paymentdocCrForms.getStatus()); + paymentEntity.setSuppliercode(paymentdocCrForms.getSupplierCode()); + paymentEntity.setSuppliername(paymentdocCrForms.getSupplierName()); + paymentEntity.setCurrency(paymentCrForm.getCurrency()); + paymentEntity.setPaymenttype(paymentdocCrForms.getPaymentType()); + paymentEntity.setSettlementtype(paymentdocCrForms.getSettlementType()); + paymentEntity.setRemark(paymentdocCrForms.getRemark()); + paymentEntity.setCollectionaccount(paymentdocCrForms.getCollectionAccount()); + paymentEntity.setCollectionbank(paymentdocCrForms.getColectionBank()); + paymentEntity.setCreatorUserId(paymentdocCrForms.getCreatorUserId()); + paymentEntity.setCreatorUserName(paymentdocCrForms.getCreatorUserName()); + paymentEntity.setCreatorTime(paymentdocCrForms.getCreatorTime()); + paymentEntity.setLastModifyUserId(paymentdocCrForms.getLastModifyUserId()); + paymentEntity.setLastModifyUserName(paymentdocCrForms.getLastModifyUserName()); + paymentEntity.setLastModifyTime(paymentdocCrForms.getLastModifyTime()); + paymentMapper.insert(paymentEntity); + + //修改付款状态 + paymentdocEntity.setIsPay("1"); + paymentdocService.updateById(paymentdocEntity); + + //子表 + List Paymentdoc_item0List = JsonUtil.getJsonToList(paymentdocCrForms.getPaymentdoc_item0List(),Paymentdoc_item0Entity.class); + List Payment_item0List = JsonUtil.getJsonToList(paymentdocCrForms.getPayment_item0List(),Payment_item0Entity.class); + for(Payment_item0Entity entitys : Payment_item0List){ + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentId(entity.getId()); + payment_item0Service.save(entitys); + } + + return ActionResult.success("修改（付款）成功"); + } @@ -163,18 +198,6 @@ public class PaymentdocController { for(Paymentdoc_item0Entity entitys : Paymentdoc_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setPaymentdocId(entity.getId()); - - - - - - - - - - - - paymentdoc_item0Service.save(entitys); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForms.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForms.java new file mode 100644 index 00000000..770ab3b9 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForms.java @@ -0,0 +1,121 @@ + + +package jnpf.paymentdoc.model.paymentdoc; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jnpf.payment.entity.PaymentEntity; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + + +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-02-09 + */ +@Data +public class PaymentdocCrForms { + /** id **/ + @JsonProperty("id") + private String id; + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 供应商编码 **/ + @JsonProperty("supplierCode") + private String supplierCode; + + /** 供应商名称 **/ + @JsonProperty("supplierName") + private String supplierName; + + /** 付款类型 **/ + @JsonProperty("paymentType") + private String paymentType; + + /** 申请金额 **/ + @JsonProperty("ramount") + private BigDecimal ramount; + + /** 申请时间 **/ + @JsonProperty("businessDate") + private String businessDate; + + /** 应付日期 **/ + @JsonProperty("dueDate") + private String dueDate; + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + /** 收款账户 **/ + @JsonProperty("collectionAccount") + private String collectionAccount; + + /** 收款银行 **/ + @JsonProperty("colectionBank") + private String colectionBank; + + /** 结算类型 **/ + @JsonProperty("settlementType") + private String settlementType; + + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + /** 付款金额 **/ + @JsonProperty("paymentAmount") + private BigDecimal paymentAmount; + + /** 未付款金额 **/ + @JsonProperty("unpaymentAmount") + private String unpaymentAmount; + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 制单人id **/ + @JsonProperty("CreatorUserId") + private String CreatorUserId; + /** 制单人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 创建时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + + /** 修改人ID **/ + @JsonProperty("lastModifyUserId") + private String lastModifyUserId; + + /** 修改人名称 **/ + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; + + /** 修改时间 **/ + @JsonProperty("lastModifyTime") + private String lastModifyTime; + + @JsonProperty("isPay") + private String isPay; + + /** 子表数据 **/ + @JsonProperty("paymentdoc_item0List") + private List paymentdoc_item0List; + + /** 子表数据付款 **/ + @JsonProperty("payment_item0List") + private List payment_item0List; +} \ No newline at end of file diff --git a/SC-web/package-lock.json b/SC-web/package-lock.json index 5ce53f24..65a053cf 100644 --- a/SC-web/package-lock.json +++ b/SC-web/package-lock.json @@ -22463,7 +22463,8 @@ "@fullcalendar/bootstrap": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/@fullcalendar/bootstrap/-/bootstrap-4.4.2.tgz", - "integrity": "sha512-zxtQvpZqr7zeBCfszo/i1e4zCvGwLh2zOp8J6Wxw5s73HsB1zuftWop7sPO+qhRrhX5MdM9i/wr8/nNY8BZSmw==" + "integrity": "sha512-zxtQvpZqr7zeBCfszo/i1e4zCvGwLh2zOp8J6Wxw5s73HsB1zuftWop7sPO+qhRrhX5MdM9i/wr8/nNY8BZSmw==", + "requires": {} }, "@fullcalendar/core": { "version": "4.4.2", @@ -22473,12 +22474,14 @@ "@fullcalendar/daygrid": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-4.4.2.tgz", - "integrity": "sha512-axjfMhxEXHShV3r2TZjf+2niJ1C6LdAxkHKmg7mVq4jXtUQHOldU5XsjV0v2lUAt1urJBFi2zajfK8798ukL3Q==" + "integrity": "sha512-axjfMhxEXHShV3r2TZjf+2niJ1C6LdAxkHKmg7mVq4jXtUQHOldU5XsjV0v2lUAt1urJBFi2zajfK8798ukL3Q==", + "requires": {} }, "@fullcalendar/interaction": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-4.4.2.tgz", - "integrity": "sha512-3ItpGFnxcYQT4NClqhq93QTQwOI8x3mlMf5M4DgK5avVaSzpv9g8p+opqeotK2yzpFeINps06cuQyB1h7vcv1Q==" + "integrity": "sha512-3ItpGFnxcYQT4NClqhq93QTQwOI8x3mlMf5M4DgK5avVaSzpv9g8p+opqeotK2yzpFeINps06cuQyB1h7vcv1Q==", + "requires": {} }, "@fullcalendar/timegrid": { "version": "4.4.2", @@ -22638,7 +22641,8 @@ "@tinymce/tinymce-vue": { "version": "3.2.8", "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz", - "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA==" + "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA==", + "requires": {} }, "@types/glob": { "version": "7.1.3", @@ -23276,7 +23280,8 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz", "integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==", - "dev": true + "dev": true, + "requires": {} }, "@vue/test-utils": { "version": "1.0.0-beta.29", @@ -23588,13 +23593,15 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true + "dev": true, + "requires": {} }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "requires": {} }, "alphanum-sort": { "version": "1.0.2", @@ -23960,7 +23967,8 @@ "version": "7.0.0-bridge.0", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==", - "dev": true + "dev": true, + "requires": {} }, "babel-eslint": { "version": "10.0.1", @@ -27194,7 +27202,8 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true + "dev": true, + "requires": {} }, "ansi-regex": { "version": "3.0.0", @@ -27471,7 +27480,8 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true + "dev": true, + "requires": {} }, "debug": { "version": "4.3.1", @@ -28883,7 +28893,8 @@ "highcharts-vue": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/highcharts-vue/-/highcharts-vue-1.3.5.tgz", - "integrity": "sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q==" + "integrity": "sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q==", + "requires": {} }, "hmac-drbg": { "version": "1.0.1", @@ -37288,7 +37299,8 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", "dev": true, - "optional": true + "optional": true, + "requires": {} }, "ansi-regex": { "version": "3.0.0", diff --git a/SC-web/src/views/scm/basicInformation/areasetting/Form.vue b/SC-web/src/views/scm/basicInformation/areasetting/Form.vue index 91d25e74..4cff356d 100644 --- a/SC-web/src/views/scm/basicInformation/areasetting/Form.vue +++ b/SC-web/src/views/scm/basicInformation/areasetting/Form.vue @@ -1,6 +1,6 @@ diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue index 787ff246..d0e6f513 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue @@ -1,455 +1,494 @@ diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue index a864ca97..a0af4bbd 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue @@ -1,351 +1,386 @@ From fadb9543bcedef371bf11a731b27b72b387dbb83 Mon Sep 17 00:00:00 2001 From: tengxi <971623072@qq.com> Date: Mon, 13 Feb 2023 16:43:36 +0800 Subject: [PATCH 2/2] 2 --- .../basicInformation/monitormanage/Form.vue | 495 +++++++++--------- 1 file changed, 257 insertions(+), 238 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue b/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue index 80286529..4beb0e62 100644 --- a/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue +++ b/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue @@ -1,262 +1,281 @@