diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/accounting/mapper/AccountingMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/accounting/mapper/AccountingMapper.java index 8a912644..223054e0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/accounting/mapper/AccountingMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/accounting/mapper/AccountingMapper.java @@ -3,6 +3,9 @@ package jnpf.accounting.mapper; import jnpf.accounting.entity.AccountingEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @@ -13,5 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 日期： 2023-06-19 */ public interface AccountingMapper extends BaseMapper { + List queryAccounting(@Param("businessDate") String businessDate); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java index f74c8dd2..39c601fe 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java @@ -8,6 +8,8 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; @@ -51,6 +53,7 @@ import jnpf.arinvoices.service.Arinvoices_item0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import javax.validation.Valid; import java.io.File; import java.io.FileOutputStream; @@ -58,6 +61,7 @@ import java.io.IOException; import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -108,6 +112,9 @@ public class ArinvoicesController { @Autowired private CustomerService customerService; + @Resource + private AccountingMapper accountingMapper; + /** @@ -150,6 +157,16 @@ public class ArinvoicesController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(arinvoicesCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); arinvoicesCrForm.setCreatorUserName(userInfo.getUserId()); @@ -489,6 +506,16 @@ public class ArinvoicesController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ArinvoicesUpForm arinvoicesUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(arinvoicesUpForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } if (StringUtils.isNotEmpty(arinvoicesUpForm.getSalesOrderId())){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(arinvoicesUpForm.getSalesOrderId()); if (StringUtils.isNotEmpty(saleorderitemEntity.getStatus())){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index 1b6c7e48..e8e541cc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -9,6 +9,8 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.base.ActionResult; import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; @@ -45,11 +47,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.validation.Valid; import java.io.FileOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import org.springframework.util.CollectionUtils; @@ -94,6 +98,9 @@ public class CollectionController { private ContractFileService contractFileService; @Autowired private CustomerService customerService; + + @Resource + private AccountingMapper accountingMapper; /** * 单据编号显示 * @@ -292,6 +299,16 @@ public class CollectionController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(collectionCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } List Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(), Collection_item0Entity.class); if (Collection_item0List != null && Collection_item0List.size() > 0) { for (Collection_item0Entity collectionItem0Entity : Collection_item0List) { @@ -655,6 +672,16 @@ public class CollectionController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CollectionUpForm collectionUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(collectionUpForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } UserInfo userInfo=userProvider.get(); CollectionEntity entity= collectionService.getInfo(id); if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java index a26d674b..25eca839 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java @@ -82,4 +82,8 @@ public class CollectionCrForm { @JsonProperty("collection_item0List") private List collection_item0List; + /** 业务日期 **/ + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java index 4407b21e..d7549484 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java @@ -86,4 +86,8 @@ public class CollectionInfoVO{ @JsonProperty("contractNm") private String contractNm; + /** 业务日期 **/ + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java index 98133581..dab06b2e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java @@ -99,5 +99,9 @@ public class CollectionListVO{ @TableField(exist = false) private String customerNm; + /** 业务日期 **/ + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java index 3a5cd60c..966277b1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java @@ -8,6 +8,8 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; @@ -51,6 +53,8 @@ import jnpf.invoices.service.InvoicesItem0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; import javax.validation.Valid; import java.io.File; import java.io.FileOutputStream; @@ -58,6 +62,7 @@ import java.io.IOException; import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -108,6 +113,9 @@ public class InvoicesController { private SupplierService supplierService; @Autowired private Purchaseorder_item0Service purchaseorder_item0Service; + + @Resource + private AccountingMapper accountingMapper; /** * 列表 * @@ -148,6 +156,16 @@ public class InvoicesController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid InvoicesCrForm invoicesCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(invoicesCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId = RandomUtil.uuId(); UserInfo userInfo = userProvider.get(); //invoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("yffp", false)); @@ -495,6 +513,16 @@ public class InvoicesController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid InvoicesUpForm invoicesUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(invoicesUpForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } if (StringUtils.isNotEmpty(invoicesUpForm.getSupplierId())){ SupplierEntity supplierEntity = supplierService.getById(invoicesUpForm.getSupplierId()); if (ObjectUtil.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getPayType())){ 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 5c1504eb..ea332533 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 @@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jdk.nashorn.internal.ir.IfNode; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; @@ -61,6 +63,8 @@ import jnpf.payment.service.Payment_item0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; import javax.validation.Valid; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -68,6 +72,7 @@ import java.io.IOException; import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -119,6 +124,9 @@ public class PaymentController { @Autowired private SupplierService supplierService; + @Resource + private AccountingMapper accountingMapper; + @PostMapping("/submitprice") @Transactional public ActionResult submitprice(@RequestBody PaymentListVO paymentListVO) { @@ -262,6 +270,16 @@ public class PaymentController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid PaymentCrForm paymentCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(paymentCrForm.getBusinessdate()); + List list1 = accountingMapper.queryAccounting(date); + if (list1!=null && list1.size()>0){ + if (list1.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); //paymentCrForm.setDocumentno(generaterSwapUtil.getBillNumber("payment", false)); @@ -579,6 +597,16 @@ public class PaymentController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid PaymentUpForm paymentUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(paymentUpForm.getBusinessdate()); + List list1 = accountingMapper.queryAccounting(date); + if (list1!=null && list1.size()>0){ + if (list1.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } UserInfo userInfo=userProvider.get(); PaymentEntity entity= paymentService.getInfo(id); if (entity.getStatus().equals("2")){ 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 b7770c65..de07d448 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 @@ -10,6 +10,8 @@ import cn.hutool.core.util.ZipUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.arinvoices.entity.Arinvoices_item1Entity; import jnpf.base.ActionResult; @@ -82,6 +84,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.validation.Valid; import java.io.File; import java.io.FileOutputStream; @@ -90,6 +93,7 @@ import java.io.InputStream; import java.math.BigDecimal; import java.nio.charset.Charset; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -168,6 +172,9 @@ public class PurchaseorderController { @Autowired private InvoicesItem1Service invoicesItem1Service; + @Resource + private AccountingMapper accountingMapper; + /** * 归档 * @@ -279,6 +286,16 @@ public class PurchaseorderController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid PurchaseorderCrForm purchaseorderCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(); + String date = simpleDateFormat.format(purchaseorderCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId = RandomUtil.uuId(); UserInfo userInfo = userProvider.get(); //purchaseorderCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("cgdj", false)); @@ -366,6 +383,16 @@ public class PurchaseorderController { @ApiOperation("上传文件") @PostMapping("/Uploader") public ActionResult Uploader() throws Exception { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(new Date()); + List list1 = accountingMapper.queryAccounting(date); + if (list1!=null && list1.size()>0){ + if (list1.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } List list = UpUtil.getFileAll(); MultipartFile file = list.get(0); if (file.getOriginalFilename().endsWith(".zip")) { @@ -972,6 +999,19 @@ public class PurchaseorderController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(); + String date = ""; + if (purchaseorderUpForm.getBusinessDate() != null) { + date = simpleDateFormat.format(purchaseorderUpForm.getBusinessDate()); + } + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } UserInfo userInfo = userProvider.get(); PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id); if (!entity.getStatus().equals("0")) { 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 bd8519b4..50a1b3be 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 @@ -158,6 +158,10 @@ public class PurchaseorderitemEntity { @TableField("PAYMENT_TIME") private Integer paymentTime; + @TableField("BUSINESS_DATE") + private Date businessDate; + + @TableField(exist = false) private List poundlistEntityList; @TableField(exist = false) 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 3ef25dbb..6e3e34ae 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 @@ -2,6 +2,7 @@ package jnpf.purchaseorder.model.purchaseorder; +import com.baomidou.mybatisplus.annotation.TableField; import jnpf.payment.model.payment.PaymentListVO; import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; @@ -135,5 +136,8 @@ public class PurchaseorderCrForm { @JsonProperty("collectionitemList") private List collectionitemList; + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file 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 f0dede39..0ced9b5a 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 @@ -3,6 +3,7 @@ package jnpf.purchaseorder.model.purchaseorder; +import com.baomidou.mybatisplus.annotation.TableField; import jnpf.payment.model.payment.PaymentListVO; import jnpf.paymentdoc.entity.PaymentdocEntity; @@ -186,4 +187,7 @@ public class PurchaseorderInfoVO{ @JsonProperty("PaymentdocItem0Entity") private PaymentdocItem0Entity paymentdocItem0EntityList; + + @JsonProperty("businessDate") + private Long businessDate; } \ No newline at end of file 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 e7b53789..b55873de 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 @@ -141,4 +141,7 @@ public class PurchaseorderListVO{ @JsonProperty("poundlistEntityList") private List poundlistEntityList; + + @JsonProperty("businessDate") + private Long businessDate; } \ 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 621c189f..bcb14fa6 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 @@ -144,4 +144,6 @@ public class PurchaseorderUpForm{ @JsonProperty("collectionitemList") private List collectionitemList; + @JsonProperty("businessDate") + private Long businessDate; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java index ba84e79a..d41ff606 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java @@ -8,6 +8,8 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; @@ -58,11 +60,15 @@ import jnpf.receiptin.service.Receiptin_item0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; import javax.validation.Valid; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import jnpf.util.GeneraterSwapUtil; + +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -118,6 +124,9 @@ public class ReceiptinController { @Autowired private MaterialService materialService; + @Resource + private AccountingMapper accountingMapper; + /** * 列表 * @@ -157,6 +166,16 @@ public class ReceiptinController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid ReceiptinCrForm receiptinCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(receiptinCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); //receiptinCrForm.setDocumentno(generaterSwapUtil.getBillNumber("rukudanhao", false)); @@ -479,6 +498,16 @@ public class ReceiptinController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ReceiptinUpForm receiptinUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(receiptinUpForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } UserInfo userInfo=userProvider.get(); ReceiptinEntity entity= receiptinService.getInfo(id); if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java index b5cc9c5c..3d98ccce 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java @@ -108,4 +108,7 @@ public class ReceiptinEntity { @TableField(exist = false) private String supplier; + + @TableField("BUSINESS_DATE") + private Date businessDate; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java index ee80b7bb..5b7223a8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java @@ -2,8 +2,11 @@ package jnpf.receiptin.model.receiptin; +import com.baomidou.mybatisplus.annotation.TableField; import jnpf.receiptin.model.receiptin.Receiptin_item0Model; import lombok.Data; + +import java.util.Date; import java.util.List; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; @@ -75,5 +78,7 @@ public class ReceiptinCrForm { @JsonProperty("receiptin_item0List") private List receiptin_item0List; + @JsonProperty("businessDate") + private Long businessDate; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java index a4e77701..80a6d81e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java @@ -3,6 +3,7 @@ package jnpf.receiptin.model.receiptin; +import com.baomidou.mybatisplus.annotation.TableField; import jnpf.receiptin.model.receiptin.Receiptin_item0Model; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; @@ -83,4 +84,7 @@ public class ReceiptinInfoVO{ @JsonProperty("soucenoName") private String soucenoName; + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java index de9647bc..740e535c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java @@ -3,6 +3,7 @@ package jnpf.receiptin.model.receiptin; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.sql.Time; import java.util.Date; @@ -93,4 +94,7 @@ public class ReceiptinListVO{ @JsonProperty("supplier") private String supplier; + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java index f4cc51f3..5fdfea8b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java @@ -89,4 +89,6 @@ public class ReceiptinUpForm{ @JsonProperty("receiptin_item0List") private List receiptin_item0List; + @JsonProperty("businessDate") + private Long businessDate; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java index b4b2d235..628cb005 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java @@ -8,6 +8,8 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; @@ -57,11 +59,15 @@ import jnpf.receiptout.service.Receiptout_item0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; import javax.validation.Valid; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import jnpf.util.GeneraterSwapUtil; + +import java.text.SimpleDateFormat; import java.util.*; import jnpf.util.file.UploadUtil; @@ -112,6 +118,9 @@ public class ReceiptoutController { @Autowired private WareHouseService wareHouseService; + @Resource + private AccountingMapper accountingMapper; + /** * 销售订单出货，出库单创建 * @@ -121,6 +130,16 @@ public class ReceiptoutController { @PostMapping("/saleordercreate") @Transactional public ActionResult saleorderCreate(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(receiptoutCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); receiptoutCrForm.setDocumentNo(receiptoutCrForm.getDocumentNo()); @@ -196,6 +215,16 @@ public class ReceiptoutController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(new Date()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); // receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); @@ -513,6 +542,16 @@ public class ReceiptoutController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ReceiptoutUpForm receiptoutUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(receiptoutUpForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } if (StringUtils.isNotEmpty(receiptoutUpForm.getSourceNo())){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(receiptoutUpForm.getSourceNo()); if (StringUtils.isNotEmpty(saleorderitemEntity.getStatus())){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java index 59216ca7..3b063500 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java @@ -102,6 +102,9 @@ public class ReceiptoutEntity { @TableField("CUSTOMER_ID") private String customerId; + @TableField("BUSINESS_DATE") + private Date businessDate; + @TableField(exist = false) private String customerNm; @TableField(exist = false) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java index db9178a2..68a19a7f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java @@ -81,5 +81,8 @@ public class ReceiptoutCrForm { @JsonProperty("receiptout_item0List") private List receiptout_item0List; + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java index 7cb458e7..a3d89b92 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java @@ -93,5 +93,7 @@ public class ReceiptoutInfoVO{ @JsonProperty("customerName") private String customerName; + @JsonProperty("businessDate") + private Long businessDate; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java index bc96ef83..c95aa082 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java @@ -102,7 +102,8 @@ public class ReceiptoutListVO{ @TableField(exist = false) private String sourceOrderNo; - + @JsonProperty("businessDate") + private Long businessDate; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java index da7e9838..05773e44 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java @@ -97,7 +97,9 @@ public class ReceiptoutUpForm{ /** 子表数据 **/ @JsonProperty("receiptout_item0List") private List receiptout_item0List; - + /** 业务日期*/ + @JsonProperty("businessDate") + private Long businessDate; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index a54da90a..dc2cbdf4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.accounting.entity.AccountingEntity; +import jnpf.accounting.mapper.AccountingMapper; import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.arinvoices.entity.Arinvoices_item0Entity; import jnpf.arinvoices.entity.Arinvoices_item1Entity; @@ -93,6 +95,8 @@ import jnpf.saleorder.service.PaymentsoitemService; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; import javax.validation.Valid; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -100,11 +104,13 @@ import java.io.IOException; import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import jnpf.util.file.UploadUtil; import jnpf.util.enums.FileTypeEnum; +import sun.java2d.pipe.SpanShapeRenderer; /** * @@ -177,6 +183,9 @@ public class SaleorderitemController { @Autowired private Saleback_item0Service saleback_item0Service; + @Resource + private AccountingMapper accountingMapper; + /** * 修改磅单单价 @@ -522,6 +531,16 @@ public class SaleorderitemController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid SaleorderitemCrForm saleorderitemCrForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(); + String date = simpleDateFormat.format(saleorderitemCrForm.getBusinessDate()); + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } //先判断磅单是否开进项票 List Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class); for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ @@ -1056,6 +1075,19 @@ public class SaleorderitemController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SaleorderitemUpForm saleorderitemUpForm) throws DataException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(); + String date = ""; + if (saleorderitemUpForm.getBusinessDate() != null){ + date = simpleDateFormat.format(saleorderitemUpForm.getBusinessDate()); + } + List list = accountingMapper.queryAccounting(date); + if (list!=null && list.size()>0){ + if (list.get(0).getStatus().equals("1")){ + return ActionResult.fail("账期已关闭，无法在此区间开展业务"); + } + }else{ + return ActionResult.fail("账期不存在，无法在此区间开展业务"); + } UserInfo userInfo=userProvider.get(); SaleorderitemEntity entity= saleorderitemService.getInfo(id); if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java index e0306c64..e13e7a3d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java @@ -173,6 +173,9 @@ public class SaleorderitemEntity { @TableField("BID_SECTION") private String bidSection; + @TableField("BUSINESS_DATE") + private Date businessDate; + @TableField(exist = false) private BigDecimal amount; @TableField(exist = false) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java index 8fe729d6..dad9bcb1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java @@ -130,6 +130,9 @@ public class SaleorderitemCrForm { @TableField("bidSection") private String bidSection; + @JsonProperty("businessDate") + private Long businessDate; + @TableField("isTransfer") private String isTransfer; @TableField("purchaseOrderId") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java index 6eeafe0d..221327f5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java @@ -141,6 +141,9 @@ public class SaleorderitemInfoVO{ @TableField("bidSection") private String bidSection; + @JsonProperty("businessDate") + private Long businessDate; + @TableField("contractName") private String contractName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java index 33a2f377..22a66e5e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java @@ -120,6 +120,9 @@ public class SaleorderitemListVO{ @TableField("bidSection") private String bidSection; + @JsonProperty("businessDate") + private Long businessDate; + @TableField(exist = false) private String contractName; @TableField(exist = false) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java index c9ea7a72..fc018fee 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java @@ -154,4 +154,7 @@ public class SaleorderitemUpForm{ @TableField("bidSection") private String bidSection; + @JsonProperty("businessDate") + private Long businessDate; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/accounting/AccountingMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/accounting/AccountingMapper.xml index 3d403c22..486743d4 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/accounting/AccountingMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/accounting/AccountingMapper.xml @@ -1,7 +1,11 @@ - - + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml index d5742879..029d01f7 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml @@ -194,4 +194,5 @@ a.id=#{id} + diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index 1abf99e4..fee34e49 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -17,7 +17,7 @@ + prop="businessDate" required> diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue index 635a21cd..703fb57f 100644 --- a/SC-web/src/views/scm/basicInformation/collection/Form.vue +++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue @@ -81,6 +81,15 @@ + + + + + + + @@ -248,6 +257,7 @@ loading: false, isDetail: false, dataForm: { + businessDate: '', code: '', customerCode: '', documentNo: '', @@ -575,6 +585,7 @@ data[key] = ""; } } + this.dataForm.businessDate = new Date().getTime(); this.dataForm.paymentType = '0' this.dataForm.currency = '0' this.dataForm.settlementType = '0' diff --git a/SC-web/src/views/scm/basicInformation/payment/Form.vue b/SC-web/src/views/scm/basicInformation/payment/Form.vue index 99299fff..bb9ea7e7 100644 --- a/SC-web/src/views/scm/basicInformation/payment/Form.vue +++ b/SC-web/src/views/scm/basicInformation/payment/Form.vue @@ -467,8 +467,22 @@ }) }, request() { - this.submitDisabled = true; var _data = this.dataList() + var flag = true; + this.dataForm.payment_item0List.forEach((item,index) => { + if (item.amount < 0){ + flag = false + } + }) + if (!flag){ + this.$message({ + type: 'error', + message: '付款金额不能为负数', + duration: 3000 + }); + return + } + this.submitDisabled = true; if (!this.dataForm.id) { request({ url: '/api/payment/Payment', diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue index cf7c4a45..5b854d7d 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue @@ -502,10 +502,14 @@ }, request() { var statusFlag = true; + var flag = true; this.dataForm.payment_item0List.forEach((item,index) => { if (this.jnpf.floatAdd(item.amount, item.paymentAmount) > item.requestAmount){ statusFlag = false; } + if (item.amount < 0){ + flag = false; + } }) if (!statusFlag){ this.$message({ @@ -515,6 +519,14 @@ }); return } + if (!flag){ + this.$message({ + type: 'error', + message: '付款金额不能为负数', + duration: 3000 + }); + return + } this.submitDisabled = true; var _data = this.dataList() debugger diff --git a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue index c844d08b..5284b265 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue @@ -87,6 +87,15 @@ + + + + + + + - +