From 9d63813d045c0e4ea8b058db06ceae1f9797211c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Tue, 7 Mar 2023 11:23:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArinvoicesController.java | 2 +- .../controller/CollectionController.java | 41 ++++++---- .../controller/PoundlistController.java | 3 +- .../poundlist/entity/PoundlistEntity.java | 2 + .../controller/ReceiptoutController.java | 3 +- .../controller/SalebackController.java | 2 +- .../controller/SaleorderitemController.java | 32 +++++--- .../entity/Salesorder_item0Entity.java | 3 + .../scm/basicInformation/arinvoices/Form.vue | 81 ++++++++++++++++--- .../scm/basicInformation/collection/Form.vue | 46 ++++++++--- .../basicInformation/poundlist/salesForm.vue | 27 ++++++- .../scm/basicInformation/receiptout/Form.vue | 38 ++++++++- .../scm/basicInformation/saleback/Form.vue | 51 ++++++++---- .../scm/basicInformation/saleorder/Form.vue | 11 ++- .../saleorder/arinvoicesForm.vue | 53 +++++++++++- .../saleorder/collectionForm.vue | 27 ++++++- .../saleorder/receiptoutForm.vue | 27 ++++++- .../saleorder/salebackForm.vue | 27 ++++++- 18 files changed, 400 insertions(+), 76 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 1c2722a1..02bcb789 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 @@ -133,7 +133,7 @@ public class ArinvoicesController { public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false)); +// arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false)); ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class); SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId()); saleorderitemEntity.setStatus("2");//修改销售订单状态 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 f7c0d61b..43597325 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 @@ -23,6 +23,8 @@ import jnpf.saleorder.entity.Salesorder_item0Entity; import jnpf.saleorder.service.SaleorderitemService; import jnpf.saleorder.service.Salesorder_item0Service; import org.apache.commons.lang3.ObjectUtils; +import org.apache.ibatis.annotations.Param; +import org.bytedeco.opencv.presets.opencv_core; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.collection.model.collection.*; @@ -97,6 +99,13 @@ public class CollectionController { @Autowired private PoundlistService poundlistService; + @GetMapping("/autoSerialNum") + @Transactional + public ActionResult autoSerialNum(@Param("param") String param,@Param("batchNum") String batchNum) throws DataException { + String result = generaterSwapUtil.getBillNumber(param, false); + return ActionResult.success(result); + } + /** * 提交 * @@ -267,7 +276,7 @@ public class CollectionController { } String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); +// collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); entity.setId(mainId); collectionService.save(entity); @@ -444,20 +453,22 @@ public class CollectionController { //子表 List Collection_item0List = collectionService.GetCollection_item0List(id); - for(Collection_item0Entity collection_item0Entity : Collection_item0List){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(SaleorderitemEntity::getId,collection_item0Entity.getSalesorderId()); - SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); - collection_item0Entity.setPrice(saleorderitemEntity.getPrice()); - collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected()); - collection_item0Entity.setContractId(saleorderitemEntity.getContractId()); - collection_item0Entity.setSalesorderId(saleorderitemEntity.getId()); - collection_item0Entity.setCreatorTime(saleorderitemEntity.getCreatorTime()); - collection_item0Entity.setNum(saleorderitemEntity.getNum()); - collection_item0Entity.setAdvanceAmount(saleorderitemEntity.getAdvanceAmount()); - collection_item0Entity.setRate(saleorderitemEntity.getRate()); - collection_item0Entity.setNotPrice(saleorderitemEntity.getNotPrice()); - } + for(Collection_item0Entity collection_item0Entity : Collection_item0List) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId, collection_item0Entity.getSalesorderId()); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { + collection_item0Entity.setPrice(saleorderitemEntity.getPrice()); + collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected()); + collection_item0Entity.setContractId(saleorderitemEntity.getContractId()); + collection_item0Entity.setSalesorderId(saleorderitemEntity.getId()); + collection_item0Entity.setCreatorTime(saleorderitemEntity.getCreatorTime()); + collection_item0Entity.setNum(saleorderitemEntity.getNum()); + collection_item0Entity.setAdvanceAmount(saleorderitemEntity.getAdvanceAmount()); + collection_item0Entity.setRate(saleorderitemEntity.getRate()); + collection_item0Entity.setNotPrice(saleorderitemEntity.getNotPrice()); + } + } vo.setCollection_item0List(JsonUtil.getJsonToList(Collection_item0List,Collection_item0Model.class )); //副表 return ActionResult.success(vo); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index c89c6ad0..6f47ef79 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -85,7 +85,7 @@ public class PoundlistController { * @return */ @PostMapping("/createsale/{ids}") - public ActionResult createSale(@PathVariable("ids") String ids){ + public ActionResult createSale(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); List list = new ArrayList<>(); for (String allId : idList){ @@ -97,6 +97,7 @@ public class PoundlistController { if (ObjectUtils.isNotEmpty(poundlistEntity)) { ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId()); poundlistEntity.setContractNo(entity.getContractNo()); + poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); list.add(poundlistEntity); } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index 818ab443..82c62d4f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -211,4 +211,6 @@ public class PoundlistEntity { private String contractNo; @TableField(exist = false) private String purchaseContractNo; + @TableField(exist = false) + private String documentNo; } 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 70d78c56..9f1f176d 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 @@ -178,7 +178,7 @@ public class ReceiptoutController { public ActionResult create(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); +// receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); receiptoutCrForm.setCreatorTime(DateUtil.getNow()); receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); @@ -188,6 +188,7 @@ public class ReceiptoutController { 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); } return ActionResult.success("创建成功"); 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 f082f8ab..72171fa6 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 @@ -137,7 +137,7 @@ public class SalebackController { public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false)); +// salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false)); salebackCrForm.setCreatorTime(DateUtil.getNow()); salebackCrForm.setCreatorUserName(userInfo.getUserId()); SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class); 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 725256c2..e6be2680 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 @@ -35,6 +35,7 @@ import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.service.ReservoirareaService; import jnpf.saleorder.mapper.ReceiptoutsoitemMapper; import org.apache.commons.lang3.ObjectUtils; +import org.apache.ibatis.annotations.Param; import org.bytedeco.opencv.presets.opencv_core; import org.springframework.security.core.parameters.P; import org.springframework.transaction.annotation.Transactional; @@ -151,11 +152,11 @@ public class SaleorderitemController { * @param poundlistEntity * @return */ - @PutMapping("/updatePrice/{id}") - public ActionResult updatePrice(@PathVariable("id") String id ,@RequestBody PoundlistEntity poundlistEntity){ - String ids = id; - PoundlistEntity entity = poundlistEntity; - return ActionResult.success("1"); + @PostMapping("/updatePrice") + @Transactional + public ActionResult updatePrice(@RequestBody PoundlistEntity poundlistEntity){ + poundlistService.updateById(poundlistEntity); + return ActionResult.success("修改单价成功"); } /** @@ -166,7 +167,7 @@ public class SaleorderitemController { */ @PostMapping("/delivery/{ids}") @Transactional - public ActionResult delivery(@PathVariable("ids") String ids){ + public ActionResult delivery(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); List list = new ArrayList<>(); for (String id : idList){ @@ -195,7 +196,9 @@ public class SaleorderitemController { queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); entity.setPoundEntity(poundlistEntity); + entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false)); } + saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); saleorderitemEntity.setList(dList); list.add(saleorderitemEntity); }else{ @@ -213,7 +216,7 @@ public class SaleorderitemController { @PostMapping("/invoiceentry/{ids}") @Transactional - public ActionResult invoiceEntry(@PathVariable("ids") String ids){ + public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); for (String id : idList) { QueryWrapper queryWrapper2 = new QueryWrapper<>(); @@ -246,6 +249,7 @@ public class SaleorderitemController { entity.setPoundEntity(poundlistEntity); } saleorderitemEntity.setList(dList); + saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false)); list.add(saleorderitemEntity); return ActionResult.success(list); } else { @@ -310,7 +314,7 @@ public class SaleorderitemController { */ @PostMapping("/materialback/{ids}") @Transactional - public ActionResult materialBack(@PathVariable("ids") String ids) { + public ActionResult materialBack(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); List list = new ArrayList<>(); for (String id : idList){ @@ -334,6 +338,7 @@ public class SaleorderitemController { entity.setPoundEntity(poundlistEntity); } saleorderitemEntity.setList(dList); + saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false)); list.add(saleorderitemEntity); }else{ return ActionResult.fail("未找到该数据"); @@ -350,7 +355,7 @@ public class SaleorderitemController { */ @PostMapping("/collection/{ids}") @Transactional - public ActionResult collection(@PathVariable("ids") String ids) { + public ActionResult collection(@PathVariable("ids") String ids) throws DataException { String[] idList = ids.split(","); List list = new ArrayList<>(); for (String id : idList){ @@ -369,6 +374,7 @@ public class SaleorderitemController { entity.setPoundEntity(poundlistEntity); } sale.setList(dList); + sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); list.add(sale); }else{ return ActionResult.fail("数据状态无法回款"); @@ -419,7 +425,7 @@ public class SaleorderitemController { public ActionResult create(@RequestBody @Valid SaleorderitemCrForm saleorderitemCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); +// saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); saleorderitemCrForm.setCreatorUserName(userInfo.getUserId()); saleorderitemCrForm.setCreatorTime(DateUtil.getNow()); SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class); @@ -800,6 +806,12 @@ public class SaleorderitemController { entitys.setId(RandomUtil.uuId()); entitys.setSalesOrderId(entity.getId()); salesorder_item0Service.save(entitys); + if (entitys.getUnitPrice() != null && entitys.getPoundlistId() !=null) { + PoundlistEntity poundlistEntity = new PoundlistEntity(); + poundlistEntity.setSalesPrice(entitys.getUnitPrice()); + poundlistEntity.setId(entitys.getPoundlistId()); + poundlistService.updateById(poundlistEntity); + } } return ActionResult.success("更新成功"); }else{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java index 4839ea7c..0aab90b1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java @@ -149,6 +149,9 @@ public class Salesorder_item0Entity { @TableField(exist = false) private PoundlistEntity poundEntity; + @TableField(exist = false) + private String batchNo; + } diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index 7b98220f..fa912b1e 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -130,7 +130,7 @@

- +