From 6d8060d6d8ceaeb1b58cdf761c12572147af394a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 13 Jan 2023 14:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchasebackController.java | 4 +- .../entity/PurchasebackEntity.java | 2 +- .../entity/Purchaseback_item0Entity.java | 2 +- .../entity/PurchaseorderEntity.java | 2 +- .../mapper/PurchasebackMapper.java | 2 +- .../mapper/Purchaseback_item0Mapper.java | 2 +- .../mapper/PurchaseorderMapper.java | 2 +- .../purchaseback/PurchasebackCrForm.java | 2 +- .../purchaseback/PurchasebackInfoVO.java | 2 +- .../purchaseback/PurchasebackListQuery.java | 2 +- .../purchaseback/PurchasebackListVO.java | 2 +- .../purchaseback/PurchasebackPagination.java | 2 +- .../PurchasebackPaginationExportModel.java | 2 +- .../purchaseback/PurchasebackUpForm.java | 2 +- .../purchaseback/Purchaseback_item0Model.java | 2 +- .../purchaseback/PurchaseorderListVO.java | 2 +- .../purchaseback/PurchaseorderModel.java | 2 +- .../service/PurchasebackService.java | 2 +- .../service/Purchaseback_item0Service.java | 2 +- .../service/PurchaseorderService.java | 2 +- .../service/impl/PurchasebackServiceImpl.java | 2 +- .../impl/Purchaseback_item0ServiceImpl.java | 2 +- .../impl/PurchaseorderServiceImpl.java | 2 +- .../controller/SalebackController.java | 482 ++++++++++++++++++ .../jnpf/saleback/entity/SalebackEntity.java | 90 ++++ .../saleback/entity/Saleback_item0Entity.java | 107 ++++ .../jnpf/saleback/entity/SaleorderEntity.java | 156 ++++++ .../jnpf/saleback/mapper/SalebackMapper.java | 17 + .../saleback/mapper/Saleback_item0Mapper.java | 17 + .../jnpf/saleback/mapper/SaleorderMapper.java | 17 + .../model/saleback/SalebackCrForm.java | 71 +++ .../model/saleback/SalebackInfoVO.java | 74 +++ .../model/saleback/SalebackListQuery.java | 24 + .../model/saleback/SalebackListVO.java | 81 +++ .../model/saleback/SalebackPagination.java | 25 + .../SalebackPaginationExportModel.java | 26 + .../model/saleback/SalebackUpForm.java | 83 +++ .../model/saleback/Saleback_item0Model.java | 62 +++ .../model/saleback/SaleorderListVO.java | 28 + .../model/saleback/SaleorderModel.java | 30 ++ .../saleback/service/SalebackService.java | 40 ++ .../service/Saleback_item0Service.java | 15 + .../saleback/service/SaleorderService.java | 15 + .../service/impl/SalebackServiceImpl.java | 311 +++++++++++ .../impl/Saleback_item0ServiceImpl.java | 41 ++ .../service/impl/SaleorderServiceImpl.java | 41 ++ .../controller/TradeuploadController.java | 6 +- .../resources/Purchaseorder_item0Mapper.xml | 7 + .../src/main/resources/SalebackMapper.xml | 7 + .../main/resources/Saleback_item0Mapper.xml | 7 + .../src/main/resources/SaleorderMapper.xml | 7 + .../dataInterface/DataInterfacePage.java | 2 + .../impl/DataInterfaceServiceImpl.java | 19 +- .../components/PopupSelect/index.vue | 8 +- .../basicInformation/purchaseback/Detail.vue | 6 +- .../basicInformation/purchaseback/Form.vue | 42 +- .../basicInformation/purchaseback/index.vue | 2 +- .../scm/basicInformation/saleback/Detail.vue | 235 +++++++++ .../basicInformation/saleback/ExportBox.vue | 68 +++ .../scm/basicInformation/saleback/Form.vue | 402 +++++++++++++++ .../scm/basicInformation/saleback/index.vue | 286 +++++++++++ .../scm/basicInformation/tradeupload/Form.vue | 7 +- 62 files changed, 2957 insertions(+), 55 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SaleorderEntity.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/Saleback_item0Mapper.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackCrForm.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackInfoVO.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListQuery.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackUpForm.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderListVO.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderModel.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/Saleback_item0Service.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SaleorderService.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/Saleback_item0ServiceImpl.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java create mode 100644 SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml create mode 100644 SC-boot/linkage-scm/src/main/resources/SalebackMapper.xml create mode 100644 SC-boot/linkage-scm/src/main/resources/Saleback_item0Mapper.xml create mode 100644 SC-boot/linkage-scm/src/main/resources/SaleorderMapper.xml create mode 100644 SC-web/src/views/scm/basicInformation/saleback/Detail.vue create mode 100644 SC-web/src/views/scm/basicInformation/saleback/ExportBox.vue create mode 100644 SC-web/src/views/scm/basicInformation/saleback/Form.vue create mode 100644 SC-web/src/views/scm/basicInformation/saleback/index.vue 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 b599b3ec..f815a688 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 @@ -56,7 +56,7 @@ import jnpf.util.enums.FileTypeEnum; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Slf4j @RestController @@ -363,6 +363,8 @@ public class PurchasebackController { List jg_purchaseback_item0List = purchasebackService.GetPurchaseback_item0List(id); List jg_purchaseback_item0ModelList = JsonUtil.getJsonToList(jg_purchaseback_item0List,Purchaseback_item0Model.class); for(Purchaseback_item0Model jg_purchaseback_item0Model : jg_purchaseback_item0ModelList){ + Map licenseNumMap = new HashMap<>(); + jg_purchaseback_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383214061812227333","license_num","license_num",jg_purchaseback_item0Model.getLicenseNum(),licenseNumMap)); } vo.setPurchaseback_item0List(jg_purchaseback_item0ModelList); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java index 18ae00b8..0b2e7939 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data @TableName("jg_purchaseback") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java index 0879f414..8efdf926 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data @TableName("jg_purchaseback_item0") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java index 2e9dd180..cec78f94 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data @TableName("jg_purchaseorder") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java index ae922520..2341889c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ public interface PurchasebackMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/Purchaseback_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/Purchaseback_item0Mapper.java index c39ed716..6d9fe10b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/Purchaseback_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/Purchaseback_item0Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ public interface Purchaseback_item0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchaseorderMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchaseorderMapper.java index aadf397d..92fb83e5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchaseorderMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchaseorderMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ public interface PurchaseorderMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackCrForm.java index e5a29469..7a7a8d94 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackCrForm.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackCrForm { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java index 8be3ddf7..a8df30f3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackInfoVO{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListQuery.java index 10ebddd6..d548380d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackListQuery extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java index c90b048b..1f416922 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackListVO{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPagination.java index 0a3079e6..e3b7ebfc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackPagination extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java index 291012f1..e9dbe7ec 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackPaginationExportModel extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackUpForm.java index f67c009e..97726a66 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackUpForm.java @@ -16,7 +16,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchasebackUpForm{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java index 8dae4160..08438246 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ @Data public class Purchaseback_item0Model { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderListVO.java index ead92415..0bceb41a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-12 + * @日期： 2023-01-13 */ @Data public class PurchaseorderListVO{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderModel.java index b64fa4ab..a777ce17 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchaseorderModel.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ @Data public class PurchaseorderModel { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchasebackService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchasebackService.java index c0247072..d948d423 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchasebackService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchasebackService.java @@ -13,7 +13,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ public interface PurchasebackService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/Purchaseback_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/Purchaseback_item0Service.java index c46a2c51..9892a041 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/Purchaseback_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/Purchaseback_item0Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ public interface Purchaseback_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchaseorderService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchaseorderService.java index a9d7ff70..5305ebb5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchaseorderService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/PurchaseorderService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ public interface PurchaseorderService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java index 88b287da..23c74a0a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java @@ -38,7 +38,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ @Service public class PurchasebackServiceImpl extends ServiceImpl implements PurchasebackService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/Purchaseback_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/Purchaseback_item0ServiceImpl.java index 2cc13008..b02a8252 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/Purchaseback_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/Purchaseback_item0ServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ @Service public class Purchaseback_item0ServiceImpl extends ServiceImpl implements Purchaseback_item0Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchaseorderServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchaseorderServiceImpl.java index 5c795c07..dec21631 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchaseorderServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchaseorderServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-12 + * 日期： 2023-01-13 */ @Service public class PurchaseorderServiceImpl extends ServiceImpl implements PurchaseorderService{ 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 new file mode 100644 index 00000000..5b811e7d --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java @@ -0,0 +1,482 @@ + + +package jnpf.saleback.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import jnpf.base.ActionResult; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.base.UserInfo; +import jnpf.base.vo.DownloadVO; +import jnpf.config.ConfigValueUtil; +import jnpf.exception.DataException; +import org.springframework.transaction.annotation.Transactional; +import jnpf.base.entity.ProvinceEntity; +import jnpf.saleback.model.saleback.*; +import jnpf.saleback.model.saleback.SalebackPagination; +import jnpf.saleback.entity.*; +import jnpf.saleback.entity.Saleback_item0Entity; +import jnpf.util.*; +import jnpf.base.util.*; +import jnpf.base.vo.ListVO; +import jnpf.util.context.SpringContext; +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import lombok.Cleanup; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import jnpf.saleback.entity.SalebackEntity; +import jnpf.saleback.service.SalebackService; +import jnpf.saleback.entity.Saleback_item0Entity; +import jnpf.saleback.service.Saleback_item0Service; +import jnpf.saleback.service.SaleorderService; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.multipart.MultipartFile; +import javax.validation.Valid; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import jnpf.util.GeneraterSwapUtil; +import java.util.*; + +import jnpf.util.file.UploadUtil; +import jnpf.util.enums.FileTypeEnum; + +/** + * + * saleback + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Slf4j +@RestController +@Api(tags = "saleback" , value = "saleback") +@RequestMapping("/api/saleback/Saleback") +public class SalebackController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private ConfigValueUtil configValueUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private SalebackService salebackService; + + @Autowired + private Saleback_item0Service saleback_item0Service; + + @Autowired + private SaleorderService saleorderService; + + + /** + * 列表 + * + * @param salebackPagination + * @return + */ + @PostMapping("/getList") + public ActionResult list(@RequestBody SalebackPagination salebackPagination)throws IOException{ + List list= salebackService.getList(salebackPagination); + //处理id字段转名称，若无需转或者为空可删除 + for(SalebackEntity entity:list){ + Map salesOrderIdMap = new HashMap<>(); + entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",entity.getSalesOrderId(),salesOrderIdMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); + } + List listVO=JsonUtil.getJsonToList(list,SalebackListVO.class); + for(SalebackListVO salebackVO:listVO){ + SaleorderEntity saleorderEntity = salebackService.getSaleorder(salebackVO.getSalesOrderId()); + if(ObjectUtil.isNotEmpty(saleorderEntity)){ + salebackVO.setJg_salesorder(JsonUtil.getJsonToBean(saleorderEntity,SaleorderListVO.class)); + } + } + + + PageListVO vo=new PageListVO(); + vo.setList(listVO); + PaginationVO page=JsonUtil.getJsonToBean(salebackPagination,PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + + /** + * 创建 + * + * @param salebackCrForm + * @return + */ + @PostMapping + @Transactional + public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException { + String mainId =RandomUtil.uuId(); + UserInfo userInfo=userProvider.get(); + salebackCrForm.setCreatorTime(DateUtil.getNow()); + salebackCrForm.setCreatorUserName(userInfo.getUserId()); + SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class); + entity.setId(mainId); + salebackService.save(entity); + List Saleback_item0List = JsonUtil.getJsonToList(salebackCrForm.getSaleback_item0List(),Saleback_item0Entity.class); + for(Saleback_item0Entity entitys : Saleback_item0List){ + entitys.setId(RandomUtil.uuId()); + entitys.setSalesBackId(entity.getId()); + + + + + + + + + + + saleback_item0Service.save(entitys); + } + + + //子表数据 + if(ObjectUtil.isNotEmpty(salebackCrForm.getJg_salesorder())){ + SaleorderEntity jg_salesorderentity = JsonUtil.getJsonToBean(salebackCrForm.getJg_salesorder(), SaleorderEntity.class); + jg_salesorderentity.setId(entity.getSalesOrderId()); + //自动生成的字段 + jg_salesorderentity.setId(mainId); + saleorderService.save(jg_salesorderentity); + } + + return ActionResult.success("创建成功"); +} + + + + /** + * 模板下载 + * + * @return + */ + @ApiOperation("模板下载") + @GetMapping("/templateDownload") + public ActionResult TemplateDownload(){ + UserInfo userInfo=userProvider.get(); + DownloadVO vo=DownloadVO.builder().build(); + try{ + vo.setName("职员信息.xlsx"); + vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary")); + }catch(Exception e){ + log.error("信息导出Excel错误:{}" ,e.getMessage()); + } + return ActionResult.success(vo); + } + /** + * 导出Excel + * + * @return + */ + @ApiOperation("导出Excel") + @GetMapping("/Actions/Export") + public ActionResult Export(SalebackPaginationExportModel salebackPaginationExportModel) throws IOException { + if (StringUtil.isEmpty(salebackPaginationExportModel.getSelectKey())){ + return ActionResult.fail("请选择导出字段"); + } + SalebackPagination salebackPagination=JsonUtil.getJsonToBean(salebackPaginationExportModel, SalebackPagination.class); + List list= salebackService.getTypeList(salebackPagination,salebackPaginationExportModel.getDataType()); + //处理id字段转名称，若无需转或者为空可删除 + for(SalebackEntity entity:list){ + Map salesOrderIdMap = new HashMap<>(); + entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",entity.getSalesOrderId(),salesOrderIdMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); + } + List listVO=JsonUtil.getJsonToList(list,SalebackListVO.class); + for(SalebackListVO salebackVO:listVO){ + SaleorderEntity saleorderEntity = salebackService.getSaleorder(salebackVO.getSalesOrderId()); + if(ObjectUtil.isNotEmpty(saleorderEntity)){ + salebackVO.setJg_salesorder(JsonUtil.getJsonToBean(saleorderEntity,SaleorderListVO.class)); + } + } + + //转换为map输出 + List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); + mapList.stream().forEach(map -> { + Map map2 =new HashMap<>(); + Map map1 = JsonUtil.entityToMap(map.get("saleorder")); + for (Map.Entry entry : map1.entrySet()){ + String key = "saleorder." +entry.getKey(); + map2.put(key,entry.getValue()); + } + map.putAll(map2); + }); + String[]keys=!StringUtil.isEmpty(salebackPaginationExportModel.getSelectKey())?salebackPaginationExportModel.getSelectKey().split(","):new String[0]; + UserInfo userInfo=userProvider.get(); + DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); + return ActionResult.success(vo); + } + //导出表格 + public DownloadVO creatModelExcel(String path,List>list,String[]keys,UserInfo userInfo){ + DownloadVO vo=DownloadVO.builder().build(); + List entitys=new ArrayList<>(); + if(keys.length>0){ + for(String key:keys){ + switch(key){ + case "jg_salesorder.contractName" : + entitys.add(new ExcelExportEntity("合同名称" ,"jg_salesorder.contractName")); + break; + case "jg_salesorder.costomerName" : + entitys.add(new ExcelExportEntity("客户名称" ,"jg_salesorder.costomerName")); + break; + case "documentNo" : + entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); + break; + case "salesOrderId" : + entitys.add(new ExcelExportEntity("销售订单" ,"salesOrderId")); + break; + case "currency" : + entitys.add(new ExcelExportEntity("币别" ,"currency")); + break; + case "refundAmount" : + entitys.add(new ExcelExportEntity("退款金额" ,"refundAmount")); + break; + case "refundNum" : + entitys.add(new ExcelExportEntity("退货数量" ,"refundNum")); + break; + case "remark" : + entitys.add(new ExcelExportEntity("备注" ,"remark")); + break; + case "actualAmount" : + entitys.add(new ExcelExportEntity("实退金额" ,"actualAmount")); + break; + case "status" : + entitys.add(new ExcelExportEntity("单据状态 " ,"status")); + break; + case "creatorTime" : + entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime")); + break; + case "creatorUserName" : + entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName")); + break; + default: + break; + } + } + } + + ExportParams exportParams = new ExportParams(null, "表单信息"); + exportParams.setType(ExcelType.XSSF); + try{ + @Cleanup Workbook workbook = new HSSFWorkbook(); + if (entitys.size()>0){ + workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); + } + String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; + + String fileName = configValueUtil.getTemporaryFilePath() + name; + @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName)); + workbook.write(output); + //上传文件 + UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name); + + vo.setName(name); + vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary")); + } catch (Exception e) { + log.error("信息导出Excel错误:{}", e.getMessage()); + e.printStackTrace(); + } + return vo; + } + + + /** + * 批量删除 + * + * @param ids + * @return + */ + @DeleteMapping("/batchRemove/{ids}") + @Transactional + public ActionResult batchRemove(@PathVariable("ids") String ids){ + String[] idList = ids.split(","); + int i =0; + for (String allId : idList){ + this.delete(allId); + i++; + } + if (i == 0 ){ + return ActionResult.fail("删除失败"); + } + return ActionResult.success("删除成功"); + } + + + /** + * 信息 + * + * @param id + * @return + */ + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id){ + SalebackEntity entity= salebackService.getInfo(id); + SalebackInfoVO vo=JsonUtil.getJsonToBean(entity, SalebackInfoVO.class); + if(vo.getCreatorTime()!=null){ + vo.setCreatorTime(vo.getCreatorTime()); + } + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + + //子表 + List Saleback_item0List = salebackService.GetSaleback_item0List(id); + for(Saleback_item0Entity saleback_item0Entity : Saleback_item0List){ + } + vo.setSaleback_item0List(JsonUtil.getJsonToList(Saleback_item0List,Saleback_item0Model.class )); + //副表 + QueryWrapper queryWrapperSaleorder = new QueryWrapper<>(); + queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId()); + SaleorderEntity jg_salesorderEntity = saleorderService.getOne(queryWrapperSaleorder); + vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class)); + return ActionResult.success(vo); + } + + /** + * 表单信息(详情页) + * + * @param id + * @return + */ + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + SalebackEntity entity= salebackService.getInfo(id); + SalebackInfoVO vo=JsonUtil.getJsonToBean(entity, SalebackInfoVO.class); + + //子表数据转换 + List jg_salesback_item0List = salebackService.GetSaleback_item0List(id); + List jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class); + for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){ + Map licenseNumMap = new HashMap<>(); + jg_salesback_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383568082196537541","license_num","license_num",jg_salesback_item0Model.getLicenseNum(),licenseNumMap)); + } + vo.setSaleback_item0List(jg_salesback_item0ModelList); + + //附表数据转换 + QueryWrapper queryWrapperSaleorder = new QueryWrapper<>(); + queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId()); + SaleorderEntity jg_salesorderEntity = saleorderService.getOne(queryWrapperSaleorder); + + if(ObjectUtil.isEmpty(jg_salesorderEntity)){ + jg_salesorderEntity = new SaleorderEntity(); + } + vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class)); + +//添加到详情表单对象中 + Map salesOrderIdMap = new HashMap<>(); + vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",vo.getSalesOrderId(),salesOrderIdMap)); + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + + return ActionResult.success(vo); + } + + + + + /** + * 更新 + * + * @param id + * @return + */ + @PutMapping("/{id}") + @Transactional + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SalebackUpForm salebackUpForm) throws DataException { + 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); + } + + //子表数据 + if(ObjectUtil.isNotEmpty(salebackUpForm.getJg_salesorder())){ + QueryWrapper queryWrapperSaleorder =new QueryWrapper<>(); + queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId()); + SaleorderEntity jg_salesorderOneEntity= saleorderService.getOne(queryWrapperSaleorder); + SaleorderEntity jg_salesorderentity=JsonUtil.getJsonToBean(salebackUpForm.getJg_salesorder(), SaleorderEntity.class); + jg_salesorderentity.setId(jg_salesorderOneEntity.getId()); + jg_salesorderentity.setId(entity.getSalesOrderId()); + saleorderService.updateById(jg_salesorderentity); + } + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } + } + + + + /** + * 删除 + * + * @param id + * @return + */ + @DeleteMapping("/{id}") + @Transactional + public ActionResult delete(@PathVariable("id") String id){ + SalebackEntity entity= salebackService.getInfo(id); + if(entity!=null){ + salebackService.delete(entity); + QueryWrapper queryWrapperSaleback_item0=new QueryWrapper<>(); + queryWrapperSaleback_item0.lambda().eq(Saleback_item0Entity::getSalesBackId,entity.getId()); + saleback_item0Service.remove(queryWrapperSaleback_item0); + //子表数据 + QueryWrapper queryWrapperSaleorder=new QueryWrapper<>(); + queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId()); + saleorderService.remove(queryWrapperSaleorder); + + } + return ActionResult.success("删除成功"); + } + + + + + + + + + + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java new file mode 100644 index 00000000..ab27e62f --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java @@ -0,0 +1,90 @@ +package jnpf.saleback.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * 销售退货 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +@TableName("jg_salesback") +public class SalebackEntity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("DOCUMENT_NO") + private String documentNo; + + @TableField("SALES_ORDER_ID") + private String salesOrderId; + + @TableField("CURRENCY") + private String currency; + + @TableField("REFUND_NUM") + private BigDecimal refundNum; + + @TableField("REFUND_AMOUNT") + private BigDecimal refundAmount; + + @TableField("REMARK") + private String remark; + + @TableField("ACTUAL_AMOUNT") + private String actualAmount; + + @TableField("STATUS") + private String status; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java new file mode 100644 index 00000000..13149bdc --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java @@ -0,0 +1,107 @@ +package jnpf.saleback.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * 销售退货明细 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +@TableName("jg_salesback_item0") +public class Saleback_item0Entity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("POUNDLIST_ID") + private String poundlistId; + + @TableField("SALESORDER_ITEM0_ID") + private String salesorderItem0Id; + + @TableField("SALES_BACK_ID") + private String salesBackId; + + @TableField("LICENSE_NUM") + private String licenseNum; + + @TableField("MATERIAL_NAME") + private String materialName; + + @TableField("POUNT_USER") + private String pountUser; + + @TableField("POUNT_TYPE") + private String pountType; + + @TableField("PRICE") + private BigDecimal price; + + @TableField("SETTLEMENT") + private BigDecimal settlement; + + @TableField("RATE") + private String rate; + + @TableField("UNIT") + private String unit; + + @TableField("AMOUNT") + private BigDecimal amount; + + @TableField("NOT_AMOUNT") + private BigDecimal notAmount; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SaleorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SaleorderEntity.java new file mode 100644 index 00000000..8fc29f7a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SaleorderEntity.java @@ -0,0 +1,156 @@ +package jnpf.saleback.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * 销售订单 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +@TableName("jg_salesorder") +public class SaleorderEntity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("DOCUMENT_NO") + private String documentNo; + + @TableField("ERP_NO") + private String erpNo; + + @TableField("SOURCE_PO_NO") + private String sourcePoNo; + + @TableField("CONTRACT_CODE") + private String contractCode; + + @TableField("CONTRACT_NAME") + private String contractName; + + @TableField("CONTRACT_NO") + private String contractNo; + + @TableField("COSTOMER_CODE") + private String costomerCode; + + @TableField("COSTOMER_NAME") + private String costomerName; + + @TableField("NUM") + private BigDecimal num; + + @TableField("PRICE") + private BigDecimal price; + + @TableField("NOT_PRICE") + private BigDecimal notPrice; + + @TableField("RATE") + private BigDecimal rate; + + @TableField("POUND_NUM") + private Integer poundNum; + + @TableField("CURRENCY") + private String currency; + + @TableField("ADVANCE_AMOUNT") + private BigDecimal advanceAmount; + + @TableField("AMOUNT_COLLECTED") + private BigDecimal amountCollected; + + @TableField("INVOICE_NUM") + private BigDecimal invoiceNum; + + @TableField("INVOICE_AMOUNT") + private BigDecimal invoiceAmount; + + @TableField("RETURN_QUANTITY") + private BigDecimal returnQuantity; + + @TableField("REF_AMOUNT") + private BigDecimal reamount; + + @TableField("STATUS") + private String status; + + @TableField("SOURCE_SYSTEM") + private String sourceSystem; + + @TableField("IS_SETTLE") + private String isSettle; + + @TableField("ISSUE") + private String issue; + + @TableField("REMARK") + private String remark; + + @TableField("CLOSING_DATE") + private Date closingDate; + + @TableField("OVERDUE_INTEREST") + private BigDecimal overdueInterest; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java new file mode 100644 index 00000000..becf73d1 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java @@ -0,0 +1,17 @@ +package jnpf.saleback.mapper; + + +import jnpf.saleback.entity.SalebackEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * saleback + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +public interface SalebackMapper extends BaseMapper { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/Saleback_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/Saleback_item0Mapper.java new file mode 100644 index 00000000..27b0fdff --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/Saleback_item0Mapper.java @@ -0,0 +1,17 @@ +package jnpf.saleback.mapper; + + +import jnpf.saleback.entity.Saleback_item0Entity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * jg_salesback_item0 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +public interface Saleback_item0Mapper extends BaseMapper { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java new file mode 100644 index 00000000..106965bc --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java @@ -0,0 +1,17 @@ +package jnpf.saleback.mapper; + + +import jnpf.saleback.entity.SaleorderEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * jg_salesorder + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +public interface SaleorderMapper extends BaseMapper { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackCrForm.java new file mode 100644 index 00000000..a9369f6c --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackCrForm.java @@ -0,0 +1,71 @@ + + +package jnpf.saleback.model.saleback; + +import jnpf.saleback.model.saleback.Saleback_item0Model; +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackCrForm { + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 销售订单 **/ + @JsonProperty("salesOrderId") + private String salesOrderId; + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + /** 退款金额 **/ + @JsonProperty("refundAmount") + private String refundAmount; + + /** 退货数量 **/ + @JsonProperty("refundNum") + private String refundNum; + + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + /** 实退金额 **/ + @JsonProperty("actualAmount") + private String actualAmount; + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 创建时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + + /** 创建人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 子表数据 **/ + @JsonProperty("saleback_item0List") + private List saleback_item0List; + + /** 列表子表数据 **/ + @JsonProperty("jg_salesorder") + private SaleorderModel jg_salesorder; + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackInfoVO.java new file mode 100644 index 00000000..f578dd57 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackInfoVO.java @@ -0,0 +1,74 @@ + + + +package jnpf.saleback.model.saleback; + +import jnpf.saleback.model.saleback.Saleback_item0Model; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackInfoVO{ + /** 主键 **/ + @JsonProperty("id") + private String id; + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 销售订单 **/ + @JsonProperty("salesOrderId") + private String salesOrderId; + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + /** 退款金额 **/ + @JsonProperty("refundAmount") + private String refundAmount; + + /** 退货数量 **/ + @JsonProperty("refundNum") + private String refundNum; + + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + /** 实退金额 **/ + @JsonProperty("actualAmount") + private String actualAmount; + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 创建时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + + /** 创建人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 子表数据 **/ + @JsonProperty("saleback_item0List") + private List saleback_item0List; + /** 列表子表数据 **/ + @JsonProperty("jg_salesorder") + private SaleorderModel jg_salesorder; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListQuery.java new file mode 100644 index 00000000..297093bc --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListQuery.java @@ -0,0 +1,24 @@ +package jnpf.saleback.model.saleback; + +import lombok.Data; +import java.util.Date; +import jnpf.base.Pagination; +import java.util.List; +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackListQuery extends Pagination { + + /** 单据编号 */ + private String documentNo; + /** + * 菜单id + */ + private String menuId; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java new file mode 100644 index 00000000..495e3945 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java @@ -0,0 +1,81 @@ + + +package jnpf.saleback.model.saleback; + + +import lombok.Data; +import java.sql.Time; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.math.BigDecimal; +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackListVO{ + + /** 主键 */ + private String id; + + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + + /** 销售订单 **/ + @JsonProperty("salesOrderId") + private String salesOrderId; + + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + + /** 退款金额 **/ + @JsonProperty("refundAmount") + private String refundAmount; + + + /** 退货数量 **/ + @JsonProperty("refundNum") + private String refundNum; + + + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + + /** 实退金额 **/ + @JsonProperty("actualAmount") + private String actualAmount; + + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + + /** 创建时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + + + /** 创建人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + + /**列表子表数据 */ + @JsonProperty("jg_salesorder") + private SaleorderListVO jg_salesorder; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java new file mode 100644 index 00000000..5a1f2caf --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java @@ -0,0 +1,25 @@ +package jnpf.saleback.model.saleback; + + +import lombok.Data; +import jnpf.base.Pagination; +import java.util.List; + +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackPagination extends Pagination { + + /** 单据编号 */ + private String documentNo; + /** + * 菜单id + */ + private String menuId; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java new file mode 100644 index 00000000..04aa2070 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPaginationExportModel.java @@ -0,0 +1,26 @@ +package jnpf.saleback.model.saleback; + +import lombok.Data; +import jnpf.base.Pagination; +import java.util.*; +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackPaginationExportModel extends Pagination { + + private String selectKey; + + private String json; + + private String dataType; + + + /** 单据编号 */ + private String documentNo; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackUpForm.java new file mode 100644 index 00000000..37ba670a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackUpForm.java @@ -0,0 +1,83 @@ + + +package jnpf.saleback.model.saleback; + +import jnpf.saleback.model.saleback.Saleback_item0Model; +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Data; + +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SalebackUpForm{ + /** 主键 */ + private String id; + + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + + /** 销售订单 **/ + @JsonProperty("salesOrderId") + private String salesOrderId; + + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + + /** 退款金额 **/ + @JsonProperty("refundAmount") + private String refundAmount; + + + /** 退货数量 **/ + @JsonProperty("refundNum") + private String refundNum; + + + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + + /** 实退金额 **/ + @JsonProperty("actualAmount") + private String actualAmount; + + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + + /** 创建时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + + + /** 创建人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 子表数据 **/ + @JsonProperty("saleback_item0List") + private List saleback_item0List; + + /** 列表子表数据 **/ + @JsonProperty("jg_salesorder") + private SaleorderModel jg_salesorder; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java new file mode 100644 index 00000000..869f3ce4 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java @@ -0,0 +1,62 @@ +package jnpf.saleback.model.saleback; + +import lombok.Data; +import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * + * + * 版本： V3.2.0 + * 版权: LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +@Data +public class Saleback_item0Model { + + /** 车牌号 **/ + @JsonProperty("licenseNum") + private String licenseNum; + + /** 物料名称 **/ + @JsonProperty("materialName") + private String materialName; + + /** 结算重量 **/ + @JsonProperty("settlement") + private String settlement; + + /** 计量单位 **/ + @JsonProperty("unit") + private String unit; + + /** 采购单价 **/ + @JsonProperty("price") + private String price; + + /** 税率 **/ + @JsonProperty("rate") + private String rate; + + /** 应退金额 **/ + @JsonProperty("amount") + private String amount; + + /** 税额 **/ + @JsonProperty("notAmount") + private String notAmount; + + /** 业务员 **/ + @JsonProperty("pountUser") + private String pountUser; + + /** 磅单类型 **/ + @JsonProperty("pountType") + private String pountType; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderListVO.java new file mode 100644 index 00000000..2dab5e3d --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderListVO.java @@ -0,0 +1,28 @@ + + +package jnpf.saleback.model.saleback; + + +import lombok.Data; +import java.sql.Time; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.math.BigDecimal; +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-13 + */ +@Data +public class SaleorderListVO{ + /** 合同名称 **/ + @JsonProperty("contractName") + private String contractName; + /** 客户名称 **/ + @JsonProperty("costomerName") + private String costomerName; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderModel.java new file mode 100644 index 00000000..c4fd0074 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderModel.java @@ -0,0 +1,30 @@ +package jnpf.saleback.model.saleback; + +import lombok.Data; +import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * + * + * 版本： V3.2.0 + * 版权: LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +@Data +public class SaleorderModel { + + /** 合同名称 **/ + @JsonProperty("contractName") + private String contractName; + + /** 客户名称 **/ + @JsonProperty("costomerName") + private String costomerName; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java new file mode 100644 index 00000000..d9fa96b5 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java @@ -0,0 +1,40 @@ +package jnpf.saleback.service; +import jnpf.saleback.entity.Saleback_item0Entity; +import jnpf.saleback.service.Saleback_item0Service; + +import jnpf.saleback.entity.SalebackEntity; +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.saleback.entity.SaleorderEntity; +import jnpf.saleback.model.saleback.SalebackPagination; +import java.util.*; +/** + * + * saleback + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +public interface SalebackService extends IService { + + List getList(SalebackPagination salebackPagination); + + List getTypeList(SalebackPagination salebackPagination,String dataType); + + + + SalebackEntity getInfo(String id); + + void delete(SalebackEntity entity); + + void create(SalebackEntity entity); + + boolean update( String id, SalebackEntity entity); + +// 子表方法 + List GetSaleback_item0List(String id); + + //列表子表数据方法 + SaleorderEntity getSaleorder(String id); + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/Saleback_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/Saleback_item0Service.java new file mode 100644 index 00000000..2383e360 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/Saleback_item0Service.java @@ -0,0 +1,15 @@ +package jnpf.saleback.service; + +import jnpf.saleback.entity.Saleback_item0Entity; +import com.baomidou.mybatisplus.extension.service.IService; +/** + * + * jg_salesback_item0 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +public interface Saleback_item0Service extends IService { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SaleorderService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SaleorderService.java new file mode 100644 index 00000000..c1bbbc61 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SaleorderService.java @@ -0,0 +1,15 @@ +package jnpf.saleback.service; + +import jnpf.saleback.entity.SaleorderEntity; +import com.baomidou.mybatisplus.extension.service.IService; +/** + * + * jg_salesorder + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +public interface SaleorderService extends IService { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java new file mode 100644 index 00000000..0021a57c --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java @@ -0,0 +1,311 @@ +package jnpf.saleback.service.impl; + +import jnpf.saleback.entity.*; +import jnpf.saleback.mapper.SalebackMapper; +import jnpf.saleback.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; +import jnpf.permission.model.authorize.AuthorizeConditionModel; + + +import jnpf.saleback.model.saleback.SalebackPagination; + +import jnpf.permission.service.AuthorizeService; +import java.lang.reflect.Field; +import com.baomidou.mybatisplus.annotation.TableField; +import java.util.stream.Collectors; + + + + + + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; + +/** + * + * saleback + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +@Service +public class SalebackServiceImpl extends ServiceImpl implements SalebackService{ + + + @Autowired + private UserProvider userProvider; + + @Autowired + private AuthorizeService authorizeService; + + @Autowired + private SaleorderService saleorderService; + + @Autowired + private Saleback_item0Service saleback_item0Service; + + + + + @Override + public List getList(SalebackPagination salebackPagination){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int salebackNum =0; + QueryWrapper salebackQueryWrapper=new QueryWrapper<>(); + int saleback_item0Num =0; + QueryWrapper saleback_item0QueryWrapper=new QueryWrapper<>(); + int saleorderNum =0; + QueryWrapper saleorderQueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); + if (ObjectUtil.isEmpty(salebackObj)){ + return new ArrayList<>(); + } else { + salebackQueryWrapper = (QueryWrapper)salebackObj; + salebackNum++; + } + Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); + if (ObjectUtil.isEmpty(saleback_item0Obj)){ + return new ArrayList<>(); + } else { + saleback_item0QueryWrapper = (QueryWrapper)saleback_item0Obj; + saleback_item0Num++; + } + Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); + if (ObjectUtil.isEmpty(saleorderObj)){ + return new ArrayList<>(); + } else { + saleorderQueryWrapper = (QueryWrapper)saleorderObj; + saleorderNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); + if (ObjectUtil.isEmpty(salebackObj)){ + return new ArrayList<>(); + } else { + salebackQueryWrapper = (QueryWrapper)salebackObj; + salebackNum++; + } + + + Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); + if (ObjectUtil.isEmpty(saleback_item0Obj)){ + return new ArrayList<>(); + } else { + saleback_item0QueryWrapper = (QueryWrapper)saleback_item0Obj; + saleback_item0Num++; + } + + + Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); + if (ObjectUtil.isEmpty(saleorderObj)){ + return new ArrayList<>(); + } else { + saleorderQueryWrapper = (QueryWrapper)saleorderObj; + saleorderNum++; + } + + + } + } + if(StringUtil.isNotEmpty(salebackPagination.getDocumentNo())){ + salebackNum++; + salebackQueryWrapper.lambda().like(SalebackEntity::getDocumentNo,salebackPagination.getDocumentNo()); + } + + if(AllIdList.size()>0){ + salebackQueryWrapper.lambda().in(SalebackEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(salebackPagination.getSidx())){ + salebackQueryWrapper.lambda().orderByDesc(SalebackEntity::getId); + }else{ + try { + String sidx = salebackPagination.getSidx(); + SalebackEntity salebackEntity = new SalebackEntity(); + Field declaredField = salebackEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + salebackQueryWrapper="asc".equals(salebackPagination.getSort().toLowerCase())?salebackQueryWrapper.orderByAsc(value):salebackQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize()); + IPage userIPage=this.page(page, salebackQueryWrapper); + return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return salebackPagination.setData(list, list.size()); + } + } + @Override + public List getTypeList(SalebackPagination salebackPagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int salebackNum =0; + QueryWrapper salebackQueryWrapper=new QueryWrapper<>(); + int saleback_item0Num =0; + QueryWrapper saleback_item0QueryWrapper=new QueryWrapper<>(); + int saleorderNum =0; + QueryWrapper saleorderQueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); + if (ObjectUtil.isEmpty(salebackObj)){ + return new ArrayList<>(); + } else { + salebackQueryWrapper = (QueryWrapper)salebackObj; + salebackNum++; + } + Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); + if (ObjectUtil.isEmpty(saleback_item0Obj)){ + return new ArrayList<>(); + } else { + saleback_item0QueryWrapper = (QueryWrapper)saleback_item0Obj; + saleback_item0Num++; + } + Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); + if (ObjectUtil.isEmpty(saleorderObj)){ + return new ArrayList<>(); + } else { + saleorderQueryWrapper = (QueryWrapper)saleorderObj; + saleorderNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback")); + if (ObjectUtil.isEmpty(salebackObj)){ + return new ArrayList<>(); + } else { + salebackQueryWrapper = (QueryWrapper)salebackObj; + salebackNum++; + } + + + Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0")); + if (ObjectUtil.isEmpty(saleback_item0Obj)){ + return new ArrayList<>(); + } else { + saleback_item0QueryWrapper = (QueryWrapper)saleback_item0Obj; + saleback_item0Num++; + } + + + Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder")); + if (ObjectUtil.isEmpty(saleorderObj)){ + return new ArrayList<>(); + } else { + saleorderQueryWrapper = (QueryWrapper)saleorderObj; + saleorderNum++; + } + + + } + } + if(StringUtil.isNotEmpty(salebackPagination.getDocumentNo())){ + salebackNum++; + salebackQueryWrapper.lambda().like(SalebackEntity::getDocumentNo,salebackPagination.getDocumentNo()); + } + + if(AllIdList.size()>0){ + salebackQueryWrapper.lambda().in(SalebackEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(salebackPagination.getSidx())){ + salebackQueryWrapper.lambda().orderByDesc(SalebackEntity::getId); + }else{ + try { + String sidx = salebackPagination.getSidx(); + SalebackEntity salebackEntity = new SalebackEntity(); + Field declaredField = salebackEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + salebackQueryWrapper="asc".equals(salebackPagination.getSort().toLowerCase())?salebackQueryWrapper.orderByAsc(value):salebackQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize()); + IPage userIPage=this.page(page, salebackQueryWrapper); + return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return salebackPagination.setData(list, list.size()); + } + }else{ + return this.list(salebackQueryWrapper); + } + } + + @Override + public SalebackEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(SalebackEntity::getId,id); + return this.getOne(queryWrapper); + } + + @Override + public void create(SalebackEntity entity){ + this.save(entity); + } + + @Override + public boolean update(String id, SalebackEntity entity){ + entity.setId(id); + return this.updateById(entity); + } + @Override + public void delete(SalebackEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + //子表方法 + @Override + public List GetSaleback_item0List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Saleback_item0Entity::getSalesBackId, id); + return saleback_item0Service.list(queryWrapper); + } + + //列表子表数据方法 + @Override + public SaleorderEntity getSaleorder(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderEntity::getId, id); + return saleorderService.getOne(queryWrapper); + } + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/Saleback_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/Saleback_item0ServiceImpl.java new file mode 100644 index 00000000..80537ebe --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/Saleback_item0ServiceImpl.java @@ -0,0 +1,41 @@ +package jnpf.saleback.service.impl; + +import jnpf.saleback.entity.*; +import jnpf.saleback.mapper.Saleback_item0Mapper; +import jnpf.saleback.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; +import jnpf.permission.model.authorize.AuthorizeConditionModel; + + + + + + + + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; + +/** + * + * jg_salesback_item0 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +@Service +public class Saleback_item0ServiceImpl extends ServiceImpl implements Saleback_item0Service{ + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java new file mode 100644 index 00000000..d4bee19b --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java @@ -0,0 +1,41 @@ +package jnpf.saleback.service.impl; + +import jnpf.saleback.entity.*; +import jnpf.saleback.mapper.SaleorderMapper; +import jnpf.saleback.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.util.RandomUtil; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; +import jnpf.permission.model.authorize.AuthorizeConditionModel; + + + + + + + + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; + +/** + * + * jg_salesorder + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-13 + */ +@Service +public class SaleorderServiceImpl extends ServiceImpl implements SaleorderService{ + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index 84ab1e27..17997b71 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -87,11 +87,11 @@ public class TradeuploadController { //处理id字段转名称，若无需转或者为空可删除 for(TradeuploadEntity entity:list){ Map materialCodeMap = new HashMap<>(); - entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap)); + entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","item_code","item_code",entity.getMaterialCode(),materialCodeMap)); Map salesNameMap = new HashMap<>(); - entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap)); + entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","contract_name","contract_name",entity.getSalesName(),salesNameMap)); Map licenseNoMap = new HashMap<>(); - entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap)); + entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","ticketno","ticketno",entity.getLicenseNo(),licenseNoMap)); entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); } diff --git a/SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml new file mode 100644 index 00000000..9c80fa9a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/SalebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/SalebackMapper.xml new file mode 100644 index 00000000..fef049fa --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/SalebackMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/Saleback_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/Saleback_item0Mapper.xml new file mode 100644 index 00000000..f2cbd453 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/Saleback_item0Mapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/SaleorderMapper.xml new file mode 100644 index 00000000..04e42204 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/SaleorderMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java b/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java index b26dff7c..a854313b 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java +++ b/SC-boot/linkage-system/src/main/java/jnpf/base/model/dataInterface/DataInterfacePage.java @@ -22,4 +22,6 @@ public class DataInterfacePage extends Pagination { //数据id private String id; + private String bissId; + } diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java b/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java index deb72975..f2c75b67 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java +++ b/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java @@ -32,6 +32,7 @@ import jnpf.util.jscript.JScriptUtil; import jnpf.util.jwt.JwtUtil; import jnpf.util.wxutil.HttpUtil; import lombok.Cleanup; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringSubstitutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -184,7 +185,14 @@ public class DataInterfaceServiceImpl extends ServiceImpl>) actionVo.getData(); @@ -203,7 +211,14 @@ public class DataInterfaceServiceImpl extends ServiceImpl infoToInfo(String id, DataInterfacePage page) { Map dataMap = new HashMap<>(); - ActionResult result = infoToId(id, null, null); + ActionResult result; + if (StringUtils.isNotEmpty(page.getBissId())){ + Map map = new HashMap(); + map.put("id",page.getBissId()); + result = infoToId(id, null, map); + }else{ + result = infoToId(id, null, null); + } DataInterfaceActionVo actionVo = (DataInterfaceActionVo) result.getData(); List> dataList = new ArrayList<>(); if (actionVo.getData() instanceof List) { diff --git a/SC-web/src/components/Generator/components/PopupSelect/index.vue b/SC-web/src/components/Generator/components/PopupSelect/index.vue index f4d3e8ad..b423f891 100644 --- a/SC-web/src/components/Generator/components/PopupSelect/index.vue +++ b/SC-web/src/components/Generator/components/PopupSelect/index.vue @@ -126,6 +126,10 @@ export default { type: String, default: '' }, + bissId: { + type: String, + default: '' + }, placeholder: { type: String, default: '请选择' @@ -233,6 +237,7 @@ export default { let query = { ...this.listQuery, interfaceId: this.interfaceId, + bissId: this.bissId, propsValue: this.propsValue, relationField: this.relationField, } @@ -291,6 +296,7 @@ export default { let query = { id: this.value, interfaceId: this.interfaceId, + bissId: this.bissId, propsValue: this.propsValue, relationField: this.relationField, } @@ -326,4 +332,4 @@ export default { } } } - \ No newline at end of file + diff --git a/SC-web/src/views/scm/basicInformation/purchaseback/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseback/Detail.vue index ff7abf54..19bf1e68 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseback/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseback/Detail.vue @@ -79,7 +79,7 @@ - + @@ -168,7 +168,7 @@ dataForm: { id :'', documentNo : '', - purchaseOrderId : "380716763022647941", + purchaseOrderId : "", currency : "0", refundAmount : '', refundNum : '', @@ -186,7 +186,7 @@ jnpf_jg_purchaseorder_jnpf_contractName:'', jnpf_jg_purchaseorder_jnpf_supplierName:'', }, - activezqsmwf:'0', + activeyrmekt:'0', currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], diff --git a/SC-web/src/views/scm/basicInformation/purchaseback/Form.vue b/SC-web/src/views/scm/basicInformation/purchaseback/Form.vue index f50da3da..cf86213a 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseback/Form.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseback/Form.vue @@ -7,7 +7,7 @@ diff --git a/SC-web/src/views/scm/basicInformation/saleback/Detail.vue b/SC-web/src/views/scm/basicInformation/saleback/Detail.vue new file mode 100644 index 00000000..0712b4e6 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/saleback/Detail.vue @@ -0,0 +1,235 @@ + + diff --git a/SC-web/src/views/scm/basicInformation/saleback/ExportBox.vue b/SC-web/src/views/scm/basicInformation/saleback/ExportBox.vue new file mode 100644 index 00000000..e61a2182 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/saleback/ExportBox.vue @@ -0,0 +1,68 @@ + + + + \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue new file mode 100644 index 00000000..4a289524 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue @@ -0,0 +1,402 @@ + + diff --git a/SC-web/src/views/scm/basicInformation/saleback/index.vue b/SC-web/src/views/scm/basicInformation/saleback/index.vue new file mode 100644 index 00000000..447798d9 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/saleback/index.vue @@ -0,0 +1,286 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index 997b0235..ffad41e0 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -9,7 +9,7 @@ @@ -36,7 +36,7 @@ @@ -85,7 +85,7 @@ @@ -186,6 +186,7 @@ props: [], data() { return { + bissId: '1', visible: false, loading: false, isDetail: false,