diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java index 4936c0ea..9e91649c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java @@ -21,7 +21,9 @@ import jnpf.contractfile.service.ContractFileService; import jnpf.exception.DataException; import jnpf.paymentdoc.entity.PaymentdocEntity; import jnpf.paymentdoc.entity.PaymentdocItem0Entity; +import jnpf.paymentdoc.entity.PaymentdocItem1Entity; import jnpf.paymentdoc.service.PaymentdocItem0Service; +import jnpf.paymentdoc.service.PaymentdocItem1Service; import jnpf.paymentdoc.service.PaymentdocService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; @@ -64,6 +66,7 @@ import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; import jnpf.util.file.UploadUtil; import jnpf.util.enums.FileTypeEnum; @@ -108,6 +111,8 @@ public class PaymentController { private PaymentdocService paymentdocService; @Autowired private PoundlistService poundlistService; + @Autowired + private PaymentdocItem1Service paymentdocItem1Service; @PostMapping("/submitprice") @Transactional @@ -119,11 +124,32 @@ public class PaymentController { paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getDocumentNo, paymentEntity.getPaymentno()); List paymentdocList = paymentdocService.list(paymentdocQueryWrapper); for (PaymentdocEntity paymentdocEntity : paymentdocList) { - paymentdocEntity.setDocStatus("3"); - paymentdocEntity.setPaymentAmount(paymentEntity.getPaymentamount()); - paymentdocEntity.setUnpaymentAmount(paymentdocEntity.getRamount().subtract(paymentdocEntity.getPaymentAmount())); + //paymentdocEntity.setDocStatus("3"); + paymentdocEntity.setIsSubmit("0"); + paymentdocEntity.setPaymentAmount(paymentEntity.getPaymentamount().add(paymentdocEntity.getPaymentAmount()));//已付款金额 + paymentdocEntity.setUnpaymentAmount(paymentdocEntity.getRamount().subtract(paymentdocEntity.getPaymentAmount()));//未付款金额 + int i = paymentdocEntity.getPaymentAmount().compareTo(paymentdocEntity.getRamount()); + if (i == 1) { + return ActionResult.fail("付款金额过多，请先修改付款金额"); + } + if (i == 0) { + paymentdocEntity.setDocStatus("3"); + paymentdocEntity.setIsStop("1"); + List paymentdocItem0EntityList = paymentdocService.GetPaymentdocItem0List(paymentdocEntity.getId()); + for (PaymentdocItem0Entity paymentdocItem0Entity : paymentdocItem0EntityList) { + PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); + purchaseorderitemEntity.setIsPayment("0"); + purchaseorderitemService.updateById(purchaseorderitemEntity); + } + } paymentdocService.updateById(paymentdocEntity); } + List payment_item0EntityList = paymentService.GetPayment_item0List(paymentEntity.getId()); + for (Payment_item0Entity payment_item0Entity : payment_item0EntityList) { + PaymentdocItem0Entity paymentdocItem0Entity = paymentdoc_item0Service.getById(payment_item0Entity.getPaymentdocitemId()); + paymentdocItem0Entity.setPaymentAmount(paymentdocItem0Entity.getPaymentAmount().add(payment_item0Entity.getAmount())); + paymentdoc_item0Service.updateById(paymentdocItem0Entity); + } return ActionResult.success("提交成功"); } @@ -139,10 +165,16 @@ public class PaymentController { PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); purchaseorderitemEntity.setPayPrice(purchaseorderitemEntity.getPayPrice().add(payment_item0Entity.getAmount())); purchaseorderitemService.updateById(purchaseorderitemEntity); + QueryWrapper PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>(); + PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, paymentdocItem0Entity.getPaymentdocId()); + PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPurchaseorderId, purchaseorderitemEntity.getId()); + PaymentdocItem1EntityqueryWrapper.lambda().select(PaymentdocItem1Entity::getPoundlistId); + List poundlistIdList = paymentdocItem1Service.listObjs(PaymentdocItem1EntityqueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(purchaseorderitemEntity.getId()); - List poundlistEntityList = purchaseorderitemService.getPoundList(paymentdocItem0Entity.getPurchaseorderId()); + List poundlistEntityList = poundlistService.queryPoundListByIdsRenkuan(poundlistIdList, paymentdocItem0Entity.getPaymentdocId()); + //poundlistEntityList Purchaseorder_item0Entity orderItem = Purchaseorder_item0List.stream().filter(item0 -> ObjectUtil.equals(item0.getPoundlistId(), poundlistEntityList.get(0).getId())).findAny().get(); - BigDecimal total = orderItem.getAmount(); + BigDecimal total = orderItem.getAmount();//第一条磅单 int i = 0; while (purchaseorderitemEntity.getPayPrice().compareTo(total) >= 0){ i++; @@ -158,6 +190,14 @@ public class PaymentController { poundlistEntityList.get(j).setIsPay("1"); poundlistEntityList.get(j).setPayDate(new Date()); poundlistService.updateById(poundlistEntityList.get(j)); + QueryWrapper item1queryWrapper = new QueryWrapper<>(); + item1queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, paymentdocItem0Entity.getPaymentdocId()); + item1queryWrapper.lambda().eq(PaymentdocItem1Entity::getPoundlistId, poundlistEntityList.get(j).getId()); + List paymentdocItem1Entities = paymentdocItem1Service.list(item1queryWrapper); + for (PaymentdocItem1Entity paymentdocItem1 : paymentdocItem1Entities) { + paymentdocItem1.setIsPay("1"); + } + paymentdocItem1Service.updateBatchById(paymentdocItem1Entities); } } return ActionResult.success("认款成功"); @@ -207,8 +247,9 @@ public class PaymentController { paymentdocEntityWrapper.lambda().eq(PaymentdocEntity::getDocumentNo, entity.getPaymentno()); List list = paymentdocService.list(paymentdocEntityWrapper); for (PaymentdocEntity paymentdocEntity: list) { + paymentdocEntity.setIsSubmit("1"); paymentdocEntity.setDocStatus("3");//已付款 - paymentdocEntity.setRamount(entity.getPaymentamount()); + //paymentdocEntity.setRamount(entity.getPaymentamount()); paymentdocService.updateById(paymentdocEntity); } List Payment_item0List = JsonUtil.getJsonToList(paymentCrForm.getPayment_item0List(),Payment_item0Entity.class); @@ -395,7 +436,6 @@ public class PaymentController { //子表 List Payment_item0List = paymentService.GetPayment_item0List(id); List payment_item0Models = new ArrayList<>(); - Payment_item0Model payment_item0Model = new Payment_item0Model(); for(Payment_item0Entity payment_item0Entity : Payment_item0List){ PaymentdocItem0Entity paymentdoc_item0Entity = paymentdoc_item0Service.getById(payment_item0Entity.getPaymentdocitemId()); PurchaseorderitemEntity purchaseorderEntity = purchaseorderitemService.getById(paymentdoc_item0Entity.getPurchaseorderId()); @@ -405,11 +445,13 @@ public class PaymentController { purchaseorderEntity.setContractNo(contractFileEntity.getContractCode()); } } + Payment_item0Model payment_item0Model = new Payment_item0Model(); payment_item0Model.setPaymentdocitemId(payment_item0Entity.getPaymentdocitemId()); payment_item0Model.setAmount(payment_item0Entity.getAmount()); payment_item0Model.setAllAmount(purchaseorderEntity.getAmount()); - payment_item0Model.setRequestAmount(purchaseorderEntity.getAmount()); + payment_item0Model.setRequestAmount(paymentdoc_item0Entity.getAmount()); payment_item0Model.setPayPrice(purchaseorderEntity.getPayPrice()); + payment_item0Model.setPaymentAmount(paymentdoc_item0Entity.getPaymentAmount()); payment_item0Model.setDocumentNo(purchaseorderEntity.getDocumentNo()); payment_item0Model.setContractNo(purchaseorderEntity.getContractNo()); payment_item0Model.setNum(purchaseorderEntity.getNum()); @@ -479,9 +521,6 @@ public class PaymentController { for(Payment_item0Entity entitys : Payment_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setPaymentId(entity.getId()); - for (Payment_item0Entity payment_item0Entity : list) { - entitys.setPaymentdocitemId(payment_item0Entity.getPaymentdocitemId()); - } payment_item0Service.save(entitys); } 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 01977417..aa5e1c0b 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 @@ -115,6 +115,7 @@ public class PaymentEntity { @TableField("voucher") private String voucher; - + @TableField("supplier_id") + private String supplierId; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java index 66b949fa..39b44ba1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java @@ -25,6 +25,10 @@ public class PaymentCrForm { @JsonProperty("documentno") private String documentno; + /** 供应商 **/ + @JsonProperty("supplierId") + private String supplierId; + /** 供应商 **/ @JsonProperty("suppliername") private String suppliername; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java index eb4fb1b1..f47ba2af 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java @@ -92,6 +92,10 @@ public class PaymentInfoVO{ @JsonProperty("voucher") private String voucher; + /** 供应商 **/ + @JsonProperty("supplierId") + private String supplierId; + /** 子表数据 **/ @JsonProperty("payment_item0List") private List payment_item0List; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java index 64664d34..9b97dcbe 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java @@ -106,4 +106,8 @@ public class PaymentListVO{ /** 付款凭证 **/ @JsonProperty("voucher") private String voucher; + + /** 供应商 **/ + @JsonProperty("supplierId") + private String supplierId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java index 416d6d1d..0689b4e3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java @@ -107,6 +107,10 @@ public class PaymentUpForm{ @JsonProperty("voucher") private String voucher; + /** 供应商 **/ + @JsonProperty("supplierId") + private String supplierId; + /** 子表数据 **/ @JsonProperty("payment_item0List") private List payment_item0List; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/Payment_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/Payment_item0Model.java index 1d3f8186..36236089 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/Payment_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/Payment_item0Model.java @@ -78,4 +78,7 @@ public class Payment_item0Model { /** 业务日期 **/ @JsonProperty("requestAmount") private BigDecimal requestAmount; + + @JsonProperty("paymentAmount") + private BigDecimal paymentAmount; } 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 fc8f883c..64f565c3 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 @@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.base.ActionResult; @@ -17,6 +18,8 @@ import jnpf.contractfile.service.ContractFileService; import jnpf.exception.DataException; import jnpf.payment.entity.PaymentEntity; import jnpf.payment.service.PaymentService; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseback.entity.PurchaseorderEntity; import jnpf.purchaseback.service.PurchaseorderService; import org.apache.commons.lang3.StringUtils; @@ -26,6 +29,8 @@ import jnpf.paymentdoc.model.paymentdoc.*; import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination; import jnpf.paymentdoc.entity.*; import jnpf.paymentdoc.entity.PaymentdocItem0Entity; +import jnpf.paymentdoc.entity.PaymentdocItem1Entity; +import jnpf.paymentdoc.entity.PaymentdocItem2Entity; import jnpf.util.*; import jnpf.base.util.*; import jnpf.base.vo.ListVO; @@ -43,6 +48,10 @@ import jnpf.paymentdoc.entity.PaymentdocEntity; import jnpf.paymentdoc.service.PaymentdocService; import jnpf.paymentdoc.entity.PaymentdocItem0Entity; import jnpf.paymentdoc.service.PaymentdocItem0Service; +import jnpf.paymentdoc.entity.PaymentdocItem1Entity; +import jnpf.paymentdoc.service.PaymentdocItem1Service; +import jnpf.paymentdoc.entity.PaymentdocItem2Entity; +import jnpf.paymentdoc.service.PaymentdocItem2Service; import jnpf.exception.WorkFlowException; import jnpf.engine.enums.FlowStatusEnum; import org.springframework.web.bind.annotation.*; @@ -53,6 +62,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import jnpf.util.GeneraterSwapUtil; + +import java.math.BigDecimal; import java.util.*; import jnpf.util.file.UploadUtil; @@ -65,7 +76,7 @@ import jnpf.util.enums.FileTypeEnum; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Slf4j @RestController @@ -86,15 +97,19 @@ public class PaymentdocController { @Autowired private PaymentdocItem0Service paymentdocItem0Service; - + @Autowired + private PaymentdocItem1Service paymentdocItem1Service; + @Autowired + private PaymentdocItem2Service paymentdocItem2Service; @Autowired private PurchaseorderService purchaseorderService; @Autowired private ContractFileService contractFileService; - @Autowired private PaymentService paymentService; + @Autowired + private PoundlistService poundlistService; /** * 列表 @@ -107,21 +122,19 @@ public class PaymentdocController { List list= paymentdocService.getList(paymentdocPagination); //处理id字段转名称，若无需转或者为空可删除 for(PaymentdocEntity entity:list){ - /*Map purchaseIdMap = new HashMap<>(); - entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseId(),purchaseIdMap)); - Map contractIdMap = new HashMap<>(); - entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap)); Map supplierIdMap = new HashMap<>(); - entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));*/ + entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo()); - PaymentEntity paymentEntity = paymentService.getOne(PaymentqueryWrapper); - if(paymentEntity != null){ - entity.setPaymentEntity(paymentEntity); - }else{ - entity.setPaymentEntity(new PaymentEntity()); + List paymentEntityList = paymentService.list(PaymentqueryWrapper); + if(paymentEntityList != null && paymentEntityList.size() > 0){ + PaymentEntity paymentEntity = paymentEntityList.get(0); + if(paymentEntity != null){ + entity.setPaymentEntity(paymentEntity); + }else{ + entity.setPaymentEntity(new PaymentEntity()); + } } - } List listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class); for(PaymentdocListVO paymentdocVO:listVO){ @@ -164,6 +177,7 @@ public class PaymentdocController { PaymentdocEntity entity = JsonUtil.getJsonToBean(paymentdocCrForm, PaymentdocEntity.class); entity.setId(mainId); paymentdocService.save(entity); + List PaymentdocItem0List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem0List(),PaymentdocItem0Entity.class); for(PaymentdocItem0Entity entitys : PaymentdocItem0List){ @@ -171,6 +185,26 @@ public class PaymentdocController { entitys.setPaymentdocId(entity.getId()); paymentdocItem0Service.save(entitys); + //修改采购订单为已付款申请 + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(entitys.getPurchaseorderId()); + purchaseorderEntity.setIsPayment("1"); + purchaseorderService.updateById(purchaseorderEntity); + } + List PaymentdocItem1List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem1List(),PaymentdocItem1Entity.class); + + for(PaymentdocItem1Entity entitys : PaymentdocItem1List){ + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentdocId(entity.getId()); + + paymentdocItem1Service.save(entitys); + } + List PaymentdocItem2List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem2List(),PaymentdocItem2Entity.class); + + for(PaymentdocItem2Entity entitys : PaymentdocItem2List){ + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentdocId(entity.getId()); + + paymentdocItem2Service.save(entitys); } if (FlowStatusEnum.submit.getMessage().equals(paymentdocCrForm.getStatus())){ try { @@ -200,34 +234,137 @@ public class PaymentdocController { PaymentdocInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentdocInfoVO.class); //子表 - List purchaseorderIdList = new ArrayList<>(); - List purchaseorderEntityList = new ArrayList<>(); List PaymentdocItem0List = paymentdocService.GetPaymentdocItem0List(id); - List list = JsonUtil.getJsonToList(PaymentdocItem0List,PaymentdocItem0Model.class ); - for (PaymentdocItem0Model paymentdocItem0Model : list) { - PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocItem0Model.getPurchaseorderId()); + for(PaymentdocItem0Entity paymentdocitem0Entity : PaymentdocItem0List){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocitem0Entity.getPurchaseorderId()); if(purchaseorderEntity != null && StringUtils.isNotEmpty(purchaseorderEntity.getContractCode())){ ContractFileEntity contractFileEntity = contractFileService.getById(purchaseorderEntity.getContractCode()); if(contractFileEntity != null && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ purchaseorderEntity.setContractNo(contractFileEntity.getContractCode()); } } - paymentdocItem0Model.setAllAmount(purchaseorderEntity.getAmount()); - paymentdocItem0Model.setPayPrice(purchaseorderEntity.getPayPrice()); - paymentdocItem0Model.setDocumentNo(purchaseorderEntity.getDocumentNo()); - paymentdocItem0Model.setContractNo(purchaseorderEntity.getContractNo()); - paymentdocItem0Model.setNum(purchaseorderEntity.getNum()); - paymentdocItem0Model.setAdvanceAmount(purchaseorderEntity.getAdvanceAmount()); - paymentdocItem0Model.setRate(purchaseorderEntity.getRate()); - paymentdocItem0Model.setNotAmount(purchaseorderEntity.getNotAmount()); - paymentdocItem0Model.setCreatorTime(purchaseorderEntity.getCreatorTime()); + paymentdocitem0Entity.setAllAmount(purchaseorderEntity.getAmount()); + paymentdocitem0Entity.setPayPrice(purchaseorderEntity.getPayPrice()); + paymentdocitem0Entity.setDocumentNo(purchaseorderEntity.getDocumentNo()); + paymentdocitem0Entity.setContractNo(purchaseorderEntity.getContractNo()); + paymentdocitem0Entity.setNum(purchaseorderEntity.getNum()); + paymentdocitem0Entity.setAdvanceAmount(purchaseorderEntity.getAdvanceAmount()); + paymentdocitem0Entity.setRate(purchaseorderEntity.getRate()); + paymentdocitem0Entity.setNotAmount(purchaseorderEntity.getNotAmount()); + paymentdocitem0Entity.setCreatorTime(purchaseorderEntity.getCreatorTime()); } - vo.setPaymentdocItem0List(list); + vo.setPaymentdocItem0List(JsonUtil.getJsonToList(PaymentdocItem0List,PaymentdocItem0Model.class )); + List PaymentdocItem1List = paymentdocService.GetPaymentdocItem1List(id); + List poundlistIdList = new ArrayList<>(); + for(PaymentdocItem1Entity paymentdocitem1Entity : PaymentdocItem1List){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocitem1Entity.getPurchaseorderId()); + paymentdocitem1Entity.setPurchaseorderNo(purchaseorderEntity.getDocumentNo()); + PoundlistEntity poundlistEntity = poundlistService.queryPoundById(paymentdocitem1Entity.getPoundlistId()); + paymentdocitem1Entity.setVehicleName(poundlistEntity.getVehicleName()); + paymentdocitem1Entity.setMaterialName(poundlistEntity.getMaterialName()); + paymentdocitem1Entity.setPoundType(poundlistEntity.getPoundType()); + paymentdocitem1Entity.setNetWeight(poundlistEntity.getNetWeight()); + paymentdocitem1Entity.setUnit(poundlistEntity.getUnit()); + paymentdocitem1Entity.setAdvance(poundlistEntity.getAdvance()); + paymentdocitem1Entity.setPurchasePrice(poundlistEntity.getPurchasePrice()); + paymentdocitem1Entity.setSettlement(poundlistEntity.getSettlement()); + paymentdocitem1Entity.setRate(poundlistEntity.getRate()); + paymentdocitem1Entity.setAmount(poundlistEntity.getAmount()); + paymentdocitem1Entity.setNotAmount(poundlistEntity.getNotAmount()); + paymentdocitem1Entity.setRemark(poundlistEntity.getRemark()); + } + if(poundlistIdList.size() > 0){ + List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); + vo.setPaymentdocItem1List(JsonUtil.getJsonToList(poundlistEntityList,PaymentdocItem1Model.class)); + }else{ + vo.setPaymentdocItem1List(JsonUtil.getJsonToList(PaymentdocItem1List,PaymentdocItem1Model.class )); + } + + List PaymentdocItem2List = paymentdocService.GetPaymentdocItem2List(id); + for(PaymentdocItem2Entity paymentdocitem2Entity : PaymentdocItem2List){ + } + vo.setPaymentdocItem2List(JsonUtil.getJsonToList(PaymentdocItem2List,PaymentdocItem2Model.class )); + + QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); + PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo()); + List paymentEntityList = paymentService.list(PaymentqueryWrapper); + vo.setPaymentEntityList(paymentEntityList); //副表 return ActionResult.success(vo); } + /** + * 信息 + * + * @param id + * @return + */ + @GetMapping("paymentcocToPaymen/{id}") + public ActionResult paymentcocToPaymen(@PathVariable("id") String id){ + PaymentdocEntity entity= paymentdocService.getInfo(id); + PaymentdocInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentdocInfoVO.class); + //子表 + List PaymentdocItem0List = paymentdocService.GetPaymentdocItem0List(id); + for(PaymentdocItem0Entity paymentdocitem0Entity : PaymentdocItem0List){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocitem0Entity.getPurchaseorderId()); + if(purchaseorderEntity != null && StringUtils.isNotEmpty(purchaseorderEntity.getContractCode())){ + ContractFileEntity contractFileEntity = contractFileService.getById(purchaseorderEntity.getContractCode()); + if(contractFileEntity != null && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ + purchaseorderEntity.setContractNo(contractFileEntity.getContractCode()); + } + } + paymentdocitem0Entity.setRequestAmount(paymentdocitem0Entity.getAmount()); + paymentdocitem0Entity.setAmount(paymentdocitem0Entity.getAmount().subtract(paymentdocitem0Entity.getPaymentAmount())); + paymentdocitem0Entity.setAllAmount(purchaseorderEntity.getAmount()); + paymentdocitem0Entity.setPaymentAmount(paymentdocitem0Entity.getPaymentAmount()); + paymentdocitem0Entity.setPayPrice(purchaseorderEntity.getPayPrice()); + paymentdocitem0Entity.setDocumentNo(purchaseorderEntity.getDocumentNo()); + paymentdocitem0Entity.setContractNo(purchaseorderEntity.getContractNo()); + paymentdocitem0Entity.setNum(purchaseorderEntity.getNum()); + paymentdocitem0Entity.setAdvanceAmount(purchaseorderEntity.getAdvanceAmount()); + paymentdocitem0Entity.setRate(purchaseorderEntity.getRate()); + paymentdocitem0Entity.setNotAmount(purchaseorderEntity.getNotAmount()); + paymentdocitem0Entity.setCreatorTime(purchaseorderEntity.getCreatorTime()); + } + vo.setPaymentdocItem0List(JsonUtil.getJsonToList(PaymentdocItem0List,PaymentdocItem0Model.class )); + List PaymentdocItem1List = paymentdocService.GetPaymentdocItem1List(id); + List poundlistIdList = new ArrayList<>(); + for(PaymentdocItem1Entity paymentdocitem1Entity : PaymentdocItem1List){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocitem1Entity.getPurchaseorderId()); + paymentdocitem1Entity.setPurchaseorderNo(purchaseorderEntity.getDocumentNo()); + PoundlistEntity poundlistEntity = poundlistService.queryPoundById(paymentdocitem1Entity.getPoundlistId()); + paymentdocitem1Entity.setVehicleName(poundlistEntity.getVehicleName()); + paymentdocitem1Entity.setMaterialName(poundlistEntity.getMaterialName()); + paymentdocitem1Entity.setPoundType(poundlistEntity.getPoundType()); + paymentdocitem1Entity.setNetWeight(poundlistEntity.getNetWeight()); + paymentdocitem1Entity.setUnit(poundlistEntity.getUnit()); + paymentdocitem1Entity.setAdvance(poundlistEntity.getAdvance()); + paymentdocitem1Entity.setPurchasePrice(poundlistEntity.getPurchasePrice()); + paymentdocitem1Entity.setSettlement(poundlistEntity.getSettlement()); + paymentdocitem1Entity.setRate(poundlistEntity.getRate()); + paymentdocitem1Entity.setAmount(poundlistEntity.getAmount()); + paymentdocitem1Entity.setNotAmount(poundlistEntity.getNotAmount()); + paymentdocitem1Entity.setRemark(poundlistEntity.getRemark()); + } + if(poundlistIdList.size() > 0){ + List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); + vo.setPaymentdocItem1List(JsonUtil.getJsonToList(poundlistEntityList,PaymentdocItem1Model.class)); + }else{ + vo.setPaymentdocItem1List(JsonUtil.getJsonToList(PaymentdocItem1List,PaymentdocItem1Model.class )); + } + + List PaymentdocItem2List = paymentdocService.GetPaymentdocItem2List(id); + for(PaymentdocItem2Entity paymentdocitem2Entity : PaymentdocItem2List){ + } + vo.setPaymentdocItem2List(JsonUtil.getJsonToList(PaymentdocItem2List,PaymentdocItem2Model.class )); + QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); + PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo()); + List paymentEntityList = paymentService.list(PaymentqueryWrapper); + vo.setPaymentEntityList(paymentEntityList); + //副表 + return ActionResult.success(vo); + } @@ -262,15 +399,41 @@ public class PaymentdocController { } + QueryWrapper PaymentdocItem1queryWrapper = new QueryWrapper<>(); + PaymentdocItem1queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, entity.getId()); + paymentdocItem1Service.remove(PaymentdocItem1queryWrapper); + + List PaymentdocItem1List = JsonUtil.getJsonToList(paymentdocUpForm.getPaymentdocitem1List(),PaymentdocItem1Entity.class); + for(PaymentdocItem1Entity entitys : PaymentdocItem1List){ + + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentdocId(entity.getId()); + paymentdocItem1Service.save(entitys); + } + + + QueryWrapper PaymentdocItem2queryWrapper = new QueryWrapper<>(); + PaymentdocItem2queryWrapper.lambda().eq(PaymentdocItem2Entity::getPaymentdocId, entity.getId()); + paymentdocItem2Service.remove(PaymentdocItem2queryWrapper); + + List PaymentdocItem2List = JsonUtil.getJsonToList(paymentdocUpForm.getPaymentdocitem2List(),PaymentdocItem2Entity.class); + for(PaymentdocItem2Entity entitys : PaymentdocItem2List){ + + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentdocId(entity.getId()); + paymentdocItem2Service.save(entitys); + } + + if (FlowStatusEnum.submit.getMessage().equals(paymentdocUpForm.getStatus())){ try { generaterSwapUtil.submitFlowTask(visualdevEntity,id,subentity,userInfo,paymentdocUpForm.getCandidateList()); - //提交流程，状态改为 1审批中 - entity.setDocStatus("1"); - paymentdocService.updateById(entity); } catch (WorkFlowException e) { e.printStackTrace(); } + //提交流程，状态改为 1审批中 + entity.setDocStatus("1"); + paymentdocService.updateById(entity); return ActionResult.success("提交成功，请耐心等待"); } return ActionResult.success("更新成功"); @@ -301,11 +464,53 @@ public class PaymentdocController { paymentdocService.delete(entity); QueryWrapper queryWrapperPaymentdocItem0=new QueryWrapper<>(); queryWrapperPaymentdocItem0.lambda().eq(PaymentdocItem0Entity::getPaymentdocId,entity.getId()); + List list = paymentdocItem0Service.list(queryWrapperPaymentdocItem0); + for (PaymentdocItem0Entity paymentdocItem0Entity : list) { + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocItem0Entity.getPurchaseorderId()); + purchaseorderEntity.setIsPayment("0"); + purchaseorderService.updateById(purchaseorderEntity); + } paymentdocItem0Service.remove(queryWrapperPaymentdocItem0); + QueryWrapper queryWrapperPaymentdocItem1=new QueryWrapper<>(); + queryWrapperPaymentdocItem1.lambda().eq(PaymentdocItem1Entity::getPaymentdocId,entity.getId()); + paymentdocItem1Service.remove(queryWrapperPaymentdocItem1); + QueryWrapper queryWrapperPaymentdocItem2=new QueryWrapper<>(); + queryWrapperPaymentdocItem2.lambda().eq(PaymentdocItem2Entity::getPaymentdocId,entity.getId()); + paymentdocItem2Service.remove(queryWrapperPaymentdocItem2); } return ActionResult.success("删除成功"); } - + /** + * 批量终止 + * + * @param ids + * @return + */ + @PostMapping("/batchtopPayment/{ids}") + @Transactional + public ActionResult batchtopPayment(@PathVariable("ids") String ids) { + int i = 0; + String[] idList = ids.split(","); + for (String id : idList) { + PaymentdocEntity paymentdocEntity = paymentdocService.getById(id); + paymentdocEntity.setIsStop("1"); + paymentdocEntity.setIsSubmit("1"); + paymentdocService.updateById(paymentdocEntity); + QueryWrapper queryWrapperPaymentdocItem0=new QueryWrapper<>(); + queryWrapperPaymentdocItem0.lambda().eq(PaymentdocItem0Entity::getPaymentdocId,id); + List list = paymentdocItem0Service.list(queryWrapperPaymentdocItem0); + for (PaymentdocItem0Entity paymentdocItem0Entity : list) { + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocItem0Entity.getPurchaseorderId()); + purchaseorderEntity.setIsPayment("0"); + purchaseorderService.updateById(purchaseorderEntity); + } + i++; + } + if (i == 0) { + return ActionResult.fail("终止失败"); + } + return ActionResult.success("终止成功"); + } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java index 90d099c3..951b620c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data @TableName("jg_paymentdoc") @@ -127,4 +127,13 @@ public class PaymentdocEntity { @TableField(exist = false) private PaymentEntity paymentEntity; + + @TableField("IS_STOP") + private String isStop; + + @TableField("IS_SUBMIT") + private String isSubmit; + + @TableField("payment_amount_history") + private String paymentAmountHistory; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java index 8e3b9a51..e52deac4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data @TableName("jg_paymentdoc_item0") @@ -68,4 +68,86 @@ public class PaymentdocItem0Entity { @TableField("AMOUNT") private BigDecimal amount; + @TableField("payment_amount") + private BigDecimal paymentAmount; + + @TableField(exist = false) + private String documentNo; + + @TableField(exist = false) + private String erpNo; + + @TableField(exist = false) + private String contractCode; + + @TableField(exist = false) + private String contractName; + + @TableField(exist = false) + private String contractNo; + + @TableField(exist = false) + private String supplierCode; + + @TableField(exist = false) + private String supplierName; + + @TableField(exist = false) + private BigDecimal num; + + @TableField(exist = false) + private BigDecimal allAmount; + + @TableField(exist = false) + private BigDecimal notAmount; + + @TableField(exist = false) + private BigDecimal rate; + + @TableField(exist = false) + private Integer poundNum; + + @TableField(exist = false) + private String currency; + + @TableField(exist = false) + private BigDecimal advanceAmount; + + @TableField(exist = false) + private BigDecimal payPrice; + + @TableField(exist = false) + private BigDecimal invoiceNum; + + @TableField(exist = false) + private BigDecimal invoiceAmount; + + @TableField(exist = false) + private BigDecimal refundableNum; + + @TableField(exist = false) + private BigDecimal refundableAmount; + + @TableField(exist = false) + private String status; + + @TableField(exist = false) + private String sourceSystem; + + @TableField(exist = false) + private String isSettle; + + @TableField(exist = false) + private String issue; + + @TableField(exist = false) + private String isTransfer; + + @TableField(exist = false) + private String remark; + + @TableField(exist = false) + private String supplierId; + @TableField(exist = false) + private BigDecimal requestAmount; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem1Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem1Entity.java new file mode 100644 index 00000000..407ffda5 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem1Entity.java @@ -0,0 +1,246 @@ +package jnpf.paymentdoc.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; +/** + * + * 磅单明细 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-03-22 + */ +@Data +@TableName("jg_paymentdoc_item1") +public class PaymentdocItem1Entity { + + @TableId("ID") + private String id; + + @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT) + private String creatorUserName; + + @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserName; + + @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE) + private String deleteUserName; + + @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField("DELETE_MARK") + @TableLogic + private String deleteMark; + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) + private String orgnizeId; + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) + private String departmentId; + + @TableField("PAYMENTDOC_ID") + private String paymentdocId; + + @TableField("POUNDLIST_ID") + private String poundlistId; + + @TableField("IS_FIRSTPAY") + private String isFirstpay; + + @TableField("IS_PAY") + private String isPay; + + @TableField("PURCHASEORDER_ID") + private String purchaseorderId; + + + @TableField(exist = false) + private String customerId; + + @TableField(exist = false) + private String salesId; + + @TableField(exist = false) + private String supplierId; + + @TableField(exist = false) + private String supplierName; + + @TableField(exist = false) + private String purchaseId; + + @TableField(exist = false) + private String materialId; + + @TableField(exist = false) + private String advance; + + @TableField(exist = false) + private String unit; + + @TableField(exist = false) + private BigDecimal grossWeight; + + @TableField(exist = false) + private BigDecimal tareWeight; + + @TableField(exist = false) + private BigDecimal buckleWeight; + + @TableField(exist = false) + private BigDecimal netWeight; + + @TableField(exist = false) + private BigDecimal settlement; + + @TableField(exist = false) + private BigDecimal purchasePrice; + + @TableField(exist = false) + private BigDecimal collectPrice; + + @TableField(exist = false) + private BigDecimal salesPrice; + + @TableField(exist = false) + private Date inputDate; + + @TableField(exist = false) + private Date outputDate; + + @TableField(exist = false) + private Date payDate; + + @TableField(exist = false) + private Date paymentDate; + + @TableField(exist = false) + private Date poundDate; + + @TableField(exist = false) + private String businessId; + + @TableField(exist = false) + private String poundPictures; + + @TableField(exist = false) + private String vehiclePictures; + + @TableField(exist = false) + private String poundType; + + @TableField(exist = false) + private String poundStatus; + + @TableField(exist = false) + private String salesStatus; + + @TableField(exist = false) + private String purchaseStatus; + + @TableField(exist = false) + private String remark; + + @TableField(exist = false) + private String transportType; + + @TableField(exist = false) + private BigDecimal transportPrice; + + @TableField(exist = false) + private String originPlace; + + @TableField(exist = false) + private String naturalId; + + @TableField(exist = false) + private String poundlistNo; + + @TableField(exist = false) + private String vehicleId; + + @TableField(exist = false) + private String isExamine; + + @TableField(exist = false) + private String isInvoicing; + + @TableField(exist = false) + private String isCollection; + + @TableField(exist = false) + private String isExpense; + + @TableField(exist = false) + private String materialName; + + @TableField(exist = false) + private String customerName; + + @TableField(exist = false) + private String salesName; + + @TableField(exist = false) + private String vehicleName; + + @TableField(exist = false) + private String businessName; + + @TableField(exist = false) + private String naturalName; + + @TableField(exist = false) + private String purchaseName; + + @TableField(exist = false) + private String contractNo; + @TableField(exist = false) + private String purchaseContractNo; + @TableField(exist = false) + private String documentNo; + @TableField(exist = false) + private String rate; + @TableField(exist = false) + private BigDecimal unitPrice; + @TableField(exist = false) + private BigDecimal noPrice; + @TableField(exist = false) + private BigDecimal price; + @TableField(exist = false) + private String salesContractNo; + @TableField(exist = false) + private String purchaseorderItem0Id; + @TableField(exist = false) + private String salesorderItem0Id; + @TableField(exist = false) + private String saleRate; + @TableField(exist = false) + private String amount; + @TableField(exist = false) + private String notAmount; + @TableField(exist = false) + private String purchaseorderNo; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem2Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem2Entity.java new file mode 100644 index 00000000..87d2066a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem2Entity.java @@ -0,0 +1,68 @@ +package jnpf.paymentdoc.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.math.BigDecimal; +/** + * + * 文件信息 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-03-22 + */ +@Data +@TableName("jg_paymentdoc_item2") +public class PaymentdocItem2Entity { + + @TableId("ID") + private String id; + + @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT) + private String creatorUserName; + + @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserName; + + @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE) + private String deleteUserName; + + @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField("DELETE_MARK") + @TableLogic + private String deleteMark; + + @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) + private String orgnizeId; + + @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT) + private String departmentId; + + @TableField("PAYMENTDOC_ID") + private String paymentdocId; + + @TableField("ENCLOSURE") + private String enclosure; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem0Mapper.java index 86324b4b..86794e25 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem0Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ public interface PaymentdocItem0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem1Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem1Mapper.java new file mode 100644 index 00000000..ad37f745 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem1Mapper.java @@ -0,0 +1,17 @@ +package jnpf.paymentdoc.mapper; + + +import jnpf.paymentdoc.entity.PaymentdocItem1Entity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * jg_paymentdoc_item1 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +public interface PaymentdocItem1Mapper extends BaseMapper { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem2Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem2Mapper.java new file mode 100644 index 00000000..8d171601 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocItem2Mapper.java @@ -0,0 +1,17 @@ +package jnpf.paymentdoc.mapper; + + +import jnpf.paymentdoc.entity.PaymentdocItem2Entity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * jg_paymentdoc_item2 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +public interface PaymentdocItem2Mapper extends BaseMapper { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java index fabc522f..b485d588 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ public interface PaymentdocMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java index 0286b5c1..54295bc5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java @@ -3,6 +3,8 @@ package jnpf.paymentdoc.model.paymentdoc; import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem0Model; +import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem1Model; +import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem2Model; import lombok.Data; import java.util.List; import java.math.BigDecimal; @@ -15,7 +17,7 @@ import java.util.Map; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocCrForm { @@ -99,6 +101,7 @@ public class PaymentdocCrForm { @JsonProperty("isPay") private String isPay; + /** 备注 **/ @JsonProperty("remark") private String remark; @@ -107,9 +110,22 @@ public class PaymentdocCrForm { @JsonProperty("docStatus") private String docStatus; + /** 部门id **/ + @JsonProperty("departmentId") + private String departmentId; + + @JsonProperty("paymentAmountHistory") + private String paymentAmountHistory; + /** 子表数据 **/ @JsonProperty("paymentdocitem0List") private List paymentdocitem0List; + /** 子表数据 **/ + @JsonProperty("paymentdocitem1List") + private List paymentdocitem1List; + /** 子表数据 **/ + @JsonProperty("paymentdocitem2List") + private List paymentdocitem2List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java index 8dc96bc6..b3a179d2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java @@ -2,7 +2,10 @@ package jnpf.paymentdoc.model.paymentdoc; +import jnpf.payment.entity.PaymentEntity; import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem0Model; +import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem1Model; +import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem2Model; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -15,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocInfoVO{ @@ -91,11 +94,27 @@ public class PaymentdocInfoVO{ @JsonProperty("remark") private String remark; + /** 部门id **/ + @JsonProperty("departmentId") + private String departmentId; + /** 状态 **/ @JsonProperty("docStatus") private String docStatus; + @JsonProperty("paymentAmountHistory") + private String paymentAmountHistory; + /** 子表数据 **/ @JsonProperty("paymentdocitem0List") private List paymentdocItem0List; + /** 子表数据 **/ + @JsonProperty("paymentdocitem1List") + private List paymentdocItem1List; + /** 子表数据 **/ + @JsonProperty("paymentdocitem2List") + private List paymentdocItem2List; + /** 子表数据 **/ + @JsonProperty("paymentEntityList") + private List paymentEntityList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java index 8c5b6ee0..3ee40ac9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ @Data public class PaymentdocItem0Model { @@ -109,4 +109,9 @@ public class PaymentdocItem0Model { @JsonProperty("creatorTime") private Date creatorTime; + + @JsonProperty("paymentAmount") + private BigDecimal paymentAmount; + @JsonProperty("requestAmount") + private BigDecimal requestAmount; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem1Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem1Model.java new file mode 100644 index 00000000..15e1155f --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem1Model.java @@ -0,0 +1,57 @@ +package jnpf.paymentdoc.model.paymentdoc; + +import lombok.Data; +import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * + * + * 版本： V3.2.0 + * 版权: LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +@Data +public class PaymentdocItem1Model { + + @JsonProperty("id") + private String id; + @JsonProperty("poundlistId") + private String poundlistId; + @JsonProperty("purchaseorderId") + private String purchaseorderId; + @JsonProperty("isFirstpay") + private String isFirstpay; + @JsonProperty("isPay") + private String isPay; + @JsonProperty("vehicleName") + private String vehicleName; + @JsonProperty("materialName") + private String materialName; + @JsonProperty("poundType") + private String poundType; + @JsonProperty("netWeight") + private BigDecimal netWeight; + @JsonProperty("unit") + private String unit; + @JsonProperty("advance") + private String advance; + @JsonProperty("purchasePrice") + private BigDecimal purchasePrice; + @JsonProperty("settlement") + private BigDecimal settlement; + @JsonProperty("rate") + private String rate; + @JsonProperty("amount") + private String amount; + @JsonProperty("notAmount") + private String notAmount; + @JsonProperty("remark") + private String remark; + @JsonProperty("purchaseorderNo") + private String purchaseorderNo; +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem2Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem2Model.java new file mode 100644 index 00000000..c91dab9d --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem2Model.java @@ -0,0 +1,25 @@ +package jnpf.paymentdoc.model.paymentdoc; + +import lombok.Data; +import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * + * + * 版本： V3.2.0 + * 版权: LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +@Data +public class PaymentdocItem2Model { + + /** 文件附件 **/ + @JsonProperty("enclosure") + private String enclosure; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java index 5e7cad5b..8818191e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocListQuery extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java index 343d918a..387dd86a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java @@ -3,7 +3,6 @@ package jnpf.paymentdoc.model.paymentdoc; -import jnpf.payment.entity.PaymentEntity; import lombok.Data; import java.sql.Time; import java.util.Date; @@ -16,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocListVO{ @@ -45,10 +44,9 @@ public class PaymentdocListVO{ /** 供应商 **/ @JsonProperty("supplierId") private String supplierId; - /** 供应商 **/ - @JsonProperty("supplierName") - private String supplierName; + @JsonProperty("supplierName") + private String supplierName; /** 付款类型 **/ @JsonProperty("paymentType") @@ -128,13 +126,22 @@ public class PaymentdocListVO{ @JsonProperty("remark") private String remark; - /** 状态 **/ - @JsonProperty("docStatus") - private String docStatus; + + + /** 部门id **/ + @JsonProperty("departmentId") + private String departmentId; + + @JsonProperty("paymentAmountHistory") + private String paymentAmountHistory; @JsonProperty("flowState") private Integer flowState; - @JsonProperty("paymentEntity") - private PaymentEntity paymentEntity; + @JsonProperty("isSubmit") + private String isSubmit; + @JsonProperty("isStop") + private String isStop; + @JsonProperty("docStatus") + private String docStatus; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java index 77455ea5..4c107358 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java @@ -11,15 +11,15 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocPagination extends Pagination { - /** 单据编号 */ - private String documentNo; - /** 供应商 */ - private String supplierName; + /** 单据编号 */ + private String documentNo; + /** 供应商 */ + private String supplierName; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java index fcd45d90..afe3ca09 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocPaginationExportModel extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java index edc42ba1..e97e6dfa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java @@ -3,6 +3,8 @@ package jnpf.paymentdoc.model.paymentdoc; import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem0Model; +import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem1Model; +import jnpf.paymentdoc.model.paymentdoc.PaymentdocItem2Model; import lombok.Data; import java.util.List; import java.math.BigDecimal; @@ -17,7 +19,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-23 + * @日期： 2023-03-22 */ @Data public class PaymentdocUpForm{ @@ -98,8 +100,21 @@ public class PaymentdocUpForm{ @JsonProperty("docStatus") private String docStatus; + /** 部门id **/ + @JsonProperty("departmentId") + private String departmentId; + + @JsonProperty("paymentAmountHistory") + private String paymentAmountHistory; + /** 子表数据 **/ @JsonProperty("paymentdocitem0List") private List paymentdocitem0List; + /** 子表数据 **/ + @JsonProperty("paymentdocitem1List") + private List paymentdocitem1List; + /** 子表数据 **/ + @JsonProperty("paymentdocitem2List") + private List paymentdocitem2List; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem0Service.java index faada49d..ca5c51de 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem0Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ public interface PaymentdocItem0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem1Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem1Service.java new file mode 100644 index 00000000..3df0695b --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem1Service.java @@ -0,0 +1,15 @@ +package jnpf.paymentdoc.service; + +import jnpf.paymentdoc.entity.PaymentdocItem1Entity; +import com.baomidou.mybatisplus.extension.service.IService; +/** + * + * jg_paymentdoc_item1 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +public interface PaymentdocItem1Service extends IService { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem2Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem2Service.java new file mode 100644 index 00000000..94153237 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocItem2Service.java @@ -0,0 +1,15 @@ +package jnpf.paymentdoc.service; + +import jnpf.paymentdoc.entity.PaymentdocItem2Entity; +import com.baomidou.mybatisplus.extension.service.IService; +/** + * + * jg_paymentdoc_item2 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +public interface PaymentdocItem2Service extends IService { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java index 6e4b43ce..f7964947 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java @@ -1,6 +1,10 @@ package jnpf.paymentdoc.service; import jnpf.paymentdoc.entity.PaymentdocItem0Entity; import jnpf.paymentdoc.service.PaymentdocItem0Service; +import jnpf.paymentdoc.entity.PaymentdocItem1Entity; +import jnpf.paymentdoc.service.PaymentdocItem1Service; +import jnpf.paymentdoc.entity.PaymentdocItem2Entity; +import jnpf.paymentdoc.service.PaymentdocItem2Service; import jnpf.paymentdoc.entity.PaymentdocEntity; import com.baomidou.mybatisplus.extension.service.IService; @@ -12,13 +16,13 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ public interface PaymentdocService extends IService { List getList(PaymentdocPagination paymentdocPagination); - List getTypeList(PaymentdocPagination paymentdocPagination, String dataType); + List getTypeList(PaymentdocPagination paymentdocPagination,String dataType); @@ -28,10 +32,12 @@ public interface PaymentdocService extends IService { void create(PaymentdocEntity entity); - boolean update(String id, PaymentdocEntity entity); + boolean update( String id, PaymentdocEntity entity); // 子表方法 List GetPaymentdocItem0List(String id); + List GetPaymentdocItem1List(String id); + List GetPaymentdocItem2List(String id); //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem0ServiceImpl.java index 91242179..30774ecd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem0ServiceImpl.java @@ -31,7 +31,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ @Service public class PaymentdocItem0ServiceImpl extends ServiceImpl implements PaymentdocItem0Service { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem1ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem1ServiceImpl.java new file mode 100644 index 00000000..63069936 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem1ServiceImpl.java @@ -0,0 +1,39 @@ +package jnpf.paymentdoc.service.impl; + +import jnpf.paymentdoc.entity.*; +import jnpf.paymentdoc.mapper.PaymentdocItem1Mapper; +import jnpf.paymentdoc.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import jnpf.permission.model.authorize.AuthorizeConditionModel; + + + + + + + + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; + +/** + * + * jg_paymentdoc_item1 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +@Service +public class PaymentdocItem1ServiceImpl extends ServiceImpl implements PaymentdocItem1Service { + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem2ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem2ServiceImpl.java new file mode 100644 index 00000000..30d5da1e --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocItem2ServiceImpl.java @@ -0,0 +1,39 @@ +package jnpf.paymentdoc.service.impl; + +import jnpf.paymentdoc.entity.*; +import jnpf.paymentdoc.mapper.PaymentdocItem2Mapper; +import jnpf.paymentdoc.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import jnpf.permission.model.authorize.AuthorizeConditionModel; + + + + + + + + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; + +/** + * + * jg_paymentdoc_item2 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-03-22 + */ +@Service +public class PaymentdocItem2ServiceImpl extends ServiceImpl implements PaymentdocItem2Service { + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java index fbfbf872..79405ad2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java @@ -40,7 +40,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-23 + * 日期： 2023-03-22 */ @Service public class PaymentdocServiceImpl extends ServiceImpl implements PaymentdocService { @@ -55,6 +55,12 @@ public class PaymentdocServiceImpl extends ServiceImpl paymentdocQueryWrapper=new QueryWrapper<>(); int paymentdocItem0Num =0; QueryWrapper paymentdocItem0QueryWrapper=new QueryWrapper<>(); - boolean pcPermission = true; - boolean appPermission = true; + int paymentdocItem1Num =0; + QueryWrapper paymentdocItem1QueryWrapper=new QueryWrapper<>(); + int paymentdocItem2Num =0; + QueryWrapper paymentdocItem2QueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); if(isPc && pcPermission){ if (!userProvider.get().getIsAdministrator()){ - Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); + Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); if (ObjectUtil.isEmpty(paymentdocObj)){ return new ArrayList<>(); } else { paymentdocQueryWrapper = (QueryWrapper)paymentdocObj; paymentdocNum++; } - Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0")); + Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ return new ArrayList<>(); } else { paymentdocItem0QueryWrapper = (QueryWrapper)paymentdocItem0Obj; paymentdocItem0Num++; } + Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem1")); + if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem1QueryWrapper = (QueryWrapper)paymentdocItem1Obj; + paymentdocItem1Num++; + } + Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem2")); + if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem2QueryWrapper = (QueryWrapper)paymentdocItem2Obj; + paymentdocItem2Num++; + } } } if(!isPc && appPermission){ if (!userProvider.get().getIsAdministrator()){ - Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); + Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); if (ObjectUtil.isEmpty(paymentdocObj)){ return new ArrayList<>(); } else { paymentdocQueryWrapper = (QueryWrapper)paymentdocObj; paymentdocNum++; } - Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0")); + Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ return new ArrayList<>(); } else { paymentdocItem0QueryWrapper = (QueryWrapper)paymentdocItem0Obj; paymentdocItem0Num++; } + Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem1")); + if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem1QueryWrapper = (QueryWrapper)paymentdocItem1Obj; + paymentdocItem1Num++; + } + Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem2")); + if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem2QueryWrapper = (QueryWrapper)paymentdocItem2Obj; + paymentdocItem2Num++; + } } } if(StringUtil.isNotEmpty(paymentdocPagination.getDocumentNo())){ @@ -162,43 +200,75 @@ public class PaymentdocServiceImpl extends ServiceImpl paymentdocQueryWrapper=new QueryWrapper<>(); int paymentdocItem0Num =0; QueryWrapper paymentdocItem0QueryWrapper=new QueryWrapper<>(); - boolean pcPermission = true; - boolean appPermission = true; + int paymentdocItem1Num =0; + QueryWrapper paymentdocItem1QueryWrapper=new QueryWrapper<>(); + int paymentdocItem2Num =0; + QueryWrapper paymentdocItem2QueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); if(isPc && pcPermission){ if (!userProvider.get().getIsAdministrator()){ - Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); + Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); if (ObjectUtil.isEmpty(paymentdocObj)){ return new ArrayList<>(); } else { paymentdocQueryWrapper = (QueryWrapper)paymentdocObj; paymentdocNum++; } - Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0")); + Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ return new ArrayList<>(); } else { paymentdocItem0QueryWrapper = (QueryWrapper)paymentdocItem0Obj; paymentdocItem0Num++; } + Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem1")); + if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem1QueryWrapper = (QueryWrapper)paymentdocItem1Obj; + paymentdocItem1Num++; + } + Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem2")); + if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem2QueryWrapper = (QueryWrapper)paymentdocItem2Obj; + paymentdocItem2Num++; + } } } if(!isPc && appPermission){ if (!userProvider.get().getIsAdministrator()){ - Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); + Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc")); if (ObjectUtil.isEmpty(paymentdocObj)){ return new ArrayList<>(); } else { paymentdocQueryWrapper = (QueryWrapper)paymentdocObj; paymentdocNum++; } - Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0")); + Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0")); if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ return new ArrayList<>(); } else { paymentdocItem0QueryWrapper = (QueryWrapper)paymentdocItem0Obj; paymentdocItem0Num++; } + Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem1")); + if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem1QueryWrapper = (QueryWrapper)paymentdocItem1Obj; + paymentdocItem1Num++; + } + Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem2")); + if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ + return new ArrayList<>(); + } else { + paymentdocItem2QueryWrapper = (QueryWrapper)paymentdocItem2Obj; + paymentdocItem2Num++; + } } } if(StringUtil.isNotEmpty(paymentdocPagination.getDocumentNo())){ @@ -268,6 +338,18 @@ public class PaymentdocServiceImpl extends ServiceImpl GetPaymentdocItem1List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, id); + return paymentdocItem1Service.list(queryWrapper); + } + @Override + public List GetPaymentdocItem2List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PaymentdocItem2Entity::getPaymentdocId, id); + return paymentdocItem2Service.list(queryWrapper); + } //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index c12bf621..4c6dec51 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -231,6 +231,16 @@ public class PoundlistEntity { private String salesorderItem0Id; @TableField(exist = false) private String saleRate; - - + @TableField(exist = false) + private String amount; + @TableField(exist = false) + private String notAmount; + @TableField(exist = false) + private String isFirstpay = "0"; + @TableField(exist = false) + private String purchaseorderNo; + @TableField(exist = false) + private String collectionAccount; + @TableField(exist = false) + private String colectionBank; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java index 34472070..2a402ae8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java @@ -30,4 +30,8 @@ public interface PoundlistMapper extends BaseMapper { List qureylist2(PoundlistTwoEntity poundlistTwoEntity); PoundlistEntity queryPoundById(String poundlistId); + + List queryPoundListByIds(@Param("poundlistIdList") List poundlistIdList); + + List queryPoundListByIdsRenkuan(@Param("poundlistIdList") List poundlistIdList, @Param("paymentdocId") String paymentdocId); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java index d0b89c44..877226a0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java @@ -36,6 +36,10 @@ public interface PoundlistService extends IService { PoundlistEntity queryPoundById(String poundlistId); + List queryPoundListByIds(List poundlistIdList); + + List queryPoundListByIdsRenkuan(List poundlistIdList, String paymentdocId); + // 子表方法 //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 945ef258..d7b020bb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -128,10 +128,6 @@ public class PoundlistServiceImpl extends ServiceImpl page=new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize()); IPage iPage = poundlistMapper.queryByKeyword(page, poundlistPagination); -// IPage userIPage = poundlistMapper.queryByKeyword(page, poundlistPagination); -// -// IPage iPage=this.page(userIPage, poundlistQueryWrapper); - return poundlistPagination.setData(iPage.getRecords(),iPage.getTotal()); } @Override @@ -252,6 +248,16 @@ public class PoundlistServiceImpl extends ServiceImpl queryPoundListByIds(List poundlistIdList) { + return poundlistMapper.queryPoundListByIds(poundlistIdList); + } + + @Override + public List queryPoundListByIdsRenkuan(List poundlistIdList, String paymentdocId) { + return poundlistMapper.queryPoundListByIdsRenkuan(poundlistIdList, paymentdocId); + } + @Override public void delete(PoundlistEntity entity){ if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java index 66bb8c80..a78ef888 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java @@ -145,4 +145,7 @@ public class PurchaseorderEntity { @TableField("REMARK") private String remark; + @TableField("is_payment") + private String isPayment; + } 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 15aa2ada..0316caef 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 @@ -546,7 +546,13 @@ public class PurchaseorderController { String[] idList = ids.split(","); for (String id : idList) { PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id); + if(StringUtils.isNotEmpty(entity.getSupplierId())){ + SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId()); + entity.setColectionBank(supplierEntity.getBank()); + entity.setCollectionAccount(supplierEntity.getBankAccount()); + } List poundlistEntityList = purchaseorderitemService.getPoundList(id); + poundlistEntityList = poundlistEntityList.stream().filter(fieLdsModel -> "0".equals(fieLdsModel.getIsPay())).collect(Collectors.toList()); entity.setPoundlistEntityList(poundlistEntityList); if (entity != null && StringUtils.isNotEmpty(entity.getContractCode())) { ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractCode()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java index 7f7da759..51c587ee 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java @@ -151,9 +151,15 @@ public class PurchaseorderitemEntity { @TableField("SUPPLIER_ID") private String supplierId; + @TableField("is_payment") + private String isPayment; @TableField(exist = false) private List poundlistEntityList; @TableField(exist = false) private List paymentdocEntityList; + @TableField(exist = false) + private String collectionAccount; + @TableField(exist = false) + private String colectionBank; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java index 3e26a8da..3ef25dbb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java @@ -116,6 +116,9 @@ public class PurchaseorderCrForm { @JsonProperty("supplierId") private String supplierId; + @JsonProperty("isPayment") + private String isPayment; + /** 子表数据 **/ @JsonProperty("purchaseorder_item0List") private List purchaseorder_item0List; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java index 8c7a62a1..aa052b4a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java @@ -123,6 +123,9 @@ public class PurchaseorderInfoVO{ @JsonProperty("remark") private String remark; + @JsonProperty("isPayment") + private String isPayment; + /** 子表数据 **/ @JsonProperty("purchaseorder_item0List") private List purchaseorder_item0List; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java index 3e649365..8608bd94 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java @@ -3,6 +3,7 @@ package jnpf.purchaseorder.model.purchaseorder; +import com.baomidou.mybatisplus.annotation.TableField; import jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; import java.sql.Time; @@ -132,6 +133,9 @@ public class PurchaseorderListVO{ @JsonProperty("supplierId") private String supplierId; + @JsonProperty("isPayment") + private String isPayment; + @JsonProperty("poundlistEntityList") private List poundlistEntityList; } \ No newline at end of file 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 8fc3ce88..b98eda69 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 @@ -113,7 +113,8 @@ public class PurchaseorderUpForm{ @JsonProperty("invoiceAmount") private String invoiceAmount; - + @JsonProperty("isPayment") + private String isPayment; /** 单据状态 **/ @JsonProperty("status") private String status; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index c5acc35c..0e0ddeb2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -1762,9 +1762,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.lambda().in(PoundlistEntity::getId, poundlistIdList).orderByDesc(PoundlistEntity::getAdvance).orderByAsc(PoundlistEntity::getPoundDate); - return poundlistService.list(queryWrapper2); + //QueryWrapper queryWrapper2 = new QueryWrapper<>(); + List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); + //queryWrapper2.lambda().in(PoundlistEntity::getId, poundlistIdList).orderByDesc(PoundlistEntity::getAdvance).orderByAsc(PoundlistEntity::getPoundDate); + return poundlistEntityList; } //列表子表数据方法 } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml index d308dafa..55fac366 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml @@ -7,7 +7,7 @@ LEFT JOIN jg_purchaseorder b on a.purchaseorder_id = b.id LEFT JOIN jg_contract c on a.contract_id = c.id LEFT JOIN jg_supplier d on a.supplier_id = d.id - where 1=1 + where 1=1 AND a.delete_mark = 0 AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0 AND a.creator_time > #{invoicesPagination.startDate} AND a.creator_time <= #{invoicesPagination.endDate} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem0Mapper.xml new file mode 100644 index 00000000..9fbcbbe8 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem0Mapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem1Mapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem1Mapper.xml new file mode 100644 index 00000000..c66efbb7 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem1Mapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem2Mapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem2Mapper.xml new file mode 100644 index 00000000..a276627b --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocItem2Mapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml new file mode 100644 index 00000000..34f2357c --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index 2ef53d03..5d6d9c8a 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -26,7 +26,7 @@ LEFT JOIN jg_contract d ON a.sales_id=d.id LEFT JOIN jg_receiptout_item0 e ON a.id=e.poundlist_id LEFT JOIN jg_salesorder g ON g.contract_id=d.id -WHERE +WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and g.delete_mark = 0 and a.creator_time BETWEEN #{startTime} and #{endTime} OR a.department_id =#{departmentIdS} @@ -50,7 +50,7 @@ WHERE LEFT JOIN jg_supplier b ON a.supplier_id=b.id LEFT JOIN jg_customer c ON a.customer_id=c.id LEFT JOIN jg_material d ON a.material_id=d.id -WHERE +WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 a.creator_time BETWEEN #{startTime} and #{endTime} @@ -69,7 +69,7 @@ WHERE LEFT JOIN jg_natural i on a.natural_id = i.id LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id - where a.is_examine = '1' + where a.is_examine = '1' and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and i.delete_mark = 0 and j.delete_mark = 0 and k.delete_mark = 0 AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%')) @@ -129,7 +129,7 @@ WHERE + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml index 83b5acfc..5837429f 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml @@ -7,7 +7,7 @@ LEFT JOIN jg_purchaseorder b on a.purchase_order_id = b.id LEFT JOIN jg_contract c on b.contract_code = c.id LEFT JOIN jg_supplier d on b.supplier_id = d.id - where 1=1 + where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index 6e6b7a5e..748df792 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -219,7 +219,7 @@ from jg_purchaseorder a LEFT JOIN jg_supplier b on a.supplier_id = b.id LEFT JOIN jg_contract c on a.contract_code = c.id - WHERE 1=1 + WHERE 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%')) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml index bdba652b..98d74eff 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml @@ -6,7 +6,7 @@ from jg_receiptin a LEFT JOIN jg_purchaseorder b on a.souceno = b.id LEFT JOIN jg_supplier d on a.supplier_id = d.id - where 1=1 + where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0 AND a.creator_time > #{receiptinPagination.startDate} AND a.creator_time <= #{receiptinPagination.endDate} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml index 26a31a5a..ff01e338 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml @@ -8,6 +8,6 @@ LEFT JOIN jg_material c on a.material_id = c.id LEFT JOIN jg_warehouse d on a.warehouse_id = d.id LEFT JOIN jg_reservoirarea e on a.reservoirarea_id = e.id - WHERE receiptin_id = #{id} + where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and receiptin_id = #{id} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml index b79364dd..67f1b8cf 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml @@ -26,7 +26,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day) LEFT JOIN jg_contract g on a.purchase_id = g.id LEFT JOIN base_user h on a.business_id = h.f_id LEFT JOIN jg_natural i on a.natural_id = i.id - where a.is_examine = '0' + where a.is_examine = '0' AND a.delete_mark = 0 AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%')) diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue index 7cddc423..c5102657 100644 --- a/SC-web/src/views/extend/paymentdoc/form.vue +++ b/SC-web/src/views/extend/paymentdoc/form.vue @@ -1,706 +1,1214 @@ diff --git a/SC-web/src/views/scm/basicInformation/payment/Detail.vue b/SC-web/src/views/scm/basicInformation/payment/Detail.vue index 0f695aeb..87fe1508 100644 --- a/SC-web/src/views/scm/basicInformation/payment/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/payment/Detail.vue @@ -1,5 +1,5 @@ - + + + + - + + + + - + + + +