From 265d8a6d7fd30255522c12281d644e18e11b3db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 30 Jan 2023 17:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArinvoicesController.java | 59 +----- .../arinvoices/entity/ArinvoicesEntity.java | 2 +- .../entity/Arinvoices_item0Entity.java | 2 +- .../entity/Arinvoices_item1Entity.java | 2 +- .../entity/SalesorderitemEntity.java | 156 -------------- .../arinvoices/mapper/ArinvoicesMapper.java | 2 +- .../mapper/Arinvoices_item0Mapper.java | 2 +- .../mapper/Arinvoices_item1Mapper.java | 2 +- .../mapper/SalesorderitemMapper.java | 17 -- .../model/arinvoices/ArinvoicesCrForm.java | 5 +- .../model/arinvoices/ArinvoicesInfoVO.java | 5 +- .../model/arinvoices/ArinvoicesListQuery.java | 2 +- .../model/arinvoices/ArinvoicesListVO.java | 5 +- .../arinvoices/ArinvoicesPagination.java | 2 +- .../ArinvoicesPaginationExportModel.java | 2 +- .../model/arinvoices/ArinvoicesUpForm.java | 5 +- .../arinvoices/Arinvoices_item0Model.java | 2 +- .../arinvoices/SalesorderitemListVO.java | 25 --- .../model/arinvoices/SalesorderitemModel.java | 26 --- .../arinvoices/service/ArinvoicesService.java | 5 +- .../service/Arinvoices_item0Service.java | 2 +- .../service/Arinvoices_item1Service.java | 2 +- .../service/SalesorderitemService.java | 15 -- .../service/impl/ArinvoicesServiceImpl.java | 46 +--- .../impl/Arinvoices_item0ServiceImpl.java | 2 +- .../impl/Arinvoices_item1ServiceImpl.java | 2 +- .../impl/SalesorderitemServiceImpl.java | 41 ---- .../basicInformation/arinvoices/Detail.vue | 16 +- .../scm/basicInformation/arinvoices/Form.vue | 65 +++--- .../basicInformation/purchaseorder/Form.vue | 200 +++++++++--------- .../scm/basicInformation/salesorder/Form.vue | 23 +- 31 files changed, 157 insertions(+), 585 deletions(-) delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/SalesorderitemEntity.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/SalesorderitemMapper.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemListVO.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemModel.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/SalesorderitemService.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/SalesorderitemServiceImpl.java 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 f289ea94..9ff58407 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 @@ -36,7 +36,6 @@ import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.arinvoices.service.ArinvoicesService; import jnpf.arinvoices.entity.Arinvoices_item0Entity; import jnpf.arinvoices.service.Arinvoices_item0Service; -import jnpf.arinvoices.service.SalesorderitemService; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; @@ -56,7 +55,7 @@ import jnpf.util.enums.FileTypeEnum; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Slf4j @RestController @@ -79,8 +78,6 @@ public class ArinvoicesController { @Autowired private Arinvoices_item0Service arinvoices_item0Service; - @Autowired - private SalesorderitemService salesorderitemService; /** @@ -97,10 +94,6 @@ public class ArinvoicesController { } List listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class); for(ArinvoicesListVO arinvoicesVO:listVO){ - SalesorderitemEntity salesorderitemEntity = arinvoicesService.getSalesorderitem(arinvoicesVO.getSalesOrderNo()); - if(ObjectUtil.isNotEmpty(salesorderitemEntity)){ - arinvoicesVO.setJg_salesorder(JsonUtil.getJsonToBean(salesorderitemEntity,SalesorderitemListVO.class)); - } } @@ -140,14 +133,6 @@ public class ArinvoicesController { } - //子表数据 - if(ObjectUtil.isNotEmpty(arinvoicesCrForm.getJg_salesorder())){ - SalesorderitemEntity jg_salesorderentity = JsonUtil.getJsonToBean(arinvoicesCrForm.getJg_salesorder(), SalesorderitemEntity.class); - jg_salesorderentity.setId(entity.getSalesOrderNo()); - //自动生成的字段 - jg_salesorderentity.setId(mainId); - salesorderitemService.save(jg_salesorderentity); - } return ActionResult.success("创建成功"); } @@ -190,23 +175,10 @@ public class ArinvoicesController { } List listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class); for(ArinvoicesListVO arinvoicesVO:listVO){ - SalesorderitemEntity salesorderitemEntity = arinvoicesService.getSalesorderitem(arinvoicesVO.getSalesOrderNo()); - if(ObjectUtil.isNotEmpty(salesorderitemEntity)){ - arinvoicesVO.setJg_salesorder(JsonUtil.getJsonToBean(salesorderitemEntity,SalesorderitemListVO.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("salesorderitem")); - for (Map.Entry entry : map1.entrySet()){ - String key = "salesorderitem." +entry.getKey(); - map2.put(key,entry.getValue()); - } - map.putAll(map2); - }); String[]keys=!StringUtil.isEmpty(arinvoicesPaginationExportModel.getSelectKey())?arinvoicesPaginationExportModel.getSelectKey().split(","):new String[0]; UserInfo userInfo=userProvider.get(); DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); @@ -219,9 +191,6 @@ public class ArinvoicesController { if(keys.length>0){ for(String key:keys){ switch(key){ - case "jg_salesorder.contractCode" : - entitys.add(new ExcelExportEntity("合同编码" ,"jg_salesorder.contractCode")); - break; case "documentNo" : entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); break; @@ -337,10 +306,6 @@ public class ArinvoicesController { } vo.setArinvoices_item0List(JsonUtil.getJsonToList(Arinvoices_item0List,Arinvoices_item0Model.class )); //副表 - QueryWrapper queryWrapperSalesorderitem = new QueryWrapper<>(); - queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo()); - SalesorderitemEntity jg_salesorderEntity = salesorderitemService.getOne(queryWrapperSalesorderitem); - vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SalesorderitemModel.class)); return ActionResult.success(vo); } @@ -363,14 +328,6 @@ public class ArinvoicesController { vo.setArinvoices_item0List(jg_arinvoices_item0ModelList); //附表数据转换 - QueryWrapper queryWrapperSalesorderitem = new QueryWrapper<>(); - queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo()); - SalesorderitemEntity jg_salesorderEntity = salesorderitemService.getOne(queryWrapperSalesorderitem); - - if(ObjectUtil.isEmpty(jg_salesorderEntity)){ - jg_salesorderEntity = new SalesorderitemEntity(); - } - vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SalesorderitemModel.class)); //添加到详情表单对象中 @@ -412,16 +369,6 @@ public class ArinvoicesController { arinvoices_item0Service.save(entitys); } - //子表数据 - if(ObjectUtil.isNotEmpty(arinvoicesUpForm.getJg_salesorder())){ - QueryWrapper queryWrapperSalesorderitem =new QueryWrapper<>(); - queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo()); - SalesorderitemEntity jg_salesorderOneEntity= salesorderitemService.getOne(queryWrapperSalesorderitem); - SalesorderitemEntity jg_salesorderentity=JsonUtil.getJsonToBean(arinvoicesUpForm.getJg_salesorder(), SalesorderitemEntity.class); - jg_salesorderentity.setId(jg_salesorderOneEntity.getId()); - jg_salesorderentity.setId(entity.getSalesOrderNo()); - salesorderitemService.updateById(jg_salesorderentity); - } return ActionResult.success("更新成功"); }else{ return ActionResult.fail("更新失败，数据不存在"); @@ -445,10 +392,6 @@ public class ArinvoicesController { QueryWrapper queryWrapperArinvoices_item0=new QueryWrapper<>(); queryWrapperArinvoices_item0.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,entity.getId()); arinvoices_item0Service.remove(queryWrapperArinvoices_item0); - //子表数据 - QueryWrapper queryWrapperSalesorderitem=new QueryWrapper<>(); - queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo()); - salesorderitemService.remove(queryWrapperSalesorderitem); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java index 875d8619..5cf6680f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data @TableName("jg_arinvoices") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java index 135f64b0..0a641465 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data @TableName("jg_arinvoices_item0") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java index ba87d115..105544dc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data @TableName("jg_arinvoices_item1") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/SalesorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/SalesorderitemEntity.java deleted file mode 100644 index bfdf9e45..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/SalesorderitemEntity.java +++ /dev/null @@ -1,156 +0,0 @@ -package jnpf.arinvoices.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-29 - */ -@Data -@TableName("jg_salesorder") -public class SalesorderitemEntity { - - @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/arinvoices/mapper/ArinvoicesMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java index 487d742d..bd06c2fa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ public interface ArinvoicesMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item0Mapper.java index f847e595..d62c7a91 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item0Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ public interface Arinvoices_item0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item1Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item1Mapper.java index 7cf2b3c8..78e11fe2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item1Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item1Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ public interface Arinvoices_item1Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/SalesorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/SalesorderitemMapper.java deleted file mode 100644 index f582ad39..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/SalesorderitemMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package jnpf.arinvoices.mapper; - - -import jnpf.arinvoices.entity.SalesorderitemEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * - * jg_salesorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 - */ -public interface SalesorderitemMapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java index 3c69f14d..f24edf7d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesCrForm { @@ -84,8 +84,5 @@ public class ArinvoicesCrForm { @JsonProperty("arinvoices_item0List") private List arinvoices_item0List; - /** 列表子表数据 **/ - @JsonProperty("jg_salesorder") - private SalesorderitemModel jg_salesorder; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java index fcfe33dd..d4d115c0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesInfoVO{ @@ -87,7 +87,4 @@ public class ArinvoicesInfoVO{ /** 子表数据 **/ @JsonProperty("arinvoices_item0List") private List arinvoices_item0List; - /** 列表子表数据 **/ - @JsonProperty("jg_salesorder") - private SalesorderitemModel jg_salesorder; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListQuery.java index 4f73e1d2..23f11c5a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesListQuery extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java index f4fa7409..a28a864c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesListVO{ @@ -99,7 +99,4 @@ public class ArinvoicesListVO{ private String creatorUserName; - /**列表子表数据 */ - @JsonProperty("jg_salesorder") - private SalesorderitemListVO jg_salesorder; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java index 44284245..d03e0a13 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesPagination extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java index 3fbde291..fc2decda 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesPaginationExportModel extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java index d8767313..f8da62b3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java @@ -16,7 +16,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-29 + * @日期： 2023-01-30 */ @Data public class ArinvoicesUpForm{ @@ -102,7 +102,4 @@ public class ArinvoicesUpForm{ @JsonProperty("arinvoices_item0List") private List arinvoices_item0List; - /** 列表子表数据 **/ - @JsonProperty("jg_salesorder") - private SalesorderitemModel jg_salesorder; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java index f6c2d8de..0daa1bf3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ @Data public class Arinvoices_item0Model { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemListVO.java deleted file mode 100644 index a042a816..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemListVO.java +++ /dev/null @@ -1,25 +0,0 @@ - - -package jnpf.arinvoices.model.arinvoices; - - -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-29 - */ -@Data -public class SalesorderitemListVO{ - /** 合同编码 **/ - @JsonProperty("contractCode") - private String contractCode; -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemModel.java deleted file mode 100644 index c67b1fbb..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/SalesorderitemModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package jnpf.arinvoices.model.arinvoices; - -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-29 - */ -@Data -public class SalesorderitemModel { - - /** 合同编码 **/ - @JsonProperty("contractCode") - private String contractCode; - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/ArinvoicesService.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/ArinvoicesService.java index ef00382c..1b43cd4e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/ArinvoicesService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/ArinvoicesService.java @@ -4,7 +4,6 @@ import jnpf.arinvoices.service.Arinvoices_item0Service; import jnpf.arinvoices.entity.ArinvoicesEntity; import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.arinvoices.entity.SalesorderitemEntity; import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination; import java.util.*; /** @@ -13,7 +12,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ public interface ArinvoicesService extends IService { @@ -35,6 +34,4 @@ public interface ArinvoicesService extends IService { List GetArinvoices_item0List(String id); //列表子表数据方法 - SalesorderitemEntity getSalesorderitem(String id); - } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item0Service.java index c0a25b6b..27ae8172 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item0Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ public interface Arinvoices_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item1Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item1Service.java index 1a2e0dae..45b3f98d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item1Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/Arinvoices_item1Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ public interface Arinvoices_item1Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/SalesorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/SalesorderitemService.java deleted file mode 100644 index e23b7a09..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/SalesorderitemService.java +++ /dev/null @@ -1,15 +0,0 @@ -package jnpf.arinvoices.service; - -import jnpf.arinvoices.entity.SalesorderitemEntity; -import com.baomidou.mybatisplus.extension.service.IService; -/** - * - * jg_salesorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 - */ -public interface SalesorderitemService extends IService { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java index f13d687f..94d90295 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java @@ -38,7 +38,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ @Service public class ArinvoicesServiceImpl extends ServiceImpl implements ArinvoicesService{ @@ -50,8 +50,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl arinvoices_item0QueryWrapper=new QueryWrapper<>(); int arinvoices_item1Num =0; QueryWrapper arinvoices_item1QueryWrapper=new QueryWrapper<>(); - int salesorderitemNum =0; - QueryWrapper salesorderitemQueryWrapper=new QueryWrapper<>(); boolean pcPermission = false; boolean appPermission = false; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); @@ -97,13 +93,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl)arinvoices_item1Obj; arinvoices_item1Num++; - } - Object salesorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesorderitemQueryWrapper,arinvoicesPagination.getMenuId(),"salesorderitem")); - if (ObjectUtil.isEmpty(salesorderitemObj)){ - return new ArrayList<>(); - } else { - salesorderitemQueryWrapper = (QueryWrapper)salesorderitemObj; - salesorderitemNum++; } } } @@ -136,15 +125,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl(); - } else { - salesorderitemQueryWrapper = (QueryWrapper)salesorderitemObj; - salesorderitemNum++; - } - - } } if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){ @@ -190,8 +170,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl arinvoices_item0QueryWrapper=new QueryWrapper<>(); int arinvoices_item1Num =0; QueryWrapper arinvoices_item1QueryWrapper=new QueryWrapper<>(); - int salesorderitemNum =0; - QueryWrapper salesorderitemQueryWrapper=new QueryWrapper<>(); boolean pcPermission = false; boolean appPermission = false; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); @@ -217,13 +195,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl)arinvoices_item1Obj; arinvoices_item1Num++; - } - Object salesorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesorderitemQueryWrapper,arinvoicesPagination.getMenuId(),"salesorderitem")); - if (ObjectUtil.isEmpty(salesorderitemObj)){ - return new ArrayList<>(); - } else { - salesorderitemQueryWrapper = (QueryWrapper)salesorderitemObj; - salesorderitemNum++; } } } @@ -256,15 +227,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl(); - } else { - salesorderitemQueryWrapper = (QueryWrapper)salesorderitemObj; - salesorderitemNum++; - } - - } } if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){ @@ -336,12 +298,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(SalesorderitemEntity::getId, id); - return salesorderitemService.getOne(queryWrapper); - } } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java index 17ab50ca..4c0a2348 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ @Service public class Arinvoices_item0ServiceImpl extends ServiceImpl implements Arinvoices_item0Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item1ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item1ServiceImpl.java index 865bab16..5d685dca 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item1ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item1ServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-29 + * 日期： 2023-01-30 */ @Service public class Arinvoices_item1ServiceImpl extends ServiceImpl implements Arinvoices_item1Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/SalesorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/SalesorderitemServiceImpl.java deleted file mode 100644 index 4d850845..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/SalesorderitemServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package jnpf.arinvoices.service.impl; - -import jnpf.arinvoices.entity.*; -import jnpf.arinvoices.mapper.SalesorderitemMapper; -import jnpf.arinvoices.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-29 - */ -@Service -public class SalesorderitemServiceImpl extends ServiceImpl implements SalesorderitemService{ - - -} \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue index 1af75629..58d4c54f 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue @@ -48,12 +48,6 @@

{{dataForm.customerTaxNo}}

- - -

{{dataForm.jnpf_jg_salesorder_jnpf_contractCode}}

- - @@ -103,7 +97,7 @@ - + @@ -189,13 +183,8 @@ status : "0", creatorUserName : '', arinvoices_item0List:[], - jg_salesorder: - { - contractCode:'', - }, - jnpf_jg_salesorder_jnpf_contractCode:'', }, - activeegevzb:'1', + activewkrlwe:'1', currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], @@ -211,7 +200,6 @@ methods: { dataInfo(dataAll){ let _dataAll =dataAll - _dataAll.jnpf_jg_salesorder_jnpf_contractCode = _dataAll.jg_salesorder.contractCode for(let i=0;i<_dataAll.arinvoices_item0List.length;i++){ var _list = _dataAll.arinvoices_item0List[i]; } diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index a0436556..1c0a3786 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -7,7 +7,7 @@