From f585b8e139ac211cce6d2f06733fbc80882e0ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 10 Jul 2023 16:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArinvoicesController.java | 17 ++-- .../controller/CollectionController.java | 26 ++++-- .../controller/InvoicesController.java | 4 + .../payment/controller/PaymentController.java | 24 +++--- .../controller/PaymentdocController.java | 25 +++--- .../service/impl/PaymentdocServiceImpl.java | 10 +-- .../controller/PoundlistController.java | 16 +++- .../service/impl/PoundlistServiceImpl.java | 12 +++ .../controller/PurchasebackController.java | 24 ++---- .../controller/PurchaseorderController.java | 34 ++++++-- .../controller/ReceiptinController.java | 19 +++-- .../controller/ReceiptoutController.java | 40 ++++----- .../controller/SalebackController.java | 16 +--- .../controller/SaleorderitemController.java | 82 +++++++++++++------ 14 files changed, 215 insertions(+), 134 deletions(-) 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 c3e60dd5..7b9fd9b2 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 @@ -159,6 +159,7 @@ public class ArinvoicesController { 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")){ @@ -167,22 +168,24 @@ public class ArinvoicesController { }else{ return ActionResult.fail("账期不存在，无法在此区间开展业务"); } - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); + String mainId =RandomUtil.uuId();//uuid + UserInfo userInfo=userProvider.get();//登录者信息 arinvoicesCrForm.setCreatorUserName(userInfo.getUserId()); arinvoicesCrForm.setCreatorTime(DateUtil.getNow()); + //应收发票信息 ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class); SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId()); if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { saleorderitemEntity.setStatus("2");//修改销售订单状态 - saleorderitemEntity.setInvoiceNum(new BigDecimal(arinvoicesCrForm.getInvoiceQuantity())); - saleorderitemEntity.setInvoiceAmount(new BigDecimal(arinvoicesCrForm.getInvoiceAmount())); + saleorderitemEntity.setInvoiceNum(new BigDecimal(arinvoicesCrForm.getInvoiceQuantity()));//发票数量 + saleorderitemEntity.setInvoiceAmount(new BigDecimal(arinvoicesCrForm.getInvoiceAmount()));//发票金额 saleorderitemService.updateById(saleorderitemEntity); if (saleorderitemEntity.getPrice().compareTo(saleorderitemEntity.getInvoiceAmount()) == 0){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId); + //查询磅单id List poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); @@ -513,6 +516,7 @@ public class ArinvoicesController { 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")){ @@ -521,6 +525,7 @@ public class ArinvoicesController { }else{ return ActionResult.fail("账期不存在，无法在此区间开展业务"); } + //判断订单状态是否允许修改 if (StringUtils.isNotEmpty(arinvoicesUpForm.getSalesOrderId())){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(arinvoicesUpForm.getSalesOrderId()); if (StringUtils.isNotEmpty(saleorderitemEntity.getStatus())){ @@ -541,7 +546,7 @@ public class ArinvoicesController { SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); saleorderitemEntity.setInvoiceNum(arinvoicesEntity.getInvoiceQuantity()); saleorderitemEntity.setInvoiceAmount(arinvoicesEntity.getInvoiceAmount()); - saleorderitemService.updateById(saleorderitemEntity); + saleorderitemService.updateById(saleorderitemEntity);//修改销售订单 if (saleorderitemEntity.getPrice().compareTo(saleorderitemEntity.getInvoiceAmount()) == 0){ QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); @@ -552,7 +557,7 @@ public class ArinvoicesController { poundlistEntity.setIsExpense("1");//修改销项票状态 poundlistEntity.setOutputDate(new Date());//修改销项票日期 } - poundlistService.updateBatchById(poundlistEntityList); + poundlistService.updateBatchById(poundlistEntityList);//修改磅单 }else { QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); 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 fbd8020d..75c5fc20 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 @@ -176,12 +176,14 @@ public class CollectionController { public ActionResult confirmPrice(@PathVariable("ids") String ids) { String userId=userProvider.get().getUserId(); String detpartment=null; + //获取部门 if (!userProvider.get().getIsAdministrator()) { detpartment = userProvider.getDepartmentId(userId); } - String[] idList = ids.split(","); + String[] idList = ids.split(",");//id集合 for (String id : idList) { CollectionEntity collectionEntity = collectionService.getInfo(id); + //收款单状态判断 if (collectionEntity.getStatus().equals("1")){ return ActionResult.fail("已提交"); } @@ -191,6 +193,7 @@ public class CollectionController { if (collectionEntity.getStatus().equals("0")) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id); + //查询收款单子表 List collection_item0EntityList = collection_item0Service.list(queryWrapper);//查询收款单子表信息 for (Collection_item0Entity collection_item0Entity : collection_item0EntityList) { BigDecimal sum = new BigDecimal(0); @@ -201,6 +204,7 @@ public class CollectionController { // if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())) { // return ActionResult.fail("已回款金额等于金额"); // } + //回款金额判断 if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) { return ActionResult.fail("请先输入回款金额"); } else { @@ -209,6 +213,7 @@ public class CollectionController { return ActionResult.fail("总回款金额大于金额"); } } + //查询磅单 QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,saleordercetEntity.getId()); List list = salesorder_item0Service.list(queryWrapper1); @@ -220,6 +225,7 @@ public class CollectionController { } } if (poundlist.size() > 0) { + //对磅单按照垫资进行排序 poundlist = poundlist.stream().sorted(Comparator.comparing(PoundlistEntity::getAdvance).reversed() .thenComparing(Comparator.comparing(PoundlistEntity::getPoundDate))).collect(Collectors.toList()); }else{ @@ -229,6 +235,7 @@ public class CollectionController { List poundlist1 = new ArrayList<>(); for (PoundlistEntity pound : poundlist){ if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) { + //计算金额 amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement())).setScale(2, RoundingMode.HALF_UP); if (amount.compareTo(sum) < 1) { poundlist1.add(pound); @@ -238,20 +245,20 @@ public class CollectionController { } } for (PoundlistEntity poundlistEntity : poundlist1){ - poundlistEntity.setIsCollection("1"); + poundlistEntity.setIsCollection("1");//已收款 if (poundlistEntity.getPaymentDate() == null){ - poundlistEntity.setPaymentDate(new Date()); + poundlistEntity.setPaymentDate(new Date());//付款日期 } poundlistService.updateById(poundlistEntity); } - saleordercetEntity.setAmountCollected(sum); + saleordercetEntity.setAmountCollected(sum);//已收款金额 // saleordercetEntity.setStatus("3"); saleorderitemService.updateById(saleordercetEntity); collectionEntity.setStatus("2"); // collectionEntity.setBusinessDate(new Date()); collectionEntity.setCollectionUserId(userId); if (StringUtil.isNotNull(detpartment)) { - collectionEntity.setCollectionDept(detpartment); + collectionEntity.setCollectionDept(detpartment);//认款人部门 } collectionService.updateById(collectionEntity); } @@ -309,10 +316,12 @@ public class CollectionController { }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) { if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())) { + //查询销售订单，判断发票金额和销售金额是否一致 SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId()); if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null) { if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0) { @@ -332,6 +341,7 @@ public class CollectionController { saleorderitemEntity.setPrice(new BigDecimal("0")); } BigDecimal notAmount = new BigDecimal("0"); + //订单金额-已收款金额 notAmount = saleorderitemEntity.getPrice().subtract(saleorderitemEntity.getAmountCollected()); if (collectionItem0Entity.getAmount().compareTo(notAmount) == 1) { return ActionResult.fail("收款金额不能大于订单金额-已收款金额"); @@ -354,7 +364,7 @@ public class CollectionController { // collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); entity.setId(mainId); - entity.setStatus("0"); + entity.setStatus("0");//已保存 collectionService.save(entity); // List Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); for (Collection_item0Entity entitys : Collection_item0List) { @@ -683,11 +693,13 @@ public class CollectionController { return ActionResult.fail("账期不存在，无法在此区间开展业务"); } UserInfo userInfo=userProvider.get(); + //收款单信息 CollectionEntity entity= collectionService.getInfo(id); if(entity!=null){ CollectionEntity subentity=JsonUtil.getJsonToBean(collectionUpForm, CollectionEntity.class); - collectionService.update(id, subentity); + collectionService.update(id, subentity);//修改收款单主表 + //修改收款单子表 QueryWrapper Collection_item0queryWrapper = new QueryWrapper<>(); Collection_item0queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, entity.getId()); collection_item0Service.remove(Collection_item0queryWrapper); 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 2b180fb4..1005322b 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 @@ -171,7 +171,9 @@ public class InvoicesController { //invoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("yffp", false)); InvoicesEntity entity = JsonUtil.getJsonToBean(invoicesCrForm, InvoicesEntity.class); entity.setId(mainId); + //新增主表 invoicesService.save(entity); + //新增子表 List InvoicesItem1List = JsonUtil.getJsonToList(invoicesCrForm.getInvoicesitem1List(), InvoicesItem1Entity.class); for (InvoicesItem1Entity entitys : InvoicesItem1List) { entitys.setId(RandomUtil.uuId()); @@ -544,7 +546,9 @@ public class InvoicesController { InvoicesEntity entity= invoicesService.getInfo(id); if(entity!=null){ InvoicesEntity subentity=JsonUtil.getJsonToBean(invoicesUpForm, InvoicesEntity.class); + //主表更新 invoicesService.update(id, subentity); + //子表更新 QueryWrapper InvoicesItem1queryWrapper = new QueryWrapper<>(); InvoicesItem1queryWrapper.lambda().eq(InvoicesItem1Entity::getInvoicesId, entity.getId()); invoicesItem1Service.remove(InvoicesItem1queryWrapper); 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 fb2bab82..ecc21794 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 @@ -135,10 +135,10 @@ public class PaymentController { for (String ids : idList) { PaymentEntity paymentEntity = paymentService.getById(ids); paymentEntity.setStatus("1"); - paymentService.updateById(paymentEntity); + paymentService.updateById(paymentEntity);//更新付款单 QueryWrapper paymentdocQueryWrapper = new QueryWrapper<>(); paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getDocumentNo, paymentEntity.getPaymentno()); - List paymentdocList = paymentdocService.list(paymentdocQueryWrapper); + List paymentdocList = paymentdocService.list(paymentdocQueryWrapper);//付款申请单 for (PaymentdocEntity paymentdocEntity : paymentdocList) { //paymentdocEntity.setDocStatus("3"); paymentdocEntity.setIsSubmit("0"); @@ -155,16 +155,16 @@ public class PaymentController { for (PaymentdocItem0Entity paymentdocItem0Entity : paymentdocItem0EntityList) { PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); purchaseorderitemEntity.setIsPayment("0"); - purchaseorderitemService.updateById(purchaseorderitemEntity); + purchaseorderitemService.updateById(purchaseorderitemEntity);//更新采购订单 } } - paymentdocService.updateById(paymentdocEntity); + 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); + paymentdoc_item0Service.updateById(paymentdocItem0Entity);//更新付款申请单子表 } } return ActionResult.success("提交成功"); @@ -174,7 +174,7 @@ public class PaymentController { @Transactional public ActionResult confirmPrice(@RequestBody PaymentListVO paymentListVO) { PaymentEntity paymentEntity = paymentService.getById(paymentListVO.getId()); - paymentEntity.setStatus("2"); + paymentEntity.setStatus("2");//修改状态 if(paymentListVO.getAccountingPeriod() != null && paymentListVO.getAccountingPeriod() > 0){ paymentEntity.setAccountingPeriod(paymentListVO.getAccountingPeriod()); Calendar mon = Calendar.getInstance(); @@ -185,21 +185,22 @@ public class PaymentController { paymentEntity.setAccountingPeriod(0); paymentEntity.setPaymentDate(paymentEntity.getBusinessdate()); } - paymentService.updateById(paymentEntity); + paymentService.updateById(paymentEntity);//更新付款单 List Payment_item0List = paymentService.GetPayment_item0List(paymentEntity.getId()); for (Payment_item0Entity payment_item0Entity: Payment_item0List) { PaymentdocItem0Entity paymentdocItem0Entity = paymentdoc_item0Service.getById(payment_item0Entity.getPaymentdocitemId()); PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); purchaseorderitemEntity.setPayPrice(purchaseorderitemEntity.getPayPrice().add(payment_item0Entity.getAmount())); - purchaseorderitemService.updateById(purchaseorderitemEntity); + 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 = poundlistService.queryPoundListByIdsRenkuan(poundlistIdList, paymentdocItem0Entity.getPaymentdocId()); - //poundlistEntityList + //使用stream流过滤采购子表 Purchaseorder_item0Entity orderItem = Purchaseorder_item0List.stream().filter(item0 -> ObjectUtil.equals(item0.getPoundlistId(), poundlistEntityList.get(0).getId())).findAny().get(); BigDecimal total = orderItem.getAmount();//第一条磅单 int i = 0; @@ -207,6 +208,7 @@ public class PaymentController { i++; if(i < poundlistEntityList.size()){ String poundlistId = poundlistEntityList.get(i).getId(); + //使用stream流过滤采购子表 orderItem = Purchaseorder_item0List.stream().filter(item0 -> ObjectUtil.equals(item0.getPoundlistId(), poundlistId)).findAny().get(); total = total.add(orderItem.getAmount()); }else{ @@ -214,8 +216,8 @@ public class PaymentController { } } for (int j = 0;j item1queryWrapper = new QueryWrapper<>(); item1queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, paymentdocItem0Entity.getPaymentdocId()); 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 4b847d19..0d638fcb 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 @@ -148,7 +148,7 @@ public class PaymentdocController { SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId()); if (ObjectUtils.isNotEmpty(supplierEntity)){ - entity.setSupplierName(supplierEntity.getSupplierName()); + entity.setSupplierName(supplierEntity.getSupplierName());//供应商名称 } QueryWrapper PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>(); @@ -211,7 +211,7 @@ public class PaymentdocController { if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentNo())){ return ActionResult.fail("单据编号不能为空"); } - entity.setId(mainId); + entity.setId(mainId);//uuid paymentdocService.save(entity); List PaymentdocItem0List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem0List(),PaymentdocItem0Entity.class); @@ -237,7 +237,7 @@ public class PaymentdocController { PoundlistEntity poundlistEntity = poundlistService.getById(entitys.getPoundlistId()); if (ObjectUtils.isNotEmpty(poundlistEntity)){ if (entitys.getIsFirstpay().equals("1")){ - poundlistEntity.setIsPaymentdoc("1"); + poundlistEntity.setIsPaymentdoc("1");//已付款申请 poundlistService.updateById(poundlistEntity); } } @@ -428,8 +428,9 @@ public class PaymentdocController { PaymentdocEntity entity= paymentdocService.getInfo(id); if(entity!=null){ PaymentdocEntity subentity=JsonUtil.getJsonToBean(paymentdocUpForm, PaymentdocEntity.class); - paymentdocService.update(id, subentity); + paymentdocService.update(id, subentity);//更新付款申请单 + //更新付款申请单子表 QueryWrapper PaymentdocItem0queryWrapper = new QueryWrapper<>(); PaymentdocItem0queryWrapper.lambda().eq(PaymentdocItem0Entity::getPaymentdocId, entity.getId()); paymentdocItem0Service.remove(PaymentdocItem0queryWrapper); @@ -571,16 +572,17 @@ public class PaymentdocController { if(entity!=null) { QueryWrapper PaymentdocqueryWrapper = new QueryWrapper<>(); PaymentdocqueryWrapper.lambda().eq(PaymentdocItem0Entity::getPaymentdocId,entity.getId()); - List PaymentdocItem0list = paymentdocItem0Service.list(PaymentdocqueryWrapper); + List PaymentdocItem0list = paymentdocItem0Service.list(PaymentdocqueryWrapper);//付款申请单子表 if (PaymentdocItem0list.size()>0){ String purid= PaymentdocItem0list.get(0).getPurchaseorderId(); QueryWrapper purchaseorderQueryWrapper = new QueryWrapper<>(); purchaseorderQueryWrapper.lambda().eq(PurchaseorderEntity::getId,purid); purchaseorderQueryWrapper.lambda().select(PurchaseorderEntity::getId); + //使用stream流直接查询采购id List purchaseorderIdList = purchaseorderService.listObjs(purchaseorderQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List purchaseorderEntityList = purchaseorderService.listByIds(purchaseorderIdList); for (PurchaseorderEntity PurchaseorlistList: purchaseorderEntityList) { - PurchaseorlistList.setIsPayment("0"); + PurchaseorlistList.setIsPayment("0");//付款申请中 } purchaseorderService.updateBatchById(purchaseorderEntityList); paymentdocItem0Service.remove(PaymentdocqueryWrapper); @@ -588,12 +590,13 @@ public class PaymentdocController { QueryWrapper paymentdocItem1QueryWrapper=new QueryWrapper<>(); paymentdocItem1QueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId,entity.getId()); paymentdocItem1QueryWrapper.lambda().select(PaymentdocItem1Entity::getPoundlistId); + //使用stream流直接查询磅单id List poundlistIdList = paymentdocItem1Service.listObjs(paymentdocItem1QueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistList = poundlistService.listByIds(poundlistIdList); for (PoundlistEntity poundlistEntity: poundlistList) { - poundlistEntity.setIsPaymentdoc("0"); - poundlistEntity.setIsPay("0"); - poundlistEntity.setPayDate(null); + poundlistEntity.setIsPaymentdoc("0");//未付款申请 + poundlistEntity.setIsPay("0");//未付款 + poundlistEntity.setPayDate(null);//付款前日期 } poundlistService.updateBatchById(poundlistList); paymentdocItem1Service.remove(paymentdocItem1QueryWrapper); @@ -605,7 +608,7 @@ public class PaymentdocController { flowTaskService.remove(flowTaskQueryWrapper); QueryWrapper paymentQueryWrapper=new QueryWrapper<>(); paymentQueryWrapper.lambda().eq(PaymentEntity::getPaymentno,entity.getDocumentNo()); - if (entity.getDocumentNo()!=null){ + if (entity.getDocumentNo()!=null){//付款申请单编号 List paymentList = paymentService.list(paymentQueryWrapper); if (paymentList.size()>0){ String paymentid= paymentList.get(0).getId(); @@ -617,7 +620,7 @@ public class PaymentdocController { paymentService.remove(paymentQueryWrapper); QueryWrapper paymentdocQueryWrapper = new QueryWrapper<>(); paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getId,entity.getId()); - paymentdocService.delete(entity); + paymentdocService.delete(entity);//删除付款申请单 } return ActionResult.success("作废成功"); } 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 7c638a76..ee592bc4 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 @@ -418,9 +418,9 @@ public class PaymentdocServiceImpl extends ServiceImpl userEntities = userMapper.selectList(userEntityQueryWrapper); UserEntity userEntity = userEntities.get(0); - paymentdocMessage.setRealName(userEntity.getRealName()); - paymentdocMessage.setMobilePhone(userEntity.getMobilePhone()); - paymentdocMessage.setNowTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + paymentdocMessage.setRealName(userEntity.getRealName());//姓名 + paymentdocMessage.setMobilePhone(userEntity.getMobilePhone());//手机号 + paymentdocMessage.setNowTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));//时间 // 获取组织 if(StringUtil.isNotNull(userEntity.getOrganizeId())){ // paymentdocMessage.setFullName(PermissionUtil.getLinkInfoByOrgId(userEntity.getOrganizeId(), organizeService, false)); @@ -433,7 +433,7 @@ public class PaymentdocServiceImpl extends ServiceImpl idList = Arrays.asList(poundlistPagination.getIds().split(",")); //List list = new ArrayList<>(); List list = poundlistService.queryCreateSale(idList); + //循环判断磅单状态 for (PoundlistEntity poundlistEntity : list){ poundlistEntity.setRate("0"); if (poundlistEntity.getSalesPrice()!=null) { @@ -118,6 +119,7 @@ public class PoundlistController { return ActionResult.fail("当前状态不能生成销售订单"); } } + //得到销售单号 if(list != null && list.size() > 0){ list.get(0).setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); } @@ -144,7 +146,7 @@ public class PoundlistController { @PostMapping("/getList") public ActionResult list(@RequestBody PoundlistPagination poundlistPagination)throws IOException{ List list= poundlistService.getList(poundlistPagination); - //处理id字段转名称，若无需转或者为空可删除 + //图片转换 for(PoundlistEntity entity:list){ entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); @@ -152,21 +154,25 @@ public class PoundlistController { } List listVO=JsonUtil.getJsonToList(list,PoundlistListVO.class); for(PoundlistListVO poundlistListVO:listVO){ + //判断结算重量不为空 if(StringUtils.isEmpty(poundlistListVO.getSettlement())){ poundlistListVO.setSettlement(poundlistListVO.getNetWeight()); if(StringUtils.isEmpty(poundlistListVO.getSettlement())){ poundlistListVO.setSettlement("0"); } } + //判断金额不为空 if(StringUtils.isEmpty(poundlistListVO.getPrice())){ poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); if(StringUtils.isEmpty(poundlistListVO.getPrice())){ poundlistListVO.setPrice("0"); } } + //判断销售单价不为空 if(StringUtils.isEmpty(poundlistListVO.getSalesPrice())){ poundlistListVO.setSalesPrice("0"); } + //判断税率不为空 if(StringUtils.isEmpty(poundlistListVO.getSaleRate())){ poundlistListVO.setSaleRate("0"); } @@ -176,6 +182,7 @@ public class PoundlistController { poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString()); + //得到不含税金额 switch (poundlistListVO.getSaleRate()) { case "1": poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.09"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); @@ -214,7 +221,7 @@ public class PoundlistController { @PostMapping("/getListSourceId") public ActionResult listsourceid(@RequestBody PoundlistPagination poundlistPagination)throws IOException{ List list= poundlistService.getListSourceid(poundlistPagination); - //处理id字段转名称，若无需转或者为空可删除 + //图片转换 for(PoundlistEntity entity:list){ entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); @@ -222,21 +229,25 @@ public class PoundlistController { } List listVO=JsonUtil.getJsonToList(list,PoundlistListVO.class); for(PoundlistListVO poundlistListVO:listVO){ + //判断结算重量不为空 if(StringUtils.isEmpty(poundlistListVO.getSettlement())){ poundlistListVO.setSettlement(poundlistListVO.getNetWeight()); if(StringUtils.isEmpty(poundlistListVO.getSettlement())){ poundlistListVO.setSettlement("0"); } } + //判断价格不为空 if(StringUtils.isEmpty(poundlistListVO.getPrice())){ poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); if(StringUtils.isEmpty(poundlistListVO.getPrice())){ poundlistListVO.setPrice("0"); } } + //判断销售单价不为空 if(StringUtils.isEmpty(poundlistListVO.getSalesPrice())){ poundlistListVO.setSalesPrice("0"); } + //判断税率不为空 if(StringUtils.isEmpty(poundlistListVO.getSaleRate())){ poundlistListVO.setSaleRate("0"); } @@ -246,6 +257,7 @@ public class PoundlistController { poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString()); + //得到不含税金额 switch (poundlistListVO.getSaleRate()) { case "1": poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.09"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); 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 39045823..b38a9654 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 @@ -359,6 +359,7 @@ public class PoundlistServiceImpl extends ServiceImpl customerWrapper = new LambdaQueryWrapper<>(); customerWrapper.eq(CustomerEntity::getOrgnizeId,organizeId); customerWrapper.eq(CustomerEntity::getSupplierNm,model.getCustomerName()); + //查询具体客户 CustomerEntity customerEntity = customerService.getOne(customerWrapper); String customerId = ""; if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getId())){ @@ -375,6 +377,7 @@ public class PoundlistServiceImpl extends ServiceImpl vehicleWrapper = new LambdaQueryWrapper<>(); vehicleWrapper.eq(VehicleEntity::getTicketno,model.getVehicleName()); @@ -385,6 +388,7 @@ public class PoundlistServiceImpl extends ServiceImpl poundlistList = poundlistMapper.selectList(poundlistWrapper); if (poundlistList != null && poundlistList.size() != 0){ if (poundlistList.size() == 1){ PoundlistEntity poundlistEntity = JsonUtil.getJsonToBean(poundlistList.get(0),PoundlistEntity.class); + //得到销售订单号 poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId()); if (ObjectUtils.isNotEmpty(entity) && StringUtils.isNotEmpty(entity.getContractNo())) { poundlistEntity.setContractNo(entity.getContractNo()); + //得到合同名称 poundlistEntity.setContractName(entity.getContractName()); } CustomerEntity customer = customerService.getInfo(poundlistEntity.getCustomerId()); if (ObjectUtils.isNotEmpty(customer) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ + //得到客户名称 poundlistEntity.setCustomerName(customer.getSupplierNm()); } VehicleEntity vehicleEntity = vehicleService.getInfo(poundlistEntity.getVehicleId()); if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ + //得到车辆名称 poundlistEntity.setVehicleName(vehicleEntity.getTicketno()); } MaterialEntity materialEntity = materialService.getInfo(poundlistEntity.getMaterialId()); if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ + //得到物料名称 poundlistEntity.setMaterialName(materialEntity.getItemName()); } poundlistEntity.setRate("0"); if (StringUtils.isNotEmpty(model.getSalesPrice())){ + //得到销售单价 poundlistEntity.setSalesPrice(new BigDecimal(model.getSalesPrice())); } if (StringUtils.isNotEmpty(model.getSalesAmount())){ + //得到金额 poundlistEntity.setPrice(new BigDecimal(model.getSalesAmount())); } poundlistEntityList.add(poundlistEntity); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java index 7f443585..c72d1b48 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java @@ -122,6 +122,7 @@ public class PurchasebackController { List purchaseback_item0List = purchasebackService.GetPurchaseback_item0List(entity.getId()); entity.setPurchaseback_item0List(purchaseback_item0List); } + //子表 List listVO = JsonUtil.getJsonToList(list, PurchasebackListVO.class); for (PurchasebackListVO purchasebackVO : listVO) { PurchaseorderEntity purchaseorderEntity = purchasebackService.getPurchaseorder(purchasebackVO.getPurchaseOrderId()); @@ -152,17 +153,17 @@ public class PurchasebackController { purchasebackCrForm.setCreatorTime(DateUtil.getNow()); purchasebackCrForm.setCreatorUserName(userInfo.getUserId()); PurchasebackEntity entity = JsonUtil.getJsonToBean(purchasebackCrForm, PurchasebackEntity.class); - entity.setId(mainId); - purchasebackService.save(entity); + entity.setId(mainId);//uuid + purchasebackService.save(entity);//采购退货主表新增 PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(entity.getPurchaseOrderId()); purchaseorderEntity.setRefundableAmount(entity.getRefundAmount()); purchaseorderEntity.setRefundableNum(entity.getRefundNum()); - purchaseorderService.updateById(purchaseorderEntity); + purchaseorderService.updateById(purchaseorderEntity);//采购订单修改 List Purchaseback_item0List = JsonUtil.getJsonToList(purchasebackCrForm.getPurchaseback_item0List(),Purchaseback_item0Entity.class); for(Purchaseback_item0Entity entitys : Purchaseback_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setPurchasebackId(entity.getId()); - purchaseback_item0Service.save(entitys); + purchaseback_item0Service.save(entitys);//退货子表修改 } @@ -461,27 +462,18 @@ public class PurchasebackController { PurchasebackEntity subentity=JsonUtil.getJsonToBean(purchasebackUpForm, PurchasebackEntity.class); subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorUserName(entity.getCreatorUserName()); - purchasebackService.update(id, subentity); + purchasebackService.update(id, subentity);//更新主表 PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(subentity.getPurchaseOrderId()); purchaseorderEntity.setRefundableAmount(subentity.getRefundAmount()); purchaseorderEntity.setRefundableNum(subentity.getRefundNum()); - purchaseorderService.saveOrUpdate(purchaseorderEntity); + purchaseorderService.saveOrUpdate(purchaseorderEntity);//更新或新增采购订单 + //修改退货子表 QueryWrapper Purchaseback_item0queryWrapper = new QueryWrapper<>(); Purchaseback_item0queryWrapper.lambda().eq(Purchaseback_item0Entity::getPurchasebackId, entity.getId()); purchaseback_item0Service.remove(Purchaseback_item0queryWrapper); List Purchaseback_item0List = JsonUtil.getJsonToList(purchasebackUpForm.getPurchaseback_item0List(),Purchaseback_item0Entity.class); for(Purchaseback_item0Entity entitys : Purchaseback_item0List){ - - - - - - - - - - entitys.setId(RandomUtil.uuId()); entitys.setPurchasebackId(entity.getId()); purchaseback_item0Service.save(entitys); 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 ba11a681..464f0e67 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 @@ -312,6 +312,7 @@ public class PurchaseorderController { entity.setId(mainId); purchaseorderitemService.save(entity); List Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class); + //新增采购子表和修改磅单表 for (Purchaseorder_item0Entity entitys : Purchaseorder_item0List) { entitys.setId(RandomUtil.uuId()); entitys.setPurchaseorderId(entity.getId()); @@ -766,6 +767,7 @@ public class PurchaseorderController { } } } + //得到采购订单子表 vo.setPurchaseorder_item0List(JsonUtil.getJsonToList(Purchaseorder_item0List, Purchaseorder_item0Model.class)); QueryWrapper invoicesitemWrapper = new QueryWrapper<>(); invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, id); @@ -777,6 +779,7 @@ public class PurchaseorderController { } for (Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList) { } + //得到应付发票子表 vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList, Invoices_item0itemModel.class)); if (invoicesitemList != null && invoicesitemList.size() > 0) { vo.setInvoicesitemEntity(invoicesitemList.get(0)); @@ -800,6 +803,7 @@ public class PurchaseorderController { // vo.setPaymentdocItem0EntityList(paymentdocItem0Entity); } + //得到付款单 vo.setPaymentdocEntityList(PaymentdocEntity11); } // else { @@ -811,6 +815,7 @@ public class PurchaseorderController { QueryWrapper receiptinWrapper = new QueryWrapper<>(); receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id); ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper); + //得到入库单 if (receiptinEntity != null) { vo.setReceiptamount(receiptinEntity.getReceiptamount()); vo.setReceiptnum(receiptinEntity.getReceiptnum()); @@ -830,12 +835,14 @@ public class PurchaseorderController { QueryWrapper purchasebackWrapper = new QueryWrapper<>(); purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id); List PurchasebackList = purchasebackService.list(purchasebackWrapper); + //得到采购退货 vo.setPurchasebackList(PurchasebackList); List CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo()); for (CollectionpoEntity collectionpoEntity : CollectionitemList) { } + //得到退款 vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList, CollectionitemModel.class)); //副表 return ActionResult.success(vo); @@ -1033,31 +1040,37 @@ public class PurchaseorderController { PurchaseorderitemEntity subentity = JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderitemEntity.class); subentity.setCreatorUserName(entity.getCreatorUserName()); subentity.setCreatorTime(entity.getCreatorTime()); + //更新采购订单主表 purchaseorderitemService.update(id, subentity); QueryWrapper Purchaseorder_item0queryWrapper = new QueryWrapper<>(); Purchaseorder_item0queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); + //删除子表 purchaseorder_item0Service.remove(Purchaseorder_item0queryWrapper); List Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class); for (Purchaseorder_item0Entity entitys : Purchaseorder_item0List) { entitys.setId(RandomUtil.uuId()); entitys.setPurchaseorderId(entity.getId()); + //新增子表 purchaseorder_item0Service.save(entitys); PoundlistEntity poundlistEntity = poundlistService.getById(entitys.getPoundlistId()); poundlistEntity.setSettlement(entitys.getSettlement()); poundlistEntity.setPurchasePrice(entitys.getPrice()); + //更新对应磅单 poundlistService.updateById(poundlistEntity); } QueryWrapper Invoices_item0itemqueryWrapper = new QueryWrapper<>(); Invoices_item0itemqueryWrapper.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId, entity.getId()); + //删除发票子表 invoices_item0itemService.remove(Invoices_item0itemqueryWrapper); List Invoices_item0itemList = JsonUtil.getJsonToList(purchaseorderUpForm.getInvoices_item0itemList(), Invoices_item0itemEntity.class); for (Invoices_item0itemEntity entitys : Invoices_item0itemList) { entitys.setId(RandomUtil.uuId()); entitys.setPurchaseorderId(entity.getId()); + //新增发票子表 invoices_item0itemService.save(entitys); } QueryWrapper PaymentdocpoWrapper = new QueryWrapper<>(); @@ -1138,7 +1151,9 @@ public class PurchaseorderController { poundlistEntity.setPurchaseStatus("99"); poundlistEntity.setPurchaseorderId(null); } + //更新磅单 poundlistService.updateBatchById(poundlistList); + //删除对应子表 QueryWrapper queryWrapperPurchaseorder_item0 = new QueryWrapper<>(); queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0); @@ -1173,15 +1188,18 @@ public class PurchaseorderController { return ActionResult.fail("该状态下不允许删除！"); } if (entity != null) { + //删除采购订单 purchaseorderitemService.delete(entity); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId); List poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistList = poundlistService.listByIds(poundlistIdList); + //删除磅单 for (PoundlistEntity poundlistEntity : poundlistList) { poundlistService.delete(poundlistEntity); } + //删除对应子表 QueryWrapper queryWrapperPurchaseorder_item0 = new QueryWrapper<>(); queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0); @@ -1220,10 +1238,10 @@ public class PurchaseorderController { } String result = ""; int sum = 0; - if (mark.equals("0")) { + if (mark.equals("0")) {//未删除 if (purchaseorderitemlist.size() == 1 || purchaseorderitemlist.size() == 0) { for (PurchaseorderitemEntity purchaseorderitemEntity : purchaseorderitemlist) { - result += purchaseorderitemEntity.getDocumentNo() + " "; + result += purchaseorderitemEntity.getDocumentNo() + " ";//单号拼接 } return ActionResult.fail("提示：请先作废付款申请 " + result); } else { @@ -1233,7 +1251,7 @@ public class PurchaseorderController { } return ActionResult.fail("提示：请先作废付款申请 " + result + "等" + sum + "个付款申请"); } - }else { + }else {//已删除 List saleorderitemEntityList = purchaseorderitemService.querySalesorderCancel(id); if (saleorderitemEntityList.size() == 1) { for (PurchaseorderitemEntity purchaseorderEntity : saleorderitemEntityList) { @@ -1247,6 +1265,7 @@ public class PurchaseorderController { } return ActionResult.fail("提示：请先作废销售订单 " + result + "等" + sum + "个销售订单"); } + //查询发票 QueryWrapper invoicesitemEntityQueryWrapper=new QueryWrapper<>(); invoicesitemEntityQueryWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,entity.getId()); List invoicesitemList = invoicesitemService.list(invoicesitemEntityQueryWrapper); @@ -1260,6 +1279,7 @@ public class PurchaseorderController { invoicesItem1QueryWrapper.lambda().eq(InvoicesItem1Entity::getInvoicesId,invoicesitemid); invoicesItem1Service.remove(invoicesItem1QueryWrapper); } + //查询入库单 QueryWrapper receiptinQueryWrapper=new QueryWrapper<>(); receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getSouceno,entity.getId()); List Receiptinlist = receiptinService.list(receiptinQueryWrapper); @@ -1270,6 +1290,7 @@ public class PurchaseorderController { receiptin_item0QueryWrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId,receiptinid); receiptin_item0Service.remove(receiptin_item0QueryWrapper); } + //查询采购退货 QueryWrapper purchasebackQueryWrapper=new QueryWrapper<>(); purchasebackQueryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId,entity.getId()); List purchasebackEntityList = purchasebackitemService.list(purchasebackQueryWrapper); @@ -1280,6 +1301,7 @@ public class PurchaseorderController { purchaseorderItem0ueryWrapper.lambda().eq(Purchaseback_item0Entity::getPurchasebackId,purchasebackitemid); purchaseback_item0Service.remove(purchaseorderItem0ueryWrapper); } + //采购订单子表 QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); purchaseorder_item0QueryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId()); purchaseorder_item0QueryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId); @@ -1337,14 +1359,14 @@ public class PurchaseorderController { poundlistEntityQueryWrapper.lambda().eq(PoundlistEntity::getAdvance,0); poundlistEntityQueryWrapper.lambda().eq(PoundlistEntity::getIsCollection,0); poundlistEntityQueryWrapper.lambda().select(PoundlistEntity::getId); - + //根据条件用stream流查出磅单id List poundlistIdList = poundlistService.listObjs(poundlistEntityQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); if (poundlistIdList.size()>0){ List poundlistList = poundlistService.listByIds(poundlistIdList); for (PoundlistEntity poundlistEntity: poundlistList) { - poundlistEntity.setIsCollection("1"); - poundlistEntity.setPaymentDate(purchaseorderUpForm.getPaymentDate()); + poundlistEntity.setIsCollection("1");//已回款 + poundlistEntity.setPaymentDate(purchaseorderUpForm.getPaymentDate());//回款日期 // poundlistEntity.setPaymentDate(new Date()); } poundlistService.updateBatchById(poundlistList); 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 f8fe35c5..b5684b25 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 @@ -185,14 +185,15 @@ public class ReceiptinController { if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentno())){ return ActionResult.fail("单据编号不能为空"); } - entity.setId(mainId); - entity.setWarehousingdate(new Date()); - receiptinService.save(entity); + entity.setId(mainId);//uuid + entity.setWarehousingdate(new Date());//入库日期 + receiptinService.save(entity);//新增主表 List Receiptin_item0List = JsonUtil.getJsonToList(receiptinCrForm.getReceiptin_item0List(),Receiptin_item0Entity.class); for(Receiptin_item0Entity entitys : Receiptin_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setReceiptinId(entity.getId()); - entitys.setBatchno(generaterSwapUtil.getBillNumber("receiptin-num", false)); + entitys.setBatchno(generaterSwapUtil.getBillNumber("receiptin-num", false));//批号 + //新增子表 receiptin_item0Service.save(entitys); } //采购订单状态为2 @@ -200,12 +201,14 @@ public class ReceiptinController { PurchaseorderitemEntity purchaseorderEntity = purchaseorderitemService.getById(entity.getSouceno()); purchaseorderEntity.setStatus("2"); purchaseorderEntity.setIssue("1"); + //更新采购订单 purchaseorderitemService.updateById(purchaseorderEntity); List poundlistEntityList = purchaseorderitemService.getPoundList(purchaseorderEntity.getId()); for (PoundlistEntity poundlistEntity : poundlistEntityList) { poundlistEntity.setPurchaseStatus("2"); poundlistEntity.setIsInvoicing("1"); poundlistEntity.setInputDate(new Date()); + //更新磅单 poundlistService.updateById(poundlistEntity); } } @@ -418,25 +421,25 @@ public class ReceiptinController { if (StringUtils.isNotEmpty(receiptin_item0Entity.getVehicleId())){ VehicleEntity vehicleEntity = vehicleService.getById(receiptin_item0Entity.getVehicleId()); if (vehicleEntity != null){ - receiptin_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + receiptin_item0Entity.setVehicleName(vehicleEntity.getTicketno());//车辆名称 } } if (StringUtils.isNotEmpty(receiptin_item0Entity.getMaterialId())){ MaterialEntity materialEntity = materialService.getById(receiptin_item0Entity.getMaterialId()); if (materialEntity != null){ - receiptin_item0Entity.setMaterialname(materialEntity.getItemName()); + receiptin_item0Entity.setMaterialname(materialEntity.getItemName());//物料名称 } } if (StringUtils.isNotEmpty(receiptin_item0Entity.getReservoirareaId())) { ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptin_item0Entity.getReservoirareaId()); if (reservoirareaEntity != null) { - receiptin_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname()); + receiptin_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname());//库区名称 } } if (StringUtils.isNotEmpty(receiptin_item0Entity.getWarehouseId())) { WareHouseEntity wareHouseEntity = wareHouseService.getById(receiptin_item0Entity.getWarehouseId()); if (wareHouseEntity != null) { - receiptin_item0Entity.setWarehouseName(wareHouseEntity.getName()); + receiptin_item0Entity.setWarehouseName(wareHouseEntity.getName());//仓库名称 } } if (StringUtils.isNotEmpty(receiptin_item0Entity.getPoundlistId())) { 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 628cb005..e41efa75 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 @@ -140,9 +140,9 @@ public class ReceiptoutController { }else{ return ActionResult.fail("账期不存在，无法在此区间开展业务"); } - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); - receiptoutCrForm.setDocumentNo(receiptoutCrForm.getDocumentNo()); + String mainId =RandomUtil.uuId();//uuid + UserInfo userInfo=userProvider.get();//登录者信息 + receiptoutCrForm.setDocumentNo(receiptoutCrForm.getDocumentNo());//出库单单号 receiptoutCrForm.setCreatorTime(DateUtil.getNow()); receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); @@ -153,6 +153,7 @@ public class ReceiptoutController { saleorderitemService.updateById(saleorderitemEntity); QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,saleorderitemEntity.getId()); + //查询销售订单子表 List salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1); if (salesorder_item0EntityList != null && salesorder_item0EntityList.size()>0){ for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){ @@ -164,7 +165,7 @@ public class ReceiptoutController { } } entity.setId(mainId); - entity.setIssueDate(new Date()); + entity.setIssueDate(new Date());//出库日期 receiptoutService.save(entity); List Receiptout_item0List = JsonUtil.getJsonToList(receiptoutCrForm.getReceiptout_item0List(),Receiptout_item0Entity.class); for(Receiptout_item0Entity entitys : Receiptout_item0List){ @@ -230,15 +231,16 @@ public class ReceiptoutController { // receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); receiptoutCrForm.setCreatorTime(DateUtil.getNow()); receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); + //出库单信息 ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); entity.setId(mainId); - receiptoutService.save(entity); + receiptoutService.save(entity);//主表新增 List Receiptout_item0List = JsonUtil.getJsonToList(receiptoutCrForm.getReceiptout_item0List(),Receiptout_item0Entity.class); for(Receiptout_item0Entity entitys : Receiptout_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setReceiptinId(entity.getId()); // entitys.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false)); - receiptout_item0Service.save(entitys); + receiptout_item0Service.save(entitys);//子表新增 } return ActionResult.success("创建成功"); } @@ -452,7 +454,7 @@ public class ReceiptoutController { if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) { CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId()); if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())) { - vo.setCustomerName(customerEntity.getSupplierNm()); + vo.setCustomerName(customerEntity.getSupplierNm());//客户名称 } } } @@ -464,25 +466,25 @@ public class ReceiptoutController { if (StringUtils.isNotEmpty(receiptout_item0Entity.getVehicleId())) { VehicleEntity vehicleEntity = vehicleService.getById(receiptout_item0Entity.getVehicleId()); if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())) { - receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno());//车牌号 } } if (StringUtils.isNotEmpty(receiptout_item0Entity.getMaterialId())) { MaterialEntity materialEntity = materialService.getById(receiptout_item0Entity.getMaterialId()); if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) { - receiptout_item0Entity.setMaterialName(materialEntity.getItemName()); + receiptout_item0Entity.setMaterialName(materialEntity.getItemName());//物料名称 } } if(StringUtils.isNotEmpty(receiptout_item0Entity.getReservoirareaId())){ ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptout_item0Entity.getReservoirareaId()); if(reservoirareaEntity != null){ - receiptout_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname()); + receiptout_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname());//库区名称 } } if(StringUtils.isNotEmpty(receiptout_item0Entity.getWarehouseId())){ WareHouseEntity wareHouseEntity = wareHouseService.getById(receiptout_item0Entity.getWarehouseId()); if(wareHouseEntity != null){ - receiptout_item0Entity.setWarehouseName(wareHouseEntity.getName()); + receiptout_item0Entity.setWarehouseName(wareHouseEntity.getName());//仓库名称 } } } @@ -554,6 +556,7 @@ public class ReceiptoutController { } if (StringUtils.isNotEmpty(receiptoutUpForm.getSourceNo())){ SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(receiptoutUpForm.getSourceNo()); + //判断销售订单状态 if (StringUtils.isNotEmpty(saleorderitemEntity.getStatus())){ if (saleorderitemEntity.getStatus().equals("2") || saleorderitemEntity.getStatus().equals("3")){ return ActionResult.fail("订单已经开具发票或归档,不允许修改"); @@ -563,31 +566,20 @@ public class ReceiptoutController { UserInfo userInfo=userProvider.get(); ReceiptoutEntity entity= receiptoutService.getInfo(id); if(entity!=null){ + //出库单主表更新 receiptoutUpForm.setLastModifyTime(DateUtil.getNow()); receiptoutUpForm.setLastModifyUserName(userInfo.getUserId()); ReceiptoutEntity subentity=JsonUtil.getJsonToBean(receiptoutUpForm, ReceiptoutEntity.class); subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorUserName(entity.getCreatorUserName()); receiptoutService.update(id, subentity); - + //出库单子表更新 QueryWrapper Receiptout_item0queryWrapper = new QueryWrapper<>(); Receiptout_item0queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId, entity.getId()); receiptout_item0Service.remove(Receiptout_item0queryWrapper); List Receiptout_item0List = JsonUtil.getJsonToList(receiptoutUpForm.getReceiptout_item0List(),Receiptout_item0Entity.class); for(Receiptout_item0Entity entitys : Receiptout_item0List){ - - - - - - - - - - - - entitys.setId(RandomUtil.uuId()); entitys.setReceiptinId(entity.getId()); receiptout_item0Service.save(entitys); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java index 94464b2c..bab045c2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java @@ -148,7 +148,7 @@ public class SalebackController { salebackCrForm.setCreatorUserName(userInfo.getUserId()); SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class); entity.setId(mainId); - entity.setStatus("0"); + entity.setStatus("0");//已保存 salebackService.save(entity); List Saleback_item0List = JsonUtil.getJsonToList(salebackCrForm.getSaleback_item0List(),Saleback_item0Entity.class); for(Saleback_item0Entity entitys : Saleback_item0List){ @@ -200,6 +200,7 @@ public class SalebackController { if (ObjectUtils.isNotEmpty(saleorderitemEntity)){ entity.setSaledocumentNo(saleorderitemEntity.getDocumentNo()); } + //对状态进行转换 entity.setStatus("0".equals(entity.getStatus()) ? "已保存" : "已提交"); if("0".equals(entity.getCurrency())){ entity.setCurrency("人民币"); @@ -433,27 +434,18 @@ public class SalebackController { UserInfo userInfo=userProvider.get(); SalebackEntity entity= salebackService.getInfo(id); if(entity!=null){ + //更新退货主表 SalebackEntity subentity=JsonUtil.getJsonToBean(salebackUpForm, SalebackEntity.class); subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorUserName(entity.getCreatorUserName()); salebackService.update(id, subentity); - + //更新退货子表 QueryWrapper Saleback_item0queryWrapper = new QueryWrapper<>(); Saleback_item0queryWrapper.lambda().eq(Saleback_item0Entity::getSalesBackId, entity.getId()); saleback_item0Service.remove(Saleback_item0queryWrapper); List Saleback_item0List = JsonUtil.getJsonToList(salebackUpForm.getSaleback_item0List(),Saleback_item0Entity.class); for(Saleback_item0Entity entitys : Saleback_item0List){ - - - - - - - - - - entitys.setId(RandomUtil.uuId()); entitys.setSalesBackId(entity.getId()); saleback_item0Service.save(entitys); 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 3b2b47bc..aa3f9bd5 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 @@ -235,15 +235,17 @@ public class SaleorderitemController { @Transactional public ActionResult delivery(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); - List list = new ArrayList<>(); + List list = new ArrayList<>();//得到id集合 for (String id : idList){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"0"); + //查询销售订单 SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); + //销售订单子表 List dList = salesorder_item0Service.list(queryWrapper1); for (Salesorder_item0Entity entity : dList){ QueryWrapper queryWrapper2 = new QueryWrapper<>(); @@ -254,6 +256,7 @@ public class SaleorderitemController { entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId()); ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getReservoirareaId()); if(reservoirareaEntity != null){ + //得到入库单的库区 entity.setReservoirareaName(reservoirareaEntity.getAreaname()); } } @@ -261,32 +264,33 @@ public class SaleorderitemController { entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId()); WareHouseEntity wareHouseEntity = wareHouseService.getById(entity.getWarehouseId()); if(wareHouseEntity != null){ + //得到入库单的仓库 entity.setWarehouseName(wareHouseEntity.getName()); } } } VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId()); if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ - entity.setVehicleName(vehicleEntity.getTicketno()); + entity.setVehicleName(vehicleEntity.getTicketno());//得到车辆名称 } MaterialEntity materialEntity = materialService.getById(entity.getMaterialId()); if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ - entity.setMaterialName(materialEntity.getItemName()); + entity.setMaterialName(materialEntity.getItemName());//得到物料名称 } if (StringUtils.isNotEmpty(entity.getPoundlistId())) { PoundlistEntity poundlistEntity = poundlistService.getById(entity.getPoundlistId()); - entity.setPoundEntity(poundlistEntity); + entity.setPoundEntity(poundlistEntity);//磅单 } - entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false)); + entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));//出库单批号 } if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){ CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId()); if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ - saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm()); + saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());//客户名称 } } saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo()); - saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); + saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));//出库单单号 saleorderitemEntity.setList(dList); list.add(saleorderitemEntity); }else{ @@ -307,6 +311,7 @@ public class SaleorderitemController { public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); for (String id : idList) { + //查询应收发票 List arinvoicesEntityList = saleorderitemService.queryArinvoicesInfo(id); if (arinvoicesEntityList!=null && arinvoicesEntityList.size()>0) { SaleorderitemEntity Entity = saleorderitemService.getById(id); @@ -316,9 +321,11 @@ public class SaleorderitemController { ArinvoicesEntity arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesEntityList.get(0), ArinvoicesEntity.class); QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId()); + //发票金额表 List list0 = arinvoices_item0Service.list(queryWrapper3); QueryWrapper queryWrapper4 = new QueryWrapper<>(); queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId()); + //发票物料表 List list1 = arinvoices_item1Service.list(queryWrapper4); if (list0!=null && list0.size()>0){ arinvoicesEntity.setArinvoices_item0EntityList(list0); @@ -327,7 +334,7 @@ public class SaleorderitemController { for (Arinvoices_item1Entity entity : list1){ MaterialEntity materialEntity = materialService.getById(entity.getMaterialId()); if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) { - entity.setMaterialName(materialEntity.getItemName()); + entity.setMaterialName(materialEntity.getItemName());//物料名称 } } arinvoicesEntity.setArinvoices_item1EntityList(list1); @@ -335,6 +342,7 @@ public class SaleorderitemController { return ActionResult.success(arinvoicesEntity); }else { List list = new ArrayList<>(); + //查询销售订单 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(SaleorderitemEntity::getId, id); queryWrapper.lambda().eq(SaleorderitemEntity::getStatus, "1"); @@ -342,31 +350,34 @@ public class SaleorderitemController { if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); + //销售订单子表 List dList = salesorder_item0Service.list(queryWrapper1); for (Salesorder_item0Entity entity : dList) { MaterialEntity materialEntity = materialService.getById(entity.getMaterialId()); if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ - entity.setMaterialName(materialEntity.getItemName()); + entity.setMaterialName(materialEntity.getItemName());//物料名称 } QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.lambda().eq(PoundlistEntity::getId, entity.getPoundlistId()); + //查询磅单 PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); entity.setPoundEntity(poundlistEntity); } if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) { ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId()); if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName()));{ - saleorderitemEntity.setContractName(contractFileEntity.getContractName()); + saleorderitemEntity.setContractName(contractFileEntity.getContractName());//合同名称 } } if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){ CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId()); if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ - saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm()); + saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());//客户名称 } } saleorderitemEntity.setList(dList); saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo()); + //应收发票单号 saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false)); list.add(saleorderitemEntity); return ActionResult.success(list); @@ -391,6 +402,7 @@ public class SaleorderitemController { for (String id : idList) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + //查询销售订单 SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper); if (ObjectUtils.isNotEmpty(sale)){ // if (sale.getStatus().equals("3")){ @@ -400,20 +412,21 @@ public class SaleorderitemController { sale.setAmountCollected(new BigDecimal(0)); } if (sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){ - sale.setStatus("3"); + sale.setStatus("3");//销售状态为归档 saleorderitemService.updateById(sale); QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,sale.getId()); + //销售订单子表 List salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1); if (salesorder_item0EntityList !=null && salesorder_item0EntityList.size()>0){ for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){ PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId()); if (ObjectUtils.isNotEmpty(poundlistEntity)){ if (poundlistEntity.getPaymentDate() == null){ - poundlistEntity.setIsCollection("1"); - poundlistEntity.setPaymentDate(new Date()); + poundlistEntity.setIsCollection("1");//已收款 + poundlistEntity.setPaymentDate(new Date());//付款日期 } - poundlistEntity.setSalesStatus("3");//修改磅单状态 + poundlistEntity.setSalesStatus("3");//修改磅单销售状态 poundlistService.updateById(poundlistEntity); } } @@ -438,12 +451,14 @@ public class SaleorderitemController { @Transactional public ActionResult materialBack(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); - List list = new ArrayList<>(); + List list = new ArrayList<>();//id集合 for (String id : idList){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + //销售订单 SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { + //判断订单状态 if (saleorderitemEntity.getStatus().equals("0")){ return ActionResult.fail("未发货，无需退货"); } @@ -452,15 +467,17 @@ public class SaleorderitemController { } QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); + //销售订单子表 List dList = salesorder_item0Service.list(queryWrapper1); for (Salesorder_item0Entity entity : dList){ QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); + //磅单 PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); entity.setPoundEntity(poundlistEntity); } saleorderitemEntity.setList(dList); - saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false)); + saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));//销售退货单号 list.add(saleorderitemEntity); }else{ return ActionResult.fail("未找到该数据"); @@ -496,7 +513,8 @@ public class SaleorderitemController { entity.setPoundEntity(poundlistEntity); } sale.setList(dList); - sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); + sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));//回款单号 + //金额-已回款金额=默认回款金额 BigDecimal amount = sale.getPrice().subtract(sale.getAmountCollected()); sale.setAmount(amount); list.add(sale); @@ -669,12 +687,14 @@ public class SaleorderitemController { for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId()); + //判断磅单状态 if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getPurchaseStatus() != null){ if (poundlistEntity.getPurchaseStatus().equals("99") || poundlistEntity.getPurchaseStatus().equals("0") || poundlistEntity.getPurchaseStatus().equals("1")){ return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开票或未入库"); } } if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getSettlement() != null){ + //判断结算重量 if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) > 0){ VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId()); if (ObjectUtils.isNotEmpty(vehicleEntity)) { @@ -685,14 +705,16 @@ public class SaleorderitemController { } } } - String mainId =RandomUtil.uuId(); + String mainId =RandomUtil.uuId();//uuid UserInfo userInfo=userProvider.get(); // saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); saleorderitemCrForm.setCreatorUserName(userInfo.getUserId()); saleorderitemCrForm.setCreatorTime(DateUtil.getNow()); + //销售订单 SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class); entity.setId(mainId); if (entity.getPrice() != null && entity.getNotPrice()!=null) { + //计算税额 entity.setRate(entity.getPrice().subtract(entity.getNotPrice())); } if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ @@ -703,16 +725,17 @@ public class SaleorderitemController { for(Salesorder_item0Entity entitys : Salesorder_item0List){ if (entitys.getUnitPrice() != null && entitys.getPoundlistId() !=null) { PoundlistEntity poundlistEntity = poundlistService.getInfo(entitys.getPoundlistId()); - poundlistEntity.setSalesStatus("0"); - poundlistEntity.setSalesPrice(entitys.getUnitPrice()); + poundlistEntity.setSalesStatus("0");//销售状态 + poundlistEntity.setSalesPrice(entitys.getUnitPrice());//销售单价 poundlistEntity.setSalesorderId(entity.getId()); - poundlistEntity.setSalesAmounts(entitys.getPrice()); + poundlistEntity.setSalesAmounts(entitys.getPrice());//销售金额 poundlistService.updateById(poundlistEntity); } entitys.setId(RandomUtil.uuId()); entitys.setSalesOrderId(entity.getId()); salesorder_item0Service.save(entitys); } + //更新采购订单 if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId()); for (Object purchaseId : array) { @@ -1214,6 +1237,7 @@ public class SaleorderitemController { 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")){ @@ -1225,6 +1249,7 @@ public class SaleorderitemController { List Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class); for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId()); + //磅单判断 if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getSettlement() != null){ if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) > 0){ VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId()); @@ -1242,8 +1267,9 @@ public class SaleorderitemController { SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderitemUpForm, SaleorderitemEntity.class); subentity.setCreatorUserName(entity.getCreatorUserName()); subentity.setCreatorTime(entity.getCreatorTime()); - saleorderitemService.update(id, subentity); + saleorderitemService.update(id, subentity);//更新主表 + //更新子表 QueryWrapper Salesorder_item0queryWrapper = new QueryWrapper<>(); Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId()); salesorder_item0Service.remove(Salesorder_item0queryWrapper); @@ -1405,6 +1431,7 @@ public class SaleorderitemController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId()); queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId); + //查询磅单id List poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List poundlistList = poundlistService.listByIds(poundlistIdList); for (PoundlistEntity poundlistEntity: poundlistList) { @@ -1416,12 +1443,13 @@ public class SaleorderitemController { poundlistEntity.setPayDate(null); poundlistEntity.setSalesorderId(null); } + //批量更新磅单 poundlistService.updateBatchById(poundlistList); QueryWrapper queryWrapperSalesorder_item0=new QueryWrapper<>(); queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId()); salesorder_item0Service.remove(queryWrapperSalesorder_item0); - + //删除出库单 QueryWrapper receiptoutEntityQueryWrapper=new QueryWrapper<>(); receiptoutEntityQueryWrapper.lambda().eq(ReceiptoutEntity::getSourceNo,entity.getId()); List Receiptoutlist = receiptoutService.list(receiptoutEntityQueryWrapper); @@ -1432,6 +1460,7 @@ public class SaleorderitemController { receiptout_item0EntityQueryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutid); receiptout_item0Service.remove(receiptout_item0EntityQueryWrapper); } + //删除应收发票 QueryWrapper arinvoicesEntityQueryWrapper=new QueryWrapper<>(); arinvoicesEntityQueryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,entity.getId()); List arinvoicesList = arinvoicesService.list(arinvoicesEntityQueryWrapper); @@ -1445,6 +1474,7 @@ public class SaleorderitemController { queryWrapperArinvoices_item1soitem.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesid); arinvoices_item1Service.remove(queryWrapperArinvoices_item1soitem); } + //删除收款单 QueryWrapper collectionItem0EntityQueryWrapper=new QueryWrapper<>(); collectionItem0EntityQueryWrapper.lambda().eq(Collection_item0Entity::getSalesorderId,entity.getId()); List Collection_item0list = collection_item0Service.list(collectionItem0EntityQueryWrapper); @@ -1455,7 +1485,7 @@ public class SaleorderitemController { queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getId,collectionitem0id); collectionsoitemService.remove(queryWrapperCollectionsoitem); } - + //删除销售退货 QueryWrapper queryWrapperSalesbacksoitem=new QueryWrapper<>(); queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId()); List salesbacksoitemList = salesbacksoitemService.list(queryWrapperSalesbacksoitem); @@ -1481,7 +1511,7 @@ public class SaleorderitemController { if (purList.size() > 0) { List puridlist = purchaseorderitemService.listByIds(purList); for (PurchaseorderitemEntity purchaseorderitem : puridlist) { - purchaseorderitem.setIsTransfer("0"); + purchaseorderitem.setIsTransfer("0");//未转销售 // purchaseorderitem.setRemark("复磴承香阁"); } purchaseorderitemService.updateBatchById(puridlist);