diff --git a/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java b/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java index 171548b1..69b6efcf 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java @@ -43,6 +43,7 @@ public class DateUtil { /** * 获取当前时间 + * @return */ public static String getNow() { LocalDateTime ldt1 = LocalDateTime.now(); 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 9ff58407..f803232e 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 @@ -15,17 +15,14 @@ import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.saleorder.entity.SaleorderitemEntity; +import jnpf.saleorder.service.SaleorderitemService; import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; import jnpf.arinvoices.model.arinvoices.*; import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination; -import jnpf.arinvoices.entity.*; +import jnpf.arinvoices.entity.Arinvoices_item1Entity; import jnpf.arinvoices.entity.Arinvoices_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; @@ -34,13 +31,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.arinvoices.service.ArinvoicesService; -import jnpf.arinvoices.entity.Arinvoices_item0Entity; +import jnpf.arinvoices.service.Arinvoices_item1Service; import jnpf.arinvoices.service.Arinvoices_item0Service; 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; @@ -55,7 +51,7 @@ import jnpf.util.enums.FileTypeEnum; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-02-23 */ @Slf4j @RestController @@ -75,8 +71,12 @@ public class ArinvoicesController { @Autowired private ArinvoicesService arinvoicesService; + @Autowired + private Arinvoices_item1Service arinvoices_item1Service; @Autowired private Arinvoices_item0Service arinvoices_item0Service; + @Autowired + private SaleorderitemService saleorderitemService; @@ -91,6 +91,12 @@ public class ArinvoicesController { List list= arinvoicesService.getList(arinvoicesPagination); //处理id字段转名称，若无需转或者为空可删除 for(ArinvoicesEntity entity:list){ + Map salesOrderIdMap = new HashMap<>(); + entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap)); + Map contractIdMap = new HashMap<>(); + entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap)); + Map customerIdMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap)); } List listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class); for(ArinvoicesListVO arinvoicesVO:listVO){ @@ -116,19 +122,23 @@ public class ArinvoicesController { public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); + arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false)); ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId()); + saleorderitemEntity.setStatus("2"); + saleorderitemService.updateById(saleorderitemEntity); entity.setId(mainId); arinvoicesService.save(entity); + List Arinvoices_item1List = JsonUtil.getJsonToList(arinvoicesCrForm.getArinvoices_item1List(),Arinvoices_item1Entity.class); + for(Arinvoices_item1Entity entitys : Arinvoices_item1List){ + entitys.setId(RandomUtil.uuId()); + entitys.setArinvoicesId(entity.getId()); + arinvoices_item1Service.save(entitys); + } List Arinvoices_item0List = JsonUtil.getJsonToList(arinvoicesCrForm.getArinvoices_item0List(),Arinvoices_item0Entity.class); for(Arinvoices_item0Entity entitys : Arinvoices_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setArinvoicesId(entity.getId()); - - - - - - arinvoices_item0Service.save(entitys); } @@ -172,6 +182,12 @@ public class ArinvoicesController { List list= arinvoicesService.getTypeList(arinvoicesPagination,arinvoicesPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ArinvoicesEntity entity:list){ + Map salesOrderIdMap = new HashMap<>(); + entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap)); + Map contractIdMap = new HashMap<>(); + entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap)); + Map customerIdMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap)); } List listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class); for(ArinvoicesListVO arinvoicesVO:listVO){ @@ -197,44 +213,35 @@ public class ArinvoicesController { case "businessDate" : entitys.add(new ExcelExportEntity("业务日期" ,"businessDate")); break; - case "customerName" : - entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); - break; case "amount" : entitys.add(new ExcelExportEntity("金额" ,"amount")); break; case "quantity" : entitys.add(new ExcelExportEntity("数量" ,"quantity")); break; - case "invoiceQuantity" : - entitys.add(new ExcelExportEntity("发票数量" ,"invoiceQuantity")); - break; - case "customerTaxNo" : - entitys.add(new ExcelExportEntity("客户税号" ,"customerTaxNo")); - break; - case "customerAddress" : - entitys.add(new ExcelExportEntity("客户地址" ,"customerAddress")); - break; case "currency" : entitys.add(new ExcelExportEntity("币别 " ,"currency")); break; case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark")); break; + case "status" : + entitys.add(new ExcelExportEntity("单据状态 " ,"status")); + break; case "invoiceAmount" : entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount")); break; - case "salesOrderNo" : - entitys.add(new ExcelExportEntity("销售订单号" ,"salesOrderNo")); + case "invoiceQuantity" : + entitys.add(new ExcelExportEntity("发票数量" ,"invoiceQuantity")); break; - case "contractName" : - entitys.add(new ExcelExportEntity("合同名称" ,"contractName")); + case "salesOrderId" : + entitys.add(new ExcelExportEntity("销售订单号" ,"salesOrderId")); break; - case "status" : - entitys.add(new ExcelExportEntity("单据状态 " ,"status")); + case "contractId" : + entitys.add(new ExcelExportEntity("合同名称" ,"contractId")); break; - case "creatorUserName" : - entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName")); + case "customerId" : + entitys.add(new ExcelExportEntity("客户" ,"customerId")); break; default: break; @@ -301,6 +308,10 @@ public class ArinvoicesController { ArinvoicesInfoVO vo=JsonUtil.getJsonToBean(entity, ArinvoicesInfoVO.class); //子表 + List Arinvoices_item1List = arinvoicesService.GetArinvoices_item1List(id); + for(Arinvoices_item1Entity arinvoices_item1Entity : Arinvoices_item1List){ + } + vo.setArinvoices_item1List(JsonUtil.getJsonToList(Arinvoices_item1List,Arinvoices_item1Model.class )); List Arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id); for(Arinvoices_item0Entity arinvoices_item0Entity : Arinvoices_item0List){ } @@ -321,6 +332,13 @@ public class ArinvoicesController { ArinvoicesInfoVO vo=JsonUtil.getJsonToBean(entity, ArinvoicesInfoVO.class); //子表数据转换 + List jg_arinvoices_item1List = arinvoicesService.GetArinvoices_item1List(id); + List jg_arinvoices_item1ModelList = JsonUtil.getJsonToList(jg_arinvoices_item1List,Arinvoices_item1Model.class); + for(Arinvoices_item1Model jg_arinvoices_item1Model : jg_arinvoices_item1ModelList){ + Map materialIdMap = new HashMap<>(); + jg_arinvoices_item1Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_arinvoices_item1Model.getMaterialId(),materialIdMap)); + } + vo.setArinvoices_item1List(jg_arinvoices_item1ModelList); List jg_arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id); List jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List,Arinvoices_item0Model.class); for(Arinvoices_item0Model jg_arinvoices_item0Model : jg_arinvoices_item0ModelList){ @@ -330,6 +348,12 @@ public class ArinvoicesController { //附表数据转换 //添加到详情表单对象中 + Map salesOrderIdMap = new HashMap<>(); + vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSalesOrderId(),salesOrderIdMap)); + Map contractIdMap = new HashMap<>(); + vo.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",vo.getContractId(),contractIdMap)); + Map customerIdMap = new HashMap<>(); + vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",vo.getCustomerId(),customerIdMap)); return ActionResult.success(vo); } @@ -352,6 +376,26 @@ public class ArinvoicesController { ArinvoicesEntity subentity=JsonUtil.getJsonToBean(arinvoicesUpForm, ArinvoicesEntity.class); arinvoicesService.update(id, subentity); + QueryWrapper Arinvoices_item1queryWrapper = new QueryWrapper<>(); + Arinvoices_item1queryWrapper.lambda().eq(Arinvoices_item1Entity::getArinvoicesId, entity.getId()); + arinvoices_item1Service.remove(Arinvoices_item1queryWrapper); + + List Arinvoices_item1List = JsonUtil.getJsonToList(arinvoicesUpForm.getArinvoices_item1List(),Arinvoices_item1Entity.class); + for(Arinvoices_item1Entity entitys : Arinvoices_item1List){ + + + + + + + + + entitys.setId(RandomUtil.uuId()); + entitys.setArinvoicesId(entity.getId()); + arinvoices_item1Service.save(entitys); + } + + QueryWrapper Arinvoices_item0queryWrapper = new QueryWrapper<>(); Arinvoices_item0queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, entity.getId()); arinvoices_item0Service.remove(Arinvoices_item0queryWrapper); @@ -364,6 +408,10 @@ public class ArinvoicesController { + + + + entitys.setId(RandomUtil.uuId()); entitys.setArinvoicesId(entity.getId()); arinvoices_item0Service.save(entitys); @@ -389,6 +437,9 @@ public class ArinvoicesController { ArinvoicesEntity entity= arinvoicesService.getInfo(id); if(entity!=null){ arinvoicesService.delete(entity); + QueryWrapper queryWrapperArinvoices_item1=new QueryWrapper<>(); + queryWrapperArinvoices_item1.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,entity.getId()); + arinvoices_item1Service.remove(queryWrapperArinvoices_item1); QueryWrapper queryWrapperArinvoices_item0=new QueryWrapper<>(); queryWrapperArinvoices_item0.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,entity.getId()); arinvoices_item0Service.remove(queryWrapperArinvoices_item0); 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 5cf6680f..00848d30 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-30 + * @日期： 2023-02-23 */ @Data @TableName("jg_arinvoices") @@ -110,4 +110,13 @@ public class ArinvoicesEntity { @TableField("REMARK") private String remark; + @TableField("CUSTOMER_ID") + private String customerId; + + @TableField("SALES_ORDER_ID") + private String salesOrderId; + + @TableField("CONTRACT_ID") + private String contractId; + } 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 0a641465..ccca07ae 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-30 + * @日期： 2023-02-23 */ @Data @TableName("jg_arinvoices_item0") @@ -101,4 +101,7 @@ public class Arinvoices_item0Entity { @TableField("ARINVOICES_ID") private String arinvoicesId; + @TableField("SALES_ORDER_NO") + private String salesOrderNo; + } 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 105544dc..5cfe5c00 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-30 + * @日期： 2023-02-23 */ @Data @TableName("jg_arinvoices_item1") @@ -102,4 +102,7 @@ public class Arinvoices_item1Entity { @TableField("REMARK") private String remark; + @TableField("MATERIAL_ID") + private String materialId; + } 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 bd06c2fa..f7aa2248 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-30 + * 日期： 2023-02-23 */ 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 d62c7a91..619a742e 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-30 + * 日期： 2023-02-23 */ 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 78e11fe2..d7b18fd1 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-30 + * 日期： 2023-02-23 */ public interface Arinvoices_item1Mapper 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 f24edf7d..bd59d704 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 @@ -2,6 +2,7 @@ package jnpf.arinvoices.model.arinvoices; +import jnpf.arinvoices.model.arinvoices.Arinvoices_item1Model; import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model; import lombok.Data; import java.util.List; @@ -15,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesCrForm { @@ -26,31 +27,15 @@ public class ArinvoicesCrForm { /** 业务日期 **/ @JsonProperty("businessDate") - private String businessDate; - - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + private Long businessDate; /** 金额 **/ @JsonProperty("amount") - private String amount; + private Integer amount; /** 数量 **/ @JsonProperty("quantity") - private String quantity; - - /** 发票数量 **/ - @JsonProperty("invoiceQuantity") - private String invoiceQuantity; - - /** 客户税号 **/ - @JsonProperty("customerTaxNo") - private String customerTaxNo; - - /** 客户地址 **/ - @JsonProperty("customerAddress") - private String customerAddress; + private Integer quantity; /** 币别 **/ @JsonProperty("currency") @@ -60,26 +45,33 @@ public class ArinvoicesCrForm { @JsonProperty("remark") private String remark; + /** 单据状态 **/ + @JsonProperty("status") + private String status; + /** 发票金额 **/ @JsonProperty("invoiceAmount") - private String invoiceAmount; + private Integer invoiceAmount; + + /** 发票数量 **/ + @JsonProperty("invoiceQuantity") + private Integer invoiceQuantity; /** 销售订单号 **/ - @JsonProperty("salesOrderNo") - private String salesOrderNo; + @JsonProperty("salesOrderId") + private String salesOrderId; /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; + @JsonProperty("contractId") + private String contractId; - /** 单据状态 **/ - @JsonProperty("status") - private String status; - - /** 制单人 **/ - @JsonProperty("creatorUserName") - private String creatorUserName; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; + /** 子表数据 **/ + @JsonProperty("arinvoices_item1List") + private List arinvoices_item1List; /** 子表数据 **/ @JsonProperty("arinvoices_item0List") private List arinvoices_item0List; 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 d4d115c0..e138eeee 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 @@ -3,6 +3,7 @@ package jnpf.arinvoices.model.arinvoices; +import jnpf.arinvoices.model.arinvoices.Arinvoices_item1Model; import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesInfoVO{ @@ -30,31 +31,15 @@ public class ArinvoicesInfoVO{ /** 业务日期 **/ @JsonProperty("businessDate") - private String businessDate; - - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + private Long businessDate; /** 金额 **/ @JsonProperty("amount") - private String amount; + private Integer amount; /** 数量 **/ @JsonProperty("quantity") - private String quantity; - - /** 发票数量 **/ - @JsonProperty("invoiceQuantity") - private String invoiceQuantity; - - /** 客户税号 **/ - @JsonProperty("customerTaxNo") - private String customerTaxNo; - - /** 客户地址 **/ - @JsonProperty("customerAddress") - private String customerAddress; + private Integer quantity; /** 币别 **/ @JsonProperty("currency") @@ -64,26 +49,33 @@ public class ArinvoicesInfoVO{ @JsonProperty("remark") private String remark; + /** 单据状态 **/ + @JsonProperty("status") + private String status; + /** 发票金额 **/ @JsonProperty("invoiceAmount") - private String invoiceAmount; + private Integer invoiceAmount; + + /** 发票数量 **/ + @JsonProperty("invoiceQuantity") + private Integer invoiceQuantity; /** 销售订单号 **/ - @JsonProperty("salesOrderNo") - private String salesOrderNo; + @JsonProperty("salesOrderId") + private String salesOrderId; /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; + @JsonProperty("contractId") + private String contractId; - /** 单据状态 **/ - @JsonProperty("status") - private String status; - - /** 制单人 **/ - @JsonProperty("creatorUserName") - private String creatorUserName; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; + /** 子表数据 **/ + @JsonProperty("arinvoices_item1List") + private List arinvoices_item1List; /** 子表数据 **/ @JsonProperty("arinvoices_item0List") private List arinvoices_item0List; 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 23f11c5a..956bc041 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,13 +10,16 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesListQuery extends Pagination { /** 单据编号 */ private String documentNo; + + /** 业务日期 */ + private List businessDate; /** * 菜单id */ 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 a28a864c..6940d696 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-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesListVO{ @@ -30,39 +30,18 @@ public class ArinvoicesListVO{ /** 业务日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonProperty("businessDate") - private String businessDate; - - - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + private Date businessDate; /** 金额 **/ @JsonProperty("amount") - private String amount; - + private Integer amount; /** 数量 **/ @JsonProperty("quantity") - private String quantity; - - - /** 发票数量 **/ - @JsonProperty("invoiceQuantity") - private String invoiceQuantity; - - - /** 客户税号 **/ - @JsonProperty("customerTaxNo") - private String customerTaxNo; - - - /** 客户地址 **/ - @JsonProperty("customerAddress") - private String customerAddress; - + private Integer quantity; /** 币别 **/ @JsonProperty("currency") @@ -74,29 +53,32 @@ public class ArinvoicesListVO{ private String remark; + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 发票金额 **/ @JsonProperty("invoiceAmount") - private String invoiceAmount; + private Integer invoiceAmount; + /** 发票数量 **/ + @JsonProperty("invoiceQuantity") + private Integer invoiceQuantity; /** 销售订单号 **/ - @JsonProperty("salesOrderNo") - private String salesOrderNo; + @JsonProperty("salesOrderId") + private String salesOrderId; /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; - - - /** 单据状态 **/ - @JsonProperty("status") - private String status; + @JsonProperty("contractId") + private String contractId; - /** 制单人 **/ - @JsonProperty("creatorUserName") - private String creatorUserName; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; } \ 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 d03e0a13..ec17b66b 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,13 +11,16 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesPagination extends Pagination { /** 单据编号 */ private String documentNo; + + /** 业务日期 */ + private List businessDate; /** * 菜单id */ 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 fc2decda..dfa56154 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-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesPaginationExportModel extends Pagination { @@ -23,4 +23,7 @@ public class ArinvoicesPaginationExportModel extends Pagination { /** 单据编号 */ private String documentNo; + + /** 业务日期 */ + private List businessDate; } \ No newline at end of file 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 f8da62b3..142fbb16 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 @@ -2,6 +2,7 @@ package jnpf.arinvoices.model.arinvoices; +import jnpf.arinvoices.model.arinvoices.Arinvoices_item1Model; import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model; import lombok.Data; import java.util.List; @@ -16,7 +17,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-02-23 */ @Data public class ArinvoicesUpForm{ @@ -31,37 +32,17 @@ public class ArinvoicesUpForm{ /** 业务日期 **/ @JsonProperty("businessDate") - private String businessDate; - - - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + private Long businessDate; /** 金额 **/ @JsonProperty("amount") - private String amount; + private Integer amount; /** 数量 **/ @JsonProperty("quantity") - private String quantity; - - - /** 发票数量 **/ - @JsonProperty("invoiceQuantity") - private String invoiceQuantity; - - - /** 客户税号 **/ - @JsonProperty("customerTaxNo") - private String customerTaxNo; - - - /** 客户地址 **/ - @JsonProperty("customerAddress") - private String customerAddress; + private Integer quantity; /** 币别 **/ @@ -74,30 +55,38 @@ public class ArinvoicesUpForm{ private String remark; + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 发票金额 **/ @JsonProperty("invoiceAmount") - private String invoiceAmount; + private Integer invoiceAmount; - /** 销售订单号 **/ - @JsonProperty("salesOrderNo") - private String salesOrderNo; + /** 发票数量 **/ + @JsonProperty("invoiceQuantity") + private Integer invoiceQuantity; - /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; + /** 销售订单号 **/ + @JsonProperty("salesOrderId") + private String salesOrderId; - /** 单据状态 **/ - @JsonProperty("status") - private String status; + /** 合同名称 **/ + @JsonProperty("contractId") + private String contractId; - /** 制单人 **/ - @JsonProperty("creatorUserName") - private String creatorUserName; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; + /** 子表数据 **/ + @JsonProperty("arinvoices_item1List") + private List arinvoices_item1List; /** 子表数据 **/ @JsonProperty("arinvoices_item0List") private List arinvoices_item0List; 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 dd3db020..8b6186da 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-30 + * 日期： 2023-02-23 */ @Data public class Arinvoices_item0Model { @@ -26,6 +26,14 @@ public class Arinvoices_item0Model { @JsonProperty("invoiceNo") private String invoiceNo; + /** 发票数量 **/ + @JsonProperty("invoiceQuantity") + private String invoiceQuantity; + + /** 发票金额 **/ + @JsonProperty("involceAmount") + private String involceAmount; + /** 税率 **/ @JsonProperty("taxRate") private String taxRate; @@ -38,11 +46,16 @@ public class Arinvoices_item0Model { @JsonProperty("amountNotTax") private String amountNotTax; + /** 发票状态 **/ + @JsonProperty("invoiceStatus") + private String invoiceStatus; + /** 开票人 **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 备注信息 **/ - @JsonProperty("remark") - private String remark; + /** 开票日期 **/ + @JsonProperty("invoiceDate") + private Long invoiceDate; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item1Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item1Model.java new file mode 100644 index 00000000..f9241506 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item1Model.java @@ -0,0 +1,60 @@ +package jnpf.arinvoices.model.arinvoices; + +import com.baomidou.mybatisplus.annotation.TableField; +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-02-23 + */ +@Data +public class Arinvoices_item1Model { + + /** 物料 **/ + @JsonProperty("materialId") + private String materialId; + + /** 数量 **/ + @JsonProperty("quantity") + private String quantity; + + /** 单价 **/ + @JsonProperty("unitPrice") + private String unitPrice; + + /** 单价 **/ + @JsonProperty("unit") + private String unit; + + /** 金额 **/ + @JsonProperty("amount") + private String amount; + + /** 税率 **/ + @JsonProperty("taxRate") + private String taxRate; + + /** 税额 **/ + @JsonProperty("taxAmount") + private String taxAmount; + + /** 不含税金额 **/ + @JsonProperty("amountNotTax") + private String amountNotTax; + + /** 备注信息 **/ + @JsonProperty("remark") + private String remark; + + + +} 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 1b43cd4e..141b0a17 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 @@ -1,4 +1,6 @@ package jnpf.arinvoices.service; +import jnpf.arinvoices.entity.Arinvoices_item1Entity; +import jnpf.arinvoices.service.Arinvoices_item1Service; import jnpf.arinvoices.entity.Arinvoices_item0Entity; import jnpf.arinvoices.service.Arinvoices_item0Service; @@ -12,7 +14,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-30 + * 日期： 2023-02-23 */ public interface ArinvoicesService extends IService { @@ -31,6 +33,7 @@ public interface ArinvoicesService extends IService { boolean update( String id, ArinvoicesEntity entity); // 子表方法 + List GetArinvoices_item1List(String id); List GetArinvoices_item0List(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 27ae8172..f613de26 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-30 + * 日期： 2023-02-23 */ 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 45b3f98d..faf67959 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-30 + * 日期： 2023-02-23 */ public interface Arinvoices_item1Service 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 94d90295..255c5f16 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-30 + * 日期： 2023-02-23 */ @Service public class ArinvoicesServiceImpl extends ServiceImpl implements ArinvoicesService{ @@ -51,6 +51,9 @@ public class ArinvoicesServiceImpl extends ServiceImpl BusinessDateList = arinvoicesPagination.getBusinessDate(); + Long fir = Long.valueOf(BusinessDateList.get(0)); + Long sec = Long.valueOf(BusinessDateList.get(1)); + + arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir)) + .le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + } + if(AllIdList.size()>0){ arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList); } @@ -234,6 +248,17 @@ public class ArinvoicesServiceImpl extends ServiceImpl BusinessDateList = arinvoicesPagination.getBusinessDate(); + Long fir = Long.valueOf(BusinessDateList.get(0)); + Long sec = Long.valueOf(BusinessDateList.get(1)); + + arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir)) + .le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + } + if(AllIdList.size()>0){ arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList); } @@ -291,6 +316,12 @@ public class ArinvoicesServiceImpl extends ServiceImpl GetArinvoices_item1List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Arinvoices_item1Entity::getArinvoicesId, id); + return arinvoices_item1Service.list(queryWrapper); + } + @Override public List GetArinvoices_item0List(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, id); 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 4c0a2348..e06a5694 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-30 + * 日期： 2023-02-23 */ @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 5d685dca..48b2cd67 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-30 + * 日期： 2023-02-23 */ @Service public class Arinvoices_item1ServiceImpl extends ServiceImpl implements Arinvoices_item1Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index 7bdc0365..03509d8c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -8,16 +8,21 @@ 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 jdk.nashorn.internal.ir.IfNode; 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.collection.service.SaleorderCETService; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; -import jnpf.saleback.entity.SaleorderEntity; -import org.bytedeco.opencv.presets.opencv_core; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; +import jnpf.saleorder.entity.SaleorderitemEntity; +import jnpf.saleorder.entity.Salesorder_item0Entity; +import jnpf.saleorder.service.SaleorderitemService; +import jnpf.saleorder.service.Salesorder_item0Service; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.collection.model.collection.*; @@ -50,6 +55,7 @@ import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; import jnpf.util.file.UploadUtil; import jnpf.util.enums.FileTypeEnum; @@ -60,7 +66,7 @@ import jnpf.util.enums.FileTypeEnum; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Slf4j @RestController @@ -84,57 +90,155 @@ public class CollectionController { private Collection_item0Service collection_item0Service; @Autowired - private SaleorderCETService saleorderCETService; + private SaleorderitemService saleorderitemService; + @Autowired + private Salesorder_item0Service salesorder_item0Service; + @Autowired + private PoundlistService poundlistService; - @PostMapping("/confirmprice") + /** + * 提交 + * + * @param ids + * @return + */ + @PostMapping("/commit/{ids}") @Transactional - public ActionResult confirmPrice(@RequestBody CollectionListVO collectionListVO) { - CollectionEntity collectionEntity = collectionService.getInfo(collectionListVO.getId()); - if (!collectionEntity.getStatus().equals("2")){ - return ActionResult.fail("审核中，请先通过审核"); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId,collectionListVO.getId()); - List collection_item0EntityList = collection_item0Service.list(queryWrapper); - for (Collection_item0Entity collection_item0Entity : collection_item0EntityList){ - SaleorderCETEntity saleordercetEntity = saleorderCETService.getById(collection_item0Entity.getSalesorderId()); - if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())){ - return ActionResult.fail("已回款金额等于金额"); - } - if (saleordercetEntity.getAmountCollected()!=null && collection_item0Entity.getAmount() !=null) { - BigDecimal sum =saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount()); - saleordercetEntity.setAmountCollected(sum); - if (saleordercetEntity.getAmountCollected().compareTo(saleordercetEntity.getPrice()) > 0) { - return ActionResult.fail("总回款金额大于金额"); + public ActionResult commit(@PathVariable("ids") String ids) { + String[] idList = ids.split(","); + for (String id : idList) { + CollectionEntity collectionEntity = collectionService.getInfo(id); + if (ObjectUtils.isNotEmpty(collectionEntity)) { + if (collectionEntity.getStatus().equals("1")) { + return ActionResult.fail("已提交,无需再次提交"); + } + if (collectionEntity.getStatus().equals("2")) { + return ActionResult.fail("已认款，无需再次提交"); + } + if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) { + return ActionResult.fail("请先输入收款金额"); } - saleordercetEntity.setStatus("2"); - saleorderCETService.updateById(saleordercetEntity); - }else { - return ActionResult.fail("已回款金额或回款金额不能为空"); + collectionEntity.setStatus("1"); + collectionService.updateById(collectionEntity); + return ActionResult.success("提交成功"); + } else { + return ActionResult.fail("数据为空"); } } - return ActionResult.success("认款成功"); + return ActionResult.fail("请选择一条数据"); } + /** + * 认款 + * + * @param ids + * @return + */ + @PostMapping("/confirmprice/{ids}") + @Transactional + public ActionResult confirmPrice(@PathVariable("ids") String ids) { + String[] idList = ids.split(","); + for (String id : idList) { + CollectionEntity collectionEntity = collectionService.getInfo(id); + if (collectionEntity.getStatus().equals("0")){ + return ActionResult.fail("提交中"); + } + if (collectionEntity.getStatus().equals("2")){ + return ActionResult.fail("已认款"); + } + if (collectionEntity.getStatus().equals("1")) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id); + List collection_item0EntityList = collection_item0Service.list(queryWrapper);//查询收款单子表信息 + for (Collection_item0Entity collection_item0Entity : collection_item0EntityList) { + BigDecimal sum; + SaleorderitemEntity saleordercetEntity = saleorderitemService.getById(collection_item0Entity.getSalesorderId());//查询销售订单信息 + if (saleordercetEntity.getAmountCollected() == null) { + saleordercetEntity.setAmountCollected(new BigDecimal(0)); + } + if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())) { + return ActionResult.fail("已回款金额等于金额"); + } + if (saleordercetEntity.getAmountCollected() != null && collection_item0Entity.getAmount() != null) { + sum = saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount()); + if (saleordercetEntity.getAmountCollected().compareTo(saleordercetEntity.getPrice()) > 0) { + return ActionResult.fail("总回款金额大于金额"); + } +// saleordercetEntity.setAmountCollected(sum); +// saleordercetEntity.setStatus("3"); +// saleorderitemService.updateById(saleordercetEntity); + } else { + return ActionResult.fail("已回款金额或回款金额不能为空"); + } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,saleordercetEntity.getId()); + List list = salesorder_item0Service.list(queryWrapper1); + List poundlist = new ArrayList<>(); +// List poundsort = new LinkedList<>(); + for (Salesorder_item0Entity saleItem : list){ + PoundlistEntity poundlistEntity = collectionService.queryPoundInfo(saleItem.getPoundlistId()); + if (ObjectUtils.isNotEmpty(poundlistEntity)) { + poundlist.add(poundlistEntity); + } + } + if (poundlist.size() > 0) { + poundlist = poundlist.stream().sorted(Comparator.comparing(PoundlistEntity::getAdvance).reversed() + .thenComparing(Comparator.comparing(PoundlistEntity::getPoundDate))).collect(Collectors.toList()); + }else{ + return ActionResult.fail("磅单为空"); + } + BigDecimal amount = new BigDecimal(0); + List poundlist1 = new ArrayList<>(); + for (PoundlistEntity pound : poundlist){ + if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) { + amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement())); + if (amount.compareTo(sum) < 1) { + poundlist1.add(pound); + }else{ + break; + } + } + } + for (PoundlistEntity poundlistEntity : poundlist1){ + poundlistEntity.setIsCollection("1"); + if (poundlistEntity.getPaymentDate() == null){ + poundlistEntity.setPaymentDate(new Date()); + } + saleordercetEntity.setAmountCollected(sum); + saleordercetEntity.setStatus("3"); + saleorderitemService.updateById(saleordercetEntity); + poundlistService.updateById(poundlistEntity); + collectionEntity.setStatus("2"); + collectionService.updateById(collectionEntity); + return ActionResult.success("认款成功"); + } + return ActionResult.fail("收款金额不足"); + } + } + } + return ActionResult.fail("请选择一条数据"); + } /** * 列表 * * @param collectionPagination * @return */ - @PostMapping("/getList") + @PostMapping("/getList") public ActionResult list(@RequestBody CollectionPagination collectionPagination)throws IOException{ List list= collectionService.getList(collectionPagination); //处理id字段转名称，若无需转或者为空可删除 - for(CollectionEntity entity:list){ - Map customerNameMap = new HashMap<>(); - entity.setCustomerName(generaterSwapUtil.getPopupSelectValue("393371066040385285","supplier_nm","supplier_nm",entity.getCustomerName(),customerNameMap)); + for(CollectionEntity entity:list){ + Map customerIdMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap)); + Map contractIdMap = new HashMap<>(); + entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap)); entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher())); - } - List listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); - for(CollectionListVO jg_collectionVO:listVO){ - } + } + List listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); + for(CollectionListVO collectionVO:listVO){ + } PageListVO vo=new PageListVO(); @@ -144,11 +248,6 @@ public class CollectionController { return ActionResult.success(vo); } - @GetMapping("autoCreate") - public ActionResult autoCreate() throws DataException { - String document = generaterSwapUtil.getBillNumber("collection",false); - return ActionResult.success(document); - } /** * 创建 @@ -162,13 +261,11 @@ public class CollectionController { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); - collectionCrForm.setCreatorUserName(userInfo.getUserId()); CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); entity.setId(mainId); collectionService.save(entity); List Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); for(Collection_item0Entity entitys : Collection_item0List){ - entitys.setSalesorderId(entitys.getId()); entitys.setId(RandomUtil.uuId()); entitys.setCollectionId(entity.getId()); collection_item0Service.save(entitys); @@ -214,8 +311,10 @@ public class CollectionController { List list= collectionService.getTypeList(collectionPagination,collectionPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(CollectionEntity entity:list){ - Map customerNameMap = new HashMap<>(); - entity.setCustomerName(generaterSwapUtil.getPopupSelectValue("393371066040385285","supplier_nm","supplier_nm",entity.getCustomerName(),customerNameMap)); + Map customerIdMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap)); + Map contractIdMap = new HashMap<>(); + entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap)); entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher())); } List listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); @@ -239,8 +338,8 @@ public class CollectionController { case "documentNo" : entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); break; - case "customerName" : - entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); + case "customerId" : + entitys.add(new ExcelExportEntity("客户" ,"customerId")); break; case "amountCollected" : entitys.add(new ExcelExportEntity("收款金额" ,"amountCollected")); @@ -338,24 +437,21 @@ public class CollectionController { //子表 List Collection_item0List = collectionService.GetCollection_item0List(id); - List collection_item0ModelList = new ArrayList<>(); - Collection_item0Model collection_item0Model = new Collection_item0Model(); for(Collection_item0Entity collection_item0Entity : Collection_item0List){ - SaleorderCETEntity saleorderCETEntity = saleorderCETService.getById(collection_item0Entity.getSalesorderId()); - collection_item0Model.setId(collection_item0Entity.getSalesorderId()); - collection_item0Model.setAmount(String.valueOf(collection_item0Entity.getAmount())); - collection_item0Model.setPrice(String.valueOf(saleorderCETEntity.getPrice())); - collection_item0Model.setAmountCollected(String.valueOf(saleorderCETEntity.getAmountCollected())); - collection_item0Model.setDocumentNo(String.valueOf(saleorderCETEntity.getDocumentNo())); - collection_item0Model.setContractCode(String.valueOf(saleorderCETEntity.getContractCode())); - collection_item0Model.setNum(String.valueOf(saleorderCETEntity.getNum())); - collection_item0Model.setAdvanceAmount(String.valueOf(saleorderCETEntity.getAdvanceAmount())); - collection_item0Model.setRate(String.valueOf(saleorderCETEntity.getRate())); - collection_item0Model.setNotPrice(String.valueOf(saleorderCETEntity.getNotPrice())); - collection_item0Model.setCreatorTime(String.valueOf(saleorderCETEntity.getCreatorTime())); - collection_item0ModelList.add(collection_item0Model); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,collection_item0Entity.getSalesorderId()); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + collection_item0Entity.setPrice(saleorderitemEntity.getPrice()); + collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected()); + collection_item0Entity.setContractCode(saleorderitemEntity.getContractId()); + collection_item0Entity.setSalesorderId(saleorderitemEntity.getId()); + collection_item0Entity.setCreatorTime(saleorderitemEntity.getCreatorTime()); + collection_item0Entity.setNum(saleorderitemEntity.getNum()); + collection_item0Entity.setAdvanceAmount(saleorderitemEntity.getAdvanceAmount()); + collection_item0Entity.setRate(saleorderitemEntity.getRate()); + collection_item0Entity.setNotPrice(saleorderitemEntity.getNotPrice()); } - vo.setCollection_item0List(JsonUtil.getJsonToList(collection_item0ModelList,Collection_item0Model.class )); + vo.setCollection_item0List(JsonUtil.getJsonToList(Collection_item0List,Collection_item0Model.class )); //副表 return ActionResult.success(vo); } @@ -375,14 +471,31 @@ public class CollectionController { List jg_collection_item0List = collectionService.GetCollection_item0List(id); List jg_collection_item0ModelList = JsonUtil.getJsonToList(jg_collection_item0List,Collection_item0Model.class); for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,jg_collection_item0Model.getSalesorderId()); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice())); + jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected())); + jg_collection_item0Model.setContractCode(saleorderitemEntity.getContractId()); + jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo()); + jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum())); + jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount())); + jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate())); + jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice())); +// Map salesorderIdMap = new HashMap<>(); +// jg_collection_item0Model.setSalesorderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",jg_collection_item0Model.getSalesorderId(),salesorderIdMap)); Map deleteTimeMap = new HashMap<>(); - jg_collection_item0Model.setDocumentNo(generaterSwapUtil.getPopupSelectValue("393372436705378053","document_no","document_no",jg_collection_item0Model.getDocumentNo(),deleteTimeMap)); + jg_collection_item0Model.setContractCode(generaterSwapUtil.getPopupSelectValue("398848549678332037","id","contract_code",jg_collection_item0Model.getContractCode(),deleteTimeMap)); } vo.setCollection_item0List(jg_collection_item0ModelList); //附表数据转换 //添加到详情表单对象中 + Map customerIdMap = new HashMap<>(); + vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",vo.getCustomerId(),customerIdMap)); + Map contractIdMap = new HashMap<>(); + vo.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap)); vo.setVoucher(generaterSwapUtil.getFileNameInJson(vo.getVoucher())); return ActionResult.success(vo); @@ -402,9 +515,6 @@ public class CollectionController { public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CollectionUpForm collectionUpForm) throws DataException { UserInfo userInfo=userProvider.get(); CollectionEntity entity= collectionService.getInfo(id); - if (entity.getStatus().equals("2") || entity.getStatus().equals("3")){ - return ActionResult.fail("已审核，不允许编辑"); - } if(entity!=null){ CollectionEntity subentity=JsonUtil.getJsonToBean(collectionUpForm, CollectionEntity.class); collectionService.update(id, subentity); @@ -412,13 +522,20 @@ public class CollectionController { QueryWrapper Collection_item0queryWrapper = new QueryWrapper<>(); Collection_item0queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, entity.getId()); collection_item0Service.remove(Collection_item0queryWrapper); - for (Collection_item0Model collection_item0Model : collectionUpForm.getCollection_item0List()){ - collection_item0Model.setCreatorTime(null); - } List Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class); for(Collection_item0Entity entitys : Collection_item0List){ - entitys.setSalesorderId(entitys.getId()); + + + + + + + + + + + entitys.setId(RandomUtil.uuId()); entitys.setCollectionId(entity.getId()); collection_item0Service.save(entitys); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java index 4f600ed3..b1eef911 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data @TableName("jg_collection") @@ -69,7 +69,7 @@ public class CollectionEntity { private String settlementType; @TableField("IS_COLLECTION") - private String IS_COLLECTION; + private String isCollection; @TableField("REMARK") private String remark; @@ -110,4 +110,10 @@ public class CollectionEntity { @TableField("DELETE_MARK") private String deleteMark; + @TableField("CUSTOMER_ID") + private String customerId; + + @TableField("CONTRACT_ID") + private String contractId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java index 7531a65d..df32b9ca 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java @@ -9,7 +9,6 @@ import lombok.Data; import java.util.Date; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; -import org.bytedeco.opencv.presets.opencv_core; /** @@ -18,7 +17,7 @@ import org.bytedeco.opencv.presets.opencv_core; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data @TableName("jg_collection_item0") @@ -72,4 +71,33 @@ public class Collection_item0Entity { @TableField("AMOUNT") private BigDecimal amount; + /** 订单金额 **/ + @TableField(exist = false) + private BigDecimal price; + + /** 已收款金额 **/ + @TableField(exist = false) + private BigDecimal amountCollected; + + /** 合同编码 **/ + @TableField(exist = false) + private String contractCode; + + /** 重量 **/ + @TableField(exist = false) + private BigDecimal num; + + + /** 垫资金额 **/ + @TableField(exist = false) + private BigDecimal advanceAmount; + + /** 税额 **/ + @TableField(exist = false) + private BigDecimal rate; + + /** 不含税金额 **/ + @TableField(exist = false) + private BigDecimal notPrice; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/SaleorderCETEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/SaleorderCETEntity.java deleted file mode 100644 index e6de7a59..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/SaleorderCETEntity.java +++ /dev/null @@ -1,144 +0,0 @@ -package jnpf.collection.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - - -/** - * - * 销售订单 - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 - */ -@Data -@TableName("jg_salesorder") -public class SaleorderCETEntity { - - @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/collection/mapper/CollectionMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java index 17749e73..d5191bee 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java @@ -3,6 +3,8 @@ package jnpf.collection.mapper; import jnpf.collection.entity.CollectionEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.poundlist.entity.PoundlistEntity; +import org.apache.ibatis.annotations.Param; /** * @@ -10,8 +12,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ public interface CollectionMapper extends BaseMapper { + PoundlistEntity queryPound(@Param("poundlistId") String poundlistId); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/Collection_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/Collection_item0Mapper.java index 4e43a038..baac7952 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/Collection_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/Collection_item0Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ public interface Collection_item0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/SaleorderCETMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/SaleorderCETMapper.java deleted file mode 100644 index 94b19c4b..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/SaleorderCETMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package jnpf.collection.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import jnpf.collection.entity.SaleorderCETEntity; - -/** - * - * saleorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 - */ -public interface SaleorderCETMapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java index 5700dbe6..70eb2988 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java @@ -15,22 +15,23 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionCrForm { - /** 客户名称 **/ - @JsonProperty("customerCode") - private String customerCode; - /** 单据编号 **/ @JsonProperty("documentNo") private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; + + /** 合同 **/ + @JsonProperty("contractId") + private String contractId; + /** 收款金额 **/ @JsonProperty("amountCollected") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java index d900ceca..e4e2348d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionInfoVO{ @@ -28,13 +28,13 @@ public class CollectionInfoVO{ @JsonProperty("documentNo") private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerCode") - private String customerCode; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 合同 **/ + @JsonProperty("contractId") + private String contractId; /** 收款金额 **/ @JsonProperty("amountCollected") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java index 417d8f70..dde7eae9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionListQuery extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java index 2384f68f..35302f9a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionListVO{ @@ -28,14 +28,14 @@ public class CollectionListVO{ @JsonProperty("documentNo") private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerCode") - private String customerCode; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 合同 **/ + @JsonProperty("contractId") + private String contractId; /** 收款金额 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java index e769898f..092dc9e3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionPagination extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java index dad06731..4106a9a9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionPaginationExportModel extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java index a37ed90c..7c552f64 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java @@ -16,7 +16,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-09 + * @日期： 2023-02-25 */ @Data public class CollectionUpForm{ @@ -28,14 +28,14 @@ public class CollectionUpForm{ @JsonProperty("documentNo") private String documentNo; - /** 客户名称 **/ - @JsonProperty("customerCode") - private String customerCode; + /** 客户 **/ + @JsonProperty("customerId") + private String customerId; - /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + /** 合同 **/ + @JsonProperty("contractId") + private String contractId; /** 收款金额 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java index 3bcad6d8..0fe9967b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ @Data public class Collection_item0Model { @@ -22,10 +22,6 @@ public class Collection_item0Model { @JsonProperty("amount") private String amount; - /** 销售订单主表id **/ - @JsonProperty("id") - private String id; - /** 订单金额 **/ @JsonProperty("price") private String price; @@ -34,11 +30,11 @@ public class Collection_item0Model { @JsonProperty("amountCollected") private String amountCollected; - /** 销售订单编号 **/ - @JsonProperty("documentNo") - private String documentNo; + /** 销售订单 **/ + @JsonProperty("salesorderId") + private String salesorderId; - /** 合同编号 **/ + /** 合同编码 **/ @JsonProperty("contractCode") private String contractCode; @@ -46,6 +42,7 @@ public class Collection_item0Model { @JsonProperty("num") private String num; + /** 垫资金额 **/ @JsonProperty("advanceAmount") private String advanceAmount; @@ -60,6 +57,6 @@ public class Collection_item0Model { /** 业务日期 **/ @JsonProperty("creatorTime") - private String creatorTime; + private Long creatorTime; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java index 9be14b3f..73b19199 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java @@ -5,6 +5,8 @@ import jnpf.collection.service.Collection_item0Service; import jnpf.collection.entity.CollectionEntity; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.collection.model.collection.CollectionPagination; +import jnpf.poundlist.entity.PoundlistEntity; + import java.util.*; /** * @@ -12,7 +14,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ public interface CollectionService extends IService { @@ -33,5 +35,7 @@ public interface CollectionService extends IService { // 子表方法 List GetCollection_item0List(String id); + PoundlistEntity queryPoundInfo(String poundlistId); + //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/Collection_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/Collection_item0Service.java index 98d16bdf..9a2c7065 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/Collection_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/Collection_item0Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ public interface Collection_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/SaleorderCETService.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/SaleorderCETService.java deleted file mode 100644 index ad412fe9..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/SaleorderCETService.java +++ /dev/null @@ -1,20 +0,0 @@ -package jnpf.collection.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.collection.entity.*; -import jnpf.saleorder.model.saleorder.SaleorderPagination; - -import java.util.List; - -/** - * - * saleorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 - */ -public interface SaleorderCETService extends IService { - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java index 585ad368..8e427804 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java @@ -4,6 +4,8 @@ import jnpf.collection.entity.*; import jnpf.collection.mapper.CollectionMapper; import jnpf.collection.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.util.RandomUtil; import java.math.BigDecimal; import cn.hutool.core.util.ObjectUtil; @@ -30,6 +32,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.text.SimpleDateFormat; import jnpf.util.*; + +import javax.annotation.Resource; import java.util.*; /** @@ -38,7 +42,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ @Service public class CollectionServiceImpl extends ServiceImpl implements CollectionService{ @@ -53,6 +57,10 @@ public class CollectionServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PoundlistEntity::getId,poundlistId); + return poundlistService.getOne(queryWrapper); +// return collectionMapper.queryPound(poundlistId); + } + //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java index 7e6fcded..4fc789fb 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-09 + * 日期： 2023-02-25 */ @Service public class Collection_item0ServiceImpl extends ServiceImpl implements Collection_item0Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/SaleorderCETServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/SaleorderCETServiceImpl.java deleted file mode 100644 index 9f2d7d28..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/SaleorderCETServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package jnpf.collection.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import jnpf.collection.entity.*; -import jnpf.collection.mapper.SaleorderCETMapper; - -import jnpf.collection.service.*; - -import org.springframework.stereotype.Service; - - - -/** - * - * saleorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 - */ -@Service -public class SaleorderCETServiceImpl extends ServiceImpl implements SaleorderCETService { - - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 537ebc99..99e3ae7a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -15,6 +15,8 @@ import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.poundlist.model.poundlist.*; @@ -72,6 +74,37 @@ public class PoundlistController { @Autowired private PoundlistService poundlistService; + /** + * 生成销售 + * + * @param ids + * @return + */ + @PostMapping("/createsale/{ids}") + public ActionResult createSale(@PathVariable("ids") String ids){ + String[] idList = ids.split(","); + List list = new ArrayList<>(); + for (String allId : idList){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PoundlistEntity::getId,allId); + queryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1"); + queryWrapper.lambda().eq(PoundlistEntity::getSalesStatus,"99"); + PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(poundlistEntity)) { + list.add(poundlistEntity); + } + } + if (list.size() > 0) { + long count = list.stream().map(PoundlistEntity::getSalesId).distinct().count(); + if (count != 1) { + return ActionResult.fail("销售订单不一致"); + }else{ + return ActionResult.success(list); + } + }else{ + return ActionResult.fail("当前状态不能生成销售订单"); + } + } @@ -181,7 +214,7 @@ public class PoundlistController { entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap)); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); Map businessIdMap = new HashMap<>(); - entity.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_ID","F_RealName",entity.getBusinessId(),businessIdMap)); + entity.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",entity.getBusinessId(),businessIdMap)); Map naturalIdMap = new HashMap<>(); entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap)); Map purchaseIdMap = new HashMap<>(); @@ -385,7 +418,7 @@ public class PoundlistController { vo.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",vo.getVehicleId(),vehicleIdMap)); vo.setVehiclePictures(generaterSwapUtil.getFileNameInJson(vo.getVehiclePictures())); Map businessIdMap = new HashMap<>(); - vo.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_ID","F_RealName",vo.getBusinessId(),businessIdMap)); + vo.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",vo.getBusinessId(),businessIdMap)); Map naturalIdMap = new HashMap<>(); vo.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",vo.getNaturalId(),naturalIdMap)); Map purchaseIdMap = new HashMap<>(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index e38ab8dc..780a65b9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -62,6 +62,7 @@ public class PoundlistServiceImpl extends ServiceImpl poundlistQueryWrapper=new QueryWrapper<>(); poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1"); +// poundlistQueryWrapper.lambda().eq(PoundlistEntity::getSalesStatus,"99"); boolean pcPermission = false; boolean appPermission = false; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java index 3d126320..6b2d907f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java @@ -15,6 +15,8 @@ import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.saleorder.entity.SaleorderitemEntity; +import jnpf.saleorder.service.SaleorderitemService; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.receiptout.model.receiptout.*; @@ -55,12 +57,12 @@ import jnpf.util.enums.FileTypeEnum; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Slf4j @RestController -@Api(tags = "receiptout" , value = "example") -@RequestMapping("/api/example/Receiptout") +@Api(tags = "receiptout" , value = "receipout") +@RequestMapping("/api/receipout/Receiptout") public class ReceiptoutController { @Autowired @@ -77,8 +79,41 @@ public class ReceiptoutController { @Autowired private Receiptout_item0Service receiptout_item0Service; + @Autowired + private SaleorderitemService saleorderitemService; - + /** + * 销售订单出货，出库单创建 + * + * @param receiptoutCrForm + * @return + */ + @PostMapping("/saleordercreate") + @Transactional + public ActionResult saleorderCreate(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException { + String mainId =RandomUtil.uuId(); + UserInfo userInfo=userProvider.get(); + receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false)); + receiptoutCrForm.setCreatorTime(DateUtil.getNow()); + receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); + ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSalesId()); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + saleorderitemEntity.setStatus("1"); + saleorderitemService.updateById(saleorderitemEntity); + entity.setId(mainId); + entity.setIssueDate(new Date()); + receiptoutService.save(entity); + List Receiptout_item0List = JsonUtil.getJsonToList(receiptoutCrForm.getReceiptout_item0List(),Receiptout_item0Entity.class); + for(Receiptout_item0Entity entitys : Receiptout_item0List){ + entitys.setId(RandomUtil.uuId()); + entitys.setReceiptinId(entity.getId()); + entitys.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num",false)); + receiptout_item0Service.save(entitys); + } + return ActionResult.success("创建成功"); + } /** * 列表 @@ -91,8 +126,10 @@ public class ReceiptoutController { List list= receiptoutService.getList(receiptoutPagination); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map sourceNoMap = new HashMap<>(); - entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap)); + Map salesIdMap = new HashMap<>(); + entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); + Map customerIdMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); } @@ -130,23 +167,8 @@ public class ReceiptoutController { for(Receiptout_item0Entity entitys : Receiptout_item0List){ entitys.setId(RandomUtil.uuId()); entitys.setReceiptinId(entity.getId()); - - - - - - - - - - - - receiptout_item0Service.save(entitys); } - - - return ActionResult.success("创建成功"); } @@ -185,8 +207,10 @@ public class ReceiptoutController { List list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map sourceNoMap = new HashMap<>(); - entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap)); + Map salesIdMap = new HashMap<>(); + entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); + Map customerIdMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); } @@ -214,8 +238,8 @@ public class ReceiptoutController { case "type" : entitys.add(new ExcelExportEntity("业务类型" ,"type")); break; - case "sourceNo" : - entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo")); + case "salesId" : + entitys.add(new ExcelExportEntity("来源单号" ,"salesId")); break; case "amount" : entitys.add(new ExcelExportEntity("出库金额" ,"amount")); @@ -346,18 +370,24 @@ public class ReceiptoutController { List jg_receiptout_item0List = receiptoutService.GetReceiptout_item0List(id); List jg_receiptout_item0ModelList = JsonUtil.getJsonToList(jg_receiptout_item0List,Receiptout_item0Model.class); for(Receiptout_item0Model jg_receiptout_item0Model : jg_receiptout_item0ModelList){ - Map licenseNoMap = new HashMap<>(); - jg_receiptout_item0Model.setLicenseNo(generaterSwapUtil.getPopupSelectValue("392933248017164229","license_no","license_no",jg_receiptout_item0Model.getLicenseNo(),licenseNoMap)); + Map vehicleIdMap = new HashMap<>(); + jg_receiptout_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptout_item0Model.getVehicleId(),vehicleIdMap)); + Map materialIdMap = new HashMap<>(); + jg_receiptout_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptout_item0Model.getMaterialId(),materialIdMap)); Map reservoirareaIdMap = new HashMap<>(); jg_receiptout_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptout_item0Model.getReservoirareaId(),reservoirareaIdMap)); + Map warehouseMap = new HashMap<>(); + jg_receiptout_item0Model.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptout_item0Model.getWarehouseId(),warehouseMap)); } vo.setReceiptout_item0List(jg_receiptout_item0ModelList); //附表数据转换 //添加到详情表单对象中 - Map sourceNoMap = new HashMap<>(); - vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",vo.getSourceNo(),sourceNoMap)); + Map salesIdMap = new HashMap<>(); + vo.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSalesId(),salesIdMap)); + Map customerIdMap = new HashMap<>(); + vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java index da03c904..1ff330d7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data @TableName("jg_receiptout") @@ -96,4 +96,10 @@ public class ReceiptoutEntity { @TableField("REMARK") private String remark; + @TableField("SALES_ID") + private String salesId; + + @TableField("CUSTOMER_ID") + private String customerId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java index a47f25b7..b7536569 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data @TableName("jg_receiptout_item0") @@ -113,4 +113,13 @@ public class Receiptout_item0Entity { @TableField("SALESORDERITEM_ID") private String salesorderitemId; + @TableField("VEHICLE_ID") + private String vehicleId; + + @TableField("POUND_TYPE") + private String poundType; + + @TableField("MATERIAL_ID") + private String materialId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java index a6b3423a..baab2fa3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ public interface ReceiptoutMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java index 38720ef1..8ac4afc4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ public interface Receiptout_item0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java index 10bf0986..8e72f0b9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutCrForm { @@ -29,8 +29,8 @@ public class ReceiptoutCrForm { private String type; /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + @JsonProperty("salesId") + private String salesId; /** 出库金额 **/ @JsonProperty("amount") @@ -45,8 +45,8 @@ public class ReceiptoutCrForm { private String num; /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + @JsonProperty("customerId") + private String customerId; /** 备注 **/ @JsonProperty("remark") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java index abacb887..ff75af1c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutInfoVO{ @@ -33,8 +33,8 @@ public class ReceiptoutInfoVO{ private String type; /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + @JsonProperty("salesId") + private String salesId; /** 出库金额 **/ @JsonProperty("amount") @@ -49,8 +49,8 @@ public class ReceiptoutInfoVO{ private String num; /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + @JsonProperty("customerId") + private String customerId; /** 备注 **/ @JsonProperty("remark") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java index a9059788..36e68842 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutListQuery extends Pagination { @@ -20,9 +20,6 @@ public class ReceiptoutListQuery extends Pagination { /** 业务类型 */ private String type; - - /** 客户名称 */ - private String customerName; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java index 9e1a6ce9..33e1f51d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutListVO{ @@ -35,8 +35,8 @@ public class ReceiptoutListVO{ /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + @JsonProperty("salesId") + private String salesId; /** 出库金额 **/ @@ -55,8 +55,8 @@ public class ReceiptoutListVO{ /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + @JsonProperty("customerId") + private String customerId; /** 备注 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java index 6659852d..3eac151e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutPagination extends Pagination { @@ -21,9 +21,6 @@ public class ReceiptoutPagination extends Pagination { /** 业务类型 */ private String type; - - /** 客户名称 */ - private String customerName; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java index 0e349632..7f22e62e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutPaginationExportModel extends Pagination { @@ -26,7 +26,4 @@ public class ReceiptoutPaginationExportModel extends Pagination { /** 业务类型 */ private String type; - - /** 客户名称 */ - private String customerName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java index 700f4bb9..3e2867be 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java @@ -16,7 +16,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-08 + * @日期： 2023-02-24 */ @Data public class ReceiptoutUpForm{ @@ -35,8 +35,8 @@ public class ReceiptoutUpForm{ /** 来源单号 **/ - @JsonProperty("sourceNo") - private String sourceNo; + @JsonProperty("salesId") + private String salesId; /** 出库金额 **/ @@ -55,8 +55,8 @@ public class ReceiptoutUpForm{ /** 客户名称 **/ - @JsonProperty("customerName") - private String customerName; + @JsonProperty("customerId") + private String customerId; /** 备注 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java index ca2adcda..0999b005 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java @@ -13,24 +13,24 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ @Data public class Receiptout_item0Model { /** 车牌号 **/ - @JsonProperty("licenseNo") - private String licenseNo; + @JsonProperty("vehicleId") + private String vehicleId; /** 物料名称 **/ - @JsonProperty("materialName") - private String materialName; + @JsonProperty("materialId") + private String materialId; - /** 库区id **/ + /** 库区名称 **/ @JsonProperty("reservoirareaId") private String reservoirareaId; - /** 仓库id **/ + /** 仓库名称 **/ @JsonProperty("warehouseId") private String warehouseId; @@ -63,8 +63,8 @@ public class Receiptout_item0Model { private String batchNo; /** 磅单类型 **/ - @JsonProperty("deleteUserId") - private String deleteUserId; + @JsonProperty("poundType") + private String poundType; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java index a5f3c511..b2260b1d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java @@ -12,7 +12,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ public interface ReceiptoutService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java index 1b5afc15..9d3ec9c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ public interface Receiptout_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java index 4f0f11ca..4b64501a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java @@ -38,7 +38,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ @Service public class ReceiptoutServiceImpl extends ServiceImpl implements ReceiptoutService{ @@ -119,11 +119,6 @@ public class ReceiptoutServiceImpl extends ServiceImpl0){ receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList); } @@ -213,11 +208,6 @@ public class ReceiptoutServiceImpl extends ServiceImpl0){ receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java index b5eab109..3dc6aed0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-08 + * 日期： 2023-02-24 */ @Service public class Receiptout_item0ServiceImpl extends ServiceImpl implements Receiptout_item0Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java index 5b811e7d..f082f8ab 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java @@ -16,15 +16,10 @@ 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; @@ -34,14 +29,11 @@ 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; @@ -79,8 +71,32 @@ public class SalebackController { @Autowired private Saleback_item0Service saleback_item0Service; - @Autowired - private SaleorderService saleorderService; + +// /** +// * 流程创建 +// * +// * @param salebackCrForm +// * @return +// */ +// @PostMapping +// @Transactional +// public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException { +// String mainId =RandomUtil.uuId(); +// UserInfo userInfo=userProvider.get(); +// salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false)); +// 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); +// } +// return ActionResult.success("创建成功"); +// } /** @@ -99,12 +115,7 @@ public class SalebackController { 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(); @@ -126,6 +137,7 @@ public class SalebackController { public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); + salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false)); salebackCrForm.setCreatorTime(DateUtil.getNow()); salebackCrForm.setCreatorUserName(userInfo.getUserId()); SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class); @@ -135,29 +147,8 @@ public class SalebackController { 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("创建成功"); } @@ -201,12 +192,7 @@ public class SalebackController { 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")); @@ -340,11 +326,6 @@ public class SalebackController { 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); } @@ -364,19 +345,16 @@ public class SalebackController { 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)); + jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap)); + Map materialIdMap = new HashMap<>(); + jg_salesback_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesback_item0Model.getMaterialId(),materialIdMap)); + Map businessIdMap = new HashMap<>(); + jg_salesback_item0Model.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",jg_salesback_item0Model.getBusinessId(),businessIdMap)); } 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)); +// vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class)); //添加到详情表单对象中 Map salesOrderIdMap = new HashMap<>(); @@ -427,16 +405,16 @@ public class SalebackController { 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); - } +// //子表数据 +// 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("更新失败，数据不存在"); @@ -461,9 +439,7 @@ public class SalebackController { 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/Saleback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java index 6d105037..b620a00c 100644 --- 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 @@ -80,8 +80,8 @@ public class Saleback_item0Entity { @TableField("MATERIAL_NAME") private String materialName; - @TableField("POUNT_USER") - private String pountUser; + @TableField("BUSINESS_ID") + private String businessId; @TableField("POUNT_TYPE") private String pountType; @@ -107,4 +107,8 @@ public class Saleback_item0Entity { @TableField("VEHICLE_ID") private String vehicleId; + @TableField("MATERIAL_ID") + private String materialId; + + } 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 deleted file mode 100644 index 8fc29f7a..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SaleorderEntity.java +++ /dev/null @@ -1,156 +0,0 @@ -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/SaleorderMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java deleted file mode 100644 index 106965bc..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -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 index a9369f6c..816c4e69 100644 --- 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 @@ -64,8 +64,8 @@ public class SalebackCrForm { @JsonProperty("saleback_item0List") private List saleback_item0List; - /** 列表子表数据 **/ - @JsonProperty("jg_salesorder") - private SaleorderModel jg_salesorder; +// /** 列表子表数据 **/ +// @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 index f578dd57..27b14946 100644 --- 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 @@ -68,7 +68,7 @@ public class SalebackInfoVO{ /** 子表数据 **/ @JsonProperty("saleback_item0List") private List saleback_item0List; - /** 列表子表数据 **/ - @JsonProperty("jg_salesorder") - private SaleorderModel jg_salesorder; +// /** 列表子表数据 **/ +// @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/SalebackListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java index 495e3945..bb1eed37 100644 --- 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 @@ -74,8 +74,8 @@ public class SalebackListVO{ @JsonProperty("creatorUserName") private String creatorUserName; - - /**列表子表数据 */ - @JsonProperty("jg_salesorder") - private SaleorderListVO jg_salesorder; +// +// /**列表子表数据 */ +// @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/SalebackUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackUpForm.java index 37ba670a..8e4b4bed 100644 --- 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 @@ -76,8 +76,8 @@ public class SalebackUpForm{ /** 子表数据 **/ @JsonProperty("saleback_item0List") private List saleback_item0List; - - /** 列表子表数据 **/ - @JsonProperty("jg_salesorder") - private SaleorderModel jg_salesorder; +// +// /** 列表子表数据 **/ +// @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 index 869f3ce4..e1a9a032 100644 --- 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 @@ -19,12 +19,12 @@ import com.alibaba.fastjson.annotation.JSONField; public class Saleback_item0Model { /** 车牌号 **/ - @JsonProperty("licenseNum") - private String licenseNum; + @JsonProperty("vehicleId") + private String vehicleId; /** 物料名称 **/ - @JsonProperty("materialName") - private String materialName; + @JsonProperty("materialId") + private String materialId; /** 结算重量 **/ @JsonProperty("settlement") @@ -51,12 +51,15 @@ public class Saleback_item0Model { private String notAmount; /** 业务员 **/ - @JsonProperty("pountUser") - private String pountUser; + @JsonProperty("businessId") + private String businessId; /** 磅单类型 **/ @JsonProperty("pountType") private String pountType; + @JsonProperty("salesorderItem0Id") + private String salesorderItem0Id; + } 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 deleted file mode 100644 index 2dab5e3d..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderListVO.java +++ /dev/null @@ -1,28 +0,0 @@ - - -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 deleted file mode 100644 index c4fd0074..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderModel.java +++ /dev/null @@ -1,30 +0,0 @@ -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 index d9fa96b5..d2b53aca 100644 --- 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 @@ -1,10 +1,8 @@ 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.*; /** @@ -34,7 +32,6 @@ public interface SalebackService extends IService { // 子表方法 List GetSaleback_item0List(String id); - //列表子表数据方法 - SaleorderEntity getSaleorder(String id); + } 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 deleted file mode 100644 index c1bbbc61..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SaleorderService.java +++ /dev/null @@ -1,15 +0,0 @@ -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 index 0021a57c..90de0a6f 100644 --- 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 @@ -50,8 +50,6 @@ public class SalebackServiceImpl extends ServiceImpl 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"); @@ -88,13 +85,6 @@ public class SalebackServiceImpl extends ServiceImpl)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++; } } } @@ -118,14 +108,6 @@ public class SalebackServiceImpl extends ServiceImpl(); - } else { - saleorderQueryWrapper = (QueryWrapper)saleorderObj; - saleorderNum++; - } - } } @@ -170,8 +152,7 @@ public class SalebackServiceImpl extends ServiceImpl 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"); @@ -191,13 +172,7 @@ public class SalebackServiceImpl extends ServiceImpl)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){ @@ -220,13 +195,7 @@ public class SalebackServiceImpl extends ServiceImpl(); - } else { - saleorderQueryWrapper = (QueryWrapper)saleorderObj; - saleorderNum++; - } + } @@ -299,13 +268,7 @@ public class SalebackServiceImpl extends ServiceImpl 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/SaleorderServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java deleted file mode 100644 index d4bee19b..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -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/saleorder/controller/SaleorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java deleted file mode 100644 index 8e50c6e1..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java +++ /dev/null @@ -1,661 +0,0 @@ - - -package jnpf.saleorder.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.saleorder.model.saleorder.*; -import jnpf.saleorder.model.saleorder.SaleorderPagination; -import jnpf.saleorder.entity.Salesorder_item0Entity; -import jnpf.saleorder.entity.ReceiptoutsoitemEntity; -import jnpf.saleorder.entity.CollectionsoitemEntity; -import jnpf.saleorder.entity.Arinvoices_item0soitemEntity; -import jnpf.saleorder.entity.SalesbacksoitemEntity; -import jnpf.saleorder.entity.PaymentsoitemEntity; -import jnpf.util.*; -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.saleorder.entity.SaleorderitemEntity; -import jnpf.saleorder.service.SaleorderitemService; -import jnpf.saleorder.service.Salesorder_item0Service; -import jnpf.saleorder.service.ReceiptoutsoitemService; -import jnpf.saleorder.service.CollectionsoitemService; -import jnpf.saleorder.service.Arinvoices_item0soitemService; -import jnpf.saleorder.service.SalesbacksoitemService; -import jnpf.saleorder.service.PaymentsoitemService; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.validation.Valid; -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; - -/** - * - * saleorder - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 - */ -@Slf4j -@RestController -@Api(tags = "saleorder" , value = "saleorder") -@RequestMapping("/api/saleorder/Saleorder") -public class SaleorderController { - - @Autowired - private GeneraterSwapUtil generaterSwapUtil; - - @Autowired - private ConfigValueUtil configValueUtil; - - @Autowired - private UserProvider userProvider; - - @Autowired - private SaleorderitemService saleorderitemService; - - @Autowired - private Salesorder_item0Service salesorder_item0Service; - @Autowired - private ReceiptoutsoitemService receiptoutsoitemService; - @Autowired - private CollectionsoitemService collectionsoitemService; - @Autowired - private Arinvoices_item0soitemService arinvoices_item0soitemService; - @Autowired - private SalesbacksoitemService salesbacksoitemService; - @Autowired - private PaymentsoitemService paymentsoitemService; - - - - /** - * 列表 - * - * @param saleorderPagination - * @return - */ - @PostMapping("/getList") - public ActionResult list(@RequestBody SaleorderPagination saleorderPagination)throws IOException{ - List list= saleorderitemService.getList(saleorderPagination); - //处理id字段转名称，若无需转或者为空可删除 - for(SaleorderitemEntity entity:list){ - Map contractNameMap = new HashMap<>(); - entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap)); - entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - } - List listVO=JsonUtil.getJsonToList(list,SaleorderListVO.class); - for(SaleorderListVO saleorderVO:listVO){ - } - - - PageListVO vo=new PageListVO(); - vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(saleorderPagination,PaginationVO.class); - vo.setPagination(page); - return ActionResult.success(vo); - } - - - /** - * 创建 - * - * @param saleorderCrForm - * @return - */ - @PostMapping - @Transactional - public ActionResult create(@RequestBody @Valid SaleorderCrForm saleorderCrForm) throws DataException { - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); - saleorderCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("bxdj", false)); - saleorderCrForm.setCreatorUserName(userInfo.getUserId()); - SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderCrForm, SaleorderitemEntity.class); - entity.setId(mainId); - saleorderitemService.save(entity); - List Salesorder_item0List = JsonUtil.getJsonToList(saleorderCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class); - for(Salesorder_item0Entity entitys : Salesorder_item0List){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderId(entity.getId()); - - - - - - - - - - - - salesorder_item0Service.save(entitys); - } - - List ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class); - for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSourceNo(entity.getDocumentNo()); - - - - - receiptoutsoitemService.save(entitys); - } - - List CollectionsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getCollectionsoitemList(),CollectionsoitemEntity.class); - for(CollectionsoitemEntity entitys : CollectionsoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderNo(entity.getDocumentNo()); - - - - collectionsoitemService.save(entitys); - } - - List Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderCrForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class); - for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderNo(entity.getDocumentNo()); - - - - - - - - - - - - arinvoices_item0soitemService.save(entitys); - } - - List SalesbacksoitemList = JsonUtil.getJsonToList(saleorderCrForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class); - for(SalesbacksoitemEntity entitys : SalesbacksoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderId(entity.getId()); - - - - - salesbacksoitemService.save(entitys); - } - - List PaymentsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getPaymentsoitemList(),PaymentsoitemEntity.class); - for(PaymentsoitemEntity entitys : PaymentsoitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setPaymentno(entity.getDocumentNo()); - - - - - - paymentsoitemService.save(entitys); - } - - - - 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(SaleorderPaginationExportModel saleorderPaginationExportModel) throws IOException { - if (StringUtil.isEmpty(saleorderPaginationExportModel.getSelectKey())){ - return ActionResult.fail("请选择导出字段"); - } - SaleorderPagination saleorderPagination=JsonUtil.getJsonToBean(saleorderPaginationExportModel, SaleorderPagination.class); - List list= saleorderitemService.getTypeList(saleorderPagination,saleorderPaginationExportModel.getDataType()); - //处理id字段转名称，若无需转或者为空可删除 - for(SaleorderitemEntity entity:list){ - Map contractNameMap = new HashMap<>(); - entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap)); - entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - } - List listVO=JsonUtil.getJsonToList(list,SaleorderListVO.class); - for(SaleorderListVO saleorderVO:listVO){ - } - - //转换为map输出 - List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); - String[]keys=!StringUtil.isEmpty(saleorderPaginationExportModel.getSelectKey())?saleorderPaginationExportModel.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 "documentNo" : - entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); - break; - case "contractName" : - entitys.add(new ExcelExportEntity("合同名称" ,"contractName")); - break; - case "currency" : - entitys.add(new ExcelExportEntity("币别" ,"currency")); - break; - case "contractNo" : - entitys.add(new ExcelExportEntity("对方合同" ,"contractNo")); - break; - case "advanceAmount" : - entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount")); - break; - case "num" : - entitys.add(new ExcelExportEntity("数量" ,"num")); - break; - case "price" : - entitys.add(new ExcelExportEntity("金额" ,"price")); - break; - case "notPrice" : - entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice")); - break; - case "remark" : - entitys.add(new ExcelExportEntity("备注信息" ,"remark")); - break; - case "costomerName" : - entitys.add(new ExcelExportEntity("客户名称" ,"costomerName")); - break; - case "amountCollected" : - entitys.add(new ExcelExportEntity("已回款金额" ,"amountCollected")); - break; - case "invoiceNum" : - entitys.add(new ExcelExportEntity("发票数量" ,"invoiceNum")); - break; - case "invoiceAmount" : - entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount")); - break; - case "sourceSystem" : - entitys.add(new ExcelExportEntity("来源系统" ,"sourceSystem")); - break; - case "status" : - entitys.add(new ExcelExportEntity("单据状态 " ,"status")); - 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){ - SaleorderitemEntity entity= saleorderitemService.getInfo(id); - SaleorderInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderInfoVO.class); - vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); - - //子表 - List Salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); - for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ - } - vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class )); - List ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id); - for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){ - } - vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class )); - List CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id); - for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){ - } - vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class )); - List Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id); - for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){ - } - vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class )); - List SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id); - for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){ - } - vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class )); - List PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id); - for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){ - } - vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class )); - //副表 - return ActionResult.success(vo); - } - - /** - * 表单信息(详情页) - * - * @param id - * @return - */ - @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - SaleorderitemEntity entity= saleorderitemService.getInfo(id); - SaleorderInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderInfoVO.class); - - //子表数据转换 - List jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); - List jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class); - for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){ - Map vehicleIdMap = new HashMap<>(); -// jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap)); - jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("391151974030035653","vehicle_id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap)); - } - vo.setSalesorder_item0List(jg_salesorder_item0ModelList); - List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); - List jg_receiptoutModelList = JsonUtil.getJsonToList(jg_receiptoutList,ReceiptoutsoitemModel.class); - for(ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList){ - } - vo.setReceiptoutsoitemList(jg_receiptoutModelList); - List jg_collectionList = saleorderitemService.GetCollectionsoitemList(id); - List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionsoitemModel.class); - for(CollectionsoitemModel jg_collectionModel : jg_collectionModelList){ - } - vo.setCollectionsoitemList(jg_collectionModelList); - List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(id); - List jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List,Arinvoices_item0soitemModel.class); - for(Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList){ - jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent())); - } - vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); - List jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id); - List jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class); - for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){ - } - vo.setSalesbacksoitemList(jg_salesbackModelList); - List jg_paymentList = saleorderitemService.GetPaymentsoitemList(id); - List jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class); - for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){ - } - vo.setPaymentsoitemList(jg_paymentModelList); - - //附表数据转换 - -//添加到详情表单对象中 - Map contractNameMap = new HashMap<>(); - vo.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",vo.getContractName(),contractNameMap)); - 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 SaleorderUpForm saleorderUpForm) throws DataException { - UserInfo userInfo=userProvider.get(); - SaleorderitemEntity entity= saleorderitemService.getInfo(id); - if(entity!=null){ - SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderUpForm, SaleorderitemEntity.class); - subentity.setCreatorUserName(entity.getCreatorUserName()); - saleorderitemService.update(id, subentity); - - QueryWrapper Salesorder_item0queryWrapper = new QueryWrapper<>(); - Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId()); - salesorder_item0Service.remove(Salesorder_item0queryWrapper); - - List Salesorder_item0List = JsonUtil.getJsonToList(saleorderUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class); - for(Salesorder_item0Entity entitys : Salesorder_item0List){ - - - - - - - - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderId(entity.getId()); - salesorder_item0Service.save(entitys); - } - - - QueryWrapper ReceiptoutsoitemqueryWrapper = new QueryWrapper<>(); - ReceiptoutsoitemqueryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, entity.getDocumentNo()); - receiptoutsoitemService.remove(ReceiptoutsoitemqueryWrapper); - - List ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class); - for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){ - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setSourceNo(entity.getDocumentNo()); - receiptoutsoitemService.save(entitys); - } - - - QueryWrapper CollectionsoitemqueryWrapper = new QueryWrapper<>(); - CollectionsoitemqueryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, entity.getDocumentNo()); - collectionsoitemService.remove(CollectionsoitemqueryWrapper); - - List CollectionsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getCollectionsoitemList(),CollectionsoitemEntity.class); - for(CollectionsoitemEntity entitys : CollectionsoitemList){ - - - - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderNo(entity.getDocumentNo()); - collectionsoitemService.save(entitys); - } - - - QueryWrapper Arinvoices_item0soitemqueryWrapper = new QueryWrapper<>(); - Arinvoices_item0soitemqueryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, entity.getDocumentNo()); - arinvoices_item0soitemService.remove(Arinvoices_item0soitemqueryWrapper); - - List Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderUpForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class); - for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){ - - - - - - - - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderNo(entity.getDocumentNo()); - arinvoices_item0soitemService.save(entitys); - } - - - QueryWrapper SalesbacksoitemqueryWrapper = new QueryWrapper<>(); - SalesbacksoitemqueryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, entity.getId()); - salesbacksoitemService.remove(SalesbacksoitemqueryWrapper); - - List SalesbacksoitemList = JsonUtil.getJsonToList(saleorderUpForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class); - for(SalesbacksoitemEntity entitys : SalesbacksoitemList){ - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setSalesOrderId(entity.getId()); - salesbacksoitemService.save(entitys); - } - - - QueryWrapper PaymentsoitemqueryWrapper = new QueryWrapper<>(); - PaymentsoitemqueryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, entity.getDocumentNo()); - paymentsoitemService.remove(PaymentsoitemqueryWrapper); - - List PaymentsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getPaymentsoitemList(),PaymentsoitemEntity.class); - for(PaymentsoitemEntity entitys : PaymentsoitemList){ - - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setPaymentno(entity.getDocumentNo()); - paymentsoitemService.save(entitys); - } - - return ActionResult.success("更新成功"); - }else{ - return ActionResult.fail("更新失败，数据不存在"); - } - } - - - - /** - * 删除 - * - * @param id - * @return - */ - @DeleteMapping("/{id}") - @Transactional - public ActionResult delete(@PathVariable("id") String id){ - SaleorderitemEntity entity= saleorderitemService.getInfo(id); - if(entity!=null){ - saleorderitemService.delete(entity); - QueryWrapper queryWrapperSalesorder_item0=new QueryWrapper<>(); - queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId()); - salesorder_item0Service.remove(queryWrapperSalesorder_item0); - QueryWrapper queryWrapperReceiptoutsoitem=new QueryWrapper<>(); - queryWrapperReceiptoutsoitem.lambda().eq(ReceiptoutsoitemEntity::getSourceNo,entity.getDocumentNo()); - receiptoutsoitemService.remove(queryWrapperReceiptoutsoitem); - QueryWrapper queryWrapperCollectionsoitem=new QueryWrapper<>(); - queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getSalesOrderNo,entity.getDocumentNo()); - collectionsoitemService.remove(queryWrapperCollectionsoitem); - QueryWrapper queryWrapperArinvoices_item0soitem=new QueryWrapper<>(); - queryWrapperArinvoices_item0soitem.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo,entity.getDocumentNo()); - arinvoices_item0soitemService.remove(queryWrapperArinvoices_item0soitem); - QueryWrapper queryWrapperSalesbacksoitem=new QueryWrapper<>(); - queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId()); - salesbacksoitemService.remove(queryWrapperSalesbacksoitem); - QueryWrapper queryWrapperPaymentsoitem=new QueryWrapper<>(); - queryWrapperPaymentsoitem.lambda().eq(PaymentsoitemEntity::getPaymentno,entity.getDocumentNo()); - paymentsoitemService.remove(queryWrapperPaymentsoitem); - - } - return ActionResult.success("删除成功"); - } - - - - - - - - - - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java new file mode 100644 index 00000000..a4d91e10 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -0,0 +1,833 @@ + + +package jnpf.saleorder.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.arinvoices.entity.ArinvoicesEntity; +import jnpf.arinvoices.service.ArinvoicesService; +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.collection.entity.Collection_item0Entity; +import jnpf.collection.service.Collection_item0Service; +import jnpf.config.ConfigValueUtil; +import jnpf.exception.DataException; +import jnpf.materialvo.entity.MaterialEntity; +import jnpf.materialvo.service.MaterialService; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; +import jnpf.receiptout.entity.ReceiptoutEntity; +import jnpf.receiptout.entity.Receiptout_item0Entity; +import jnpf.receiptout.service.ReceiptoutService; +import jnpf.receiptout.service.Receiptout_item0Service; +import jnpf.reservoirarea.entity.ReservoirareaEntity; +import jnpf.reservoirarea.service.ReservoirareaService; +import jnpf.saleorder.mapper.ReceiptoutsoitemMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.security.core.parameters.P; +import org.springframework.transaction.annotation.Transactional; +import jnpf.base.entity.ProvinceEntity; +import jnpf.saleorder.model.saleorderitem.*; +import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; +import jnpf.saleorder.entity.*; +import jnpf.saleorder.entity.Salesorder_item0Entity; +import jnpf.saleorder.entity.ReceiptoutsoitemEntity; +import jnpf.saleorder.entity.Arinvoices_item0soitemEntity; +import jnpf.saleorder.entity.CollectionsoitemEntity; +import jnpf.saleorder.entity.SalesbacksoitemEntity; +import jnpf.saleorder.entity.PaymentsoitemEntity; +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.saleorder.entity.SaleorderitemEntity; +import jnpf.saleorder.service.SaleorderitemService; +import jnpf.saleorder.entity.Salesorder_item0Entity; +import jnpf.saleorder.service.Salesorder_item0Service; +import jnpf.saleorder.entity.ReceiptoutsoitemEntity; +import jnpf.saleorder.service.ReceiptoutsoitemService; +import jnpf.saleorder.entity.Arinvoices_item0soitemEntity; +import jnpf.saleorder.service.Arinvoices_item0soitemService; +import jnpf.saleorder.entity.CollectionsoitemEntity; +import jnpf.saleorder.service.CollectionsoitemService; +import jnpf.saleorder.entity.SalesbacksoitemEntity; +import jnpf.saleorder.service.SalesbacksoitemService; +import jnpf.saleorder.entity.PaymentsoitemEntity; +import jnpf.saleorder.service.PaymentsoitemService; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.multipart.MultipartFile; +import javax.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; + +/** + * + * saleorder + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-02-22 + */ +@Slf4j +@RestController +@Api(tags = "saleorder" , value = "saleorder") +@RequestMapping("/api/saleorder/Saleorderitem") +public class SaleorderitemController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private ConfigValueUtil configValueUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private SaleorderitemService saleorderitemService; + + @Autowired + private Salesorder_item0Service salesorder_item0Service; + @Autowired + private ReceiptoutsoitemService receiptoutsoitemService; + @Autowired + private Arinvoices_item0soitemService arinvoices_item0soitemService; + @Autowired + private CollectionsoitemService collectionsoitemService; + @Autowired + private SalesbacksoitemService salesbacksoitemService; + @Autowired + private PaymentsoitemService paymentsoitemService; + @Autowired + private Receiptout_item0Service receiptout_item0Service; + @Autowired + private PoundlistService poundlistService; + @Autowired + private MaterialService materialService; + @Autowired + private ReservoirareaService reservoirareaService; + @Autowired + private ReceiptoutService receiptoutService; + @Autowired + private ArinvoicesService arinvoicesService; + @Autowired + private Collection_item0Service collection_item0Service; + + + /** + * 发货 + * + * @param ids + * @return + */ + @PostMapping("/delivery/{ids}") + public ActionResult delivery(@PathVariable("ids") String ids){ + String[] idList = ids.split(","); + List list = new ArrayList<>(); + for (String id : idList){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"0"); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); + List dList = salesorder_item0Service.list(queryWrapper1); + for (Salesorder_item0Entity entity : dList){ + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.lambda().eq(MaterialEntity::getId,entity.getMaterialId()); + MaterialEntity materialEntity = materialService.getOne(queryWrapper2); + if (ObjectUtils.isNotEmpty(materialEntity)) { + entity.setReservoirareaId(materialEntity.getOutArea()); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.lambda().eq(ReservoirareaEntity::getId,materialEntity.getOutArea()); + ReservoirareaEntity reservoirareaEntity = reservoirareaService.getOne(queryWrapper3); + entity.setWarehouseId(reservoirareaEntity.getWarehouseId()); + } + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); + PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); + entity.setPoundEntity(poundlistEntity); + } + saleorderitemEntity.setList(dList); + list.add(saleorderitemEntity); + }else{ + return ActionResult.fail("数据状态不能发货"); + } + } + return ActionResult.success(list); + } + /** + * 发票录入 + * + * @param ids + * @return + */ + + @PostMapping("/invoiceentry/{ids}") + public ActionResult invoiceEntry(@PathVariable("ids") String ids){ + String[] idList = ids.split(","); + List list = new ArrayList<>(); + for (String id : idList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"1"); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); + List dList = salesorder_item0Service.list(queryWrapper1); + for (Salesorder_item0Entity entity : dList){ + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); + PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); + entity.setPoundEntity(poundlistEntity); + } + saleorderitemEntity.setList(dList); + list.add(saleorderitemEntity); + }else{ + return ActionResult.fail("数据状态不能发票录入"); + } + } + return ActionResult.success(list); + } + + /** + * 归档 + * + * @param ids + * @return + */ + @PostMapping("/archive/{ids}") + public ActionResult archive(@PathVariable("ids") String ids){ + String[] idList = ids.split(","); + for (String id : idList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(sale)){ + if (sale.getStatus().equals("3")){ + return ActionResult.fail("该数据已归档"); + } + if (sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){ + sale.setStatus("3"); + saleorderitemService.updateById(sale); + }else{ + return ActionResult.fail("发票金额、金额、已付款金额不一致"); + } + }else { + return ActionResult.fail("未找到该数据"); + } + } + return ActionResult.success("归档成功"); + } + + /** + * 退货 + * + * @param ids + * @return + */ + @PostMapping("/materialback/{ids}") + public ActionResult materialBack(@PathVariable("ids") String ids) { + String[] idList = ids.split(","); + List list = new ArrayList<>(); + for (String id : idList){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { + if (saleorderitemEntity.getStatus().equals("0")){ + return ActionResult.fail("未发货，无需退货"); + } + if (saleorderitemEntity.getStatus().equals("3")){ + return ActionResult.fail("已归档，无法退货"); + } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId()); + List dList = salesorder_item0Service.list(queryWrapper1); + for (Salesorder_item0Entity entity : dList){ + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); + PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); + entity.setPoundEntity(poundlistEntity); + } + saleorderitemEntity.setList(dList); + list.add(saleorderitemEntity); + }else{ + return ActionResult.fail("未找到该数据"); + } + } + return ActionResult.success(list); + } + + /** + * 回款 + * + * @param ids + * @return + */ + @PostMapping("/collection/{ids}") + public ActionResult collection(@PathVariable("ids") String ids) { + String[] idList = ids.split(","); + List list = new ArrayList<>(); + for (String id : idList){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,id); + queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"2"); + SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(sale)){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, sale.getId()); + List dList = salesorder_item0Service.list(queryWrapper1); + for (Salesorder_item0Entity entity : dList){ + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); + PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); + entity.setPoundEntity(poundlistEntity); + } + sale.setList(dList); + list.add(sale); + }else{ + return ActionResult.fail("数据状态无法回款"); + } + } + return ActionResult.success(list); + } + + /** + * 列表 + * + * @param saleorderitemPagination + * @return + */ + @PostMapping("/getList") + public ActionResult list(@RequestBody SaleorderitemPagination saleorderitemPagination)throws IOException{ + List list= saleorderitemService.getList(saleorderitemPagination); + //处理id字段转名称，若无需转或者为空可删除 + for(SaleorderitemEntity entity:list){ + Map contractCodeMap = new HashMap<>(); + entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap)); + Map costomerCodeMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); +// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime())); + } + List listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class); + for(SaleorderitemListVO saleorderitemVO:listVO){ + } + + + PageListVO vo=new PageListVO(); + vo.setList(listVO); + PaginationVO page=JsonUtil.getJsonToBean(saleorderitemPagination,PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + + /** + * 创建 + * + * @param saleorderitemCrForm + * @return + */ + @PostMapping + @Transactional + public ActionResult create(@RequestBody @Valid SaleorderitemCrForm saleorderitemCrForm) throws DataException { + String mainId =RandomUtil.uuId(); + UserInfo userInfo=userProvider.get(); + saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); + saleorderitemCrForm.setCreatorUserName(userInfo.getUserId()); + saleorderitemCrForm.setCreatorTime(DateUtil.getNow()); + SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class); + entity.setId(mainId); + saleorderitemService.save(entity); + List Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class); + for(Salesorder_item0Entity entitys : Salesorder_item0List){ + PoundlistEntity poundlistEntity = poundlistService.getInfo(entitys.getPoundlistId()); + poundlistEntity.setSalesStatus("0"); + poundlistService.updateById(poundlistEntity); + entitys.setId(RandomUtil.uuId()); + entitys.setSalesOrderId(entity.getId()); + salesorder_item0Service.save(entitys); + } +/* List ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class); + for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){ + entitys.setId(RandomUtil.uuId()); + entitys.setSourceNo(entity.getDocumentNo()); + receiptoutsoitemService.save(entitys); + } + List Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class); + for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){ + entitys.setId(RandomUtil.uuId()); + entitys.setSalesOrderNo(entity.getDocumentNo()); + arinvoices_item0soitemService.save(entitys); + } + List CollectionsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getCollectionsoitemList(),CollectionsoitemEntity.class); + for(CollectionsoitemEntity entitys : CollectionsoitemList){ + entitys.setId(RandomUtil.uuId()); + entitys.setSalesOrderNo(entity.getDocumentNo()); + collectionsoitemService.save(entitys); + } + List SalesbacksoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class); + for(SalesbacksoitemEntity entitys : SalesbacksoitemList){ + entitys.setId(RandomUtil.uuId()); + entitys.setSalesOrderId(entity.getId()); + salesbacksoitemService.save(entitys); + } + List PaymentsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getPaymentsoitemList(),PaymentsoitemEntity.class); + for(PaymentsoitemEntity entitys : PaymentsoitemList){ + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentno(entity.getDocumentNo()); + paymentsoitemService.save(entitys); + }*/ + 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(SaleorderitemPaginationExportModel saleorderitemPaginationExportModel) throws IOException { + if (StringUtil.isEmpty(saleorderitemPaginationExportModel.getSelectKey())){ + return ActionResult.fail("请选择导出字段"); + } + SaleorderitemPagination saleorderitemPagination=JsonUtil.getJsonToBean(saleorderitemPaginationExportModel, SaleorderitemPagination.class); + List list= saleorderitemService.getTypeList(saleorderitemPagination,saleorderitemPaginationExportModel.getDataType()); + //处理id字段转名称，若无需转或者为空可删除 + for(SaleorderitemEntity entity:list){ + Map contractCodeMap = new HashMap<>(); + entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap)); + Map costomerCodeMap = new HashMap<>(); + entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); +// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime())); + } + List listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class); + for(SaleorderitemListVO saleorderitemVO:listVO){ + } + + //转换为map输出 + List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); + String[]keys=!StringUtil.isEmpty(saleorderitemPaginationExportModel.getSelectKey())?saleorderitemPaginationExportModel.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 "documentNo" : + entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); + break; + case "contractCode" : + entitys.add(new ExcelExportEntity("合同名称" ,"contractCode")); + break; + case "costomerCode" : + entitys.add(new ExcelExportEntity("客户名称" ,"costomerCode")); + break; + case "currency" : + entitys.add(new ExcelExportEntity("币别" ,"currency")); + break; + case "contractNo" : + entitys.add(new ExcelExportEntity("对方合同" ,"contractNo")); + break; + case "advanceAmount" : + entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount")); + break; + case "num" : + entitys.add(new ExcelExportEntity("重量" ,"num")); + break; + case "price" : + entitys.add(new ExcelExportEntity("金额" ,"price")); + break; + case "notPrice" : + entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice")); + break; + case "remark" : + entitys.add(new ExcelExportEntity("备注信息" ,"remark")); + break; + case "amountCollected" : + entitys.add(new ExcelExportEntity("已回款金额" ,"amountCollected")); + break; + case "invoiceNum" : + entitys.add(new ExcelExportEntity("发票数量" ,"invoiceNum")); + break; + case "invoiceAmount" : + entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount")); + break; + case "status" : + entitys.add(new ExcelExportEntity("单据状态 " ,"status")); + break; + case "erpNo" : + entitys.add(new ExcelExportEntity("ERP订单号" ,"erpNo")); + break; + case "creatorUserName" : + entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName")); + break; + case "creatorTime" : + entitys.add(new ExcelExportEntity("制单时间" ,"creatorTime")); + 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){ + SaleorderitemEntity entity= saleorderitemService.getInfo(id); + SaleorderitemInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderitemInfoVO.class); + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + vo.setCreatorTime(vo.getCreatorTime()); + + //子表 + List Salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); + for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ + } + vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class )); + + List ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id); + for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutsoitemEntity.getId()); + List list = receiptout_item0Service.list(queryWrapper); + + } + vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class )); + List Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id); + for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){ + } + vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class )); + List CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id); + for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){ + } + vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class )); + List SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id); + for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){ + } + vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class )); + List PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id); + for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){ + } + vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class )); + //副表 + return ActionResult.success(vo); + } + + /** + * 表单信息(详情页) + * + * @param id + * @return + */ + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + SaleorderitemEntity entity= saleorderitemService.getInfo(id); + SaleorderitemInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderitemInfoVO.class); + + //子表数据转换 + List jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); + List jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class); + for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){ + Map vehicleIdMap = new HashMap<>(); + jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap)); + Map materialIdMap = new HashMap<>(); + jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap)); + } + vo.setSalesorder_item0List(jg_salesorder_item0ModelList); + List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); + if (jg_receiptoutList.size()>0) { + List list = saleorderitemService.getReceiptout(jg_receiptoutList.get(0).getId()); + List jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class); + for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) { + jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo()); + jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime()); + Map vehicleIdMap = new HashMap<>(); + jg_receiptoutModel.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptoutModel.getVehicleId(),vehicleIdMap)); + Map materialIdMap = new HashMap<>(); + jg_receiptoutModel.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptoutModel.getMaterialId(),materialIdMap)); + Map reservoirareaIdMap = new HashMap<>(); + jg_receiptoutModel.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptoutModel.getReservoirareaId(),reservoirareaIdMap)); + Map warehouseMap = new HashMap<>(); + jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap)); + } + vo.setReceiptoutsoitemList(jg_receiptoutModelList); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id); + ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(arinvoicesEntity)) { + List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId()); + List jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class); + for (Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList) { + jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent())); + } + vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); + } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id); + Collection_item0Entity collection_item0Entity = collection_item0Service.getOne(queryWrapper1); + if (ObjectUtils.isNotEmpty(collection_item0Entity)) { + List jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity.getCollectionId()); + List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList, CollectionsoitemModel.class); + for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) { + } + vo.setCollectionsoitemList(jg_collectionModelList); + } + List jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id); + List jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class); + for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){ + } + vo.setSalesbacksoitemList(jg_salesbackModelList); + List jg_paymentList = saleorderitemService.GetPaymentsoitemList(id); + List jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class); + for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){ + } + vo.setPaymentsoitemList(jg_paymentModelList); + + //附表数据转换 + +//添加到详情表单对象中 + Map contractCodeMap = new HashMap<>(); + vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap)); + Map costomerCodeMap = new HashMap<>(); + vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",vo.getCustomerId(),costomerCodeMap)); + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + vo.setCreatorTime(vo.getCreatorTime()); + + return ActionResult.success(vo); + } + + + + + /** + * 更新 + * + * @param id + * @return + */ + @PutMapping("/{id}") + @Transactional + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SaleorderitemUpForm saleorderitemUpForm) throws DataException { + UserInfo userInfo=userProvider.get(); + SaleorderitemEntity entity= saleorderitemService.getInfo(id); + if(entity!=null){ + SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderitemUpForm, SaleorderitemEntity.class); + subentity.setCreatorUserName(entity.getCreatorUserName()); + subentity.setCreatorTime(entity.getCreatorTime()); + saleorderitemService.update(id, subentity); + + QueryWrapper Salesorder_item0queryWrapper = new QueryWrapper<>(); + Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId()); + salesorder_item0Service.remove(Salesorder_item0queryWrapper); + + List Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class); + for(Salesorder_item0Entity entitys : Salesorder_item0List){ + entitys.setId(RandomUtil.uuId()); + entitys.setSalesOrderId(entity.getId()); + salesorder_item0Service.save(entitys); + } + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } +// QueryWrapper ReceiptoutsoitemqueryWrapper = new QueryWrapper<>(); +// ReceiptoutsoitemqueryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, entity.getDocumentNo()); +// receiptoutsoitemService.remove(ReceiptoutsoitemqueryWrapper); +// List ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class); +// for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setSourceNo(entity.getDocumentNo()); +// receiptoutsoitemService.save(entitys); +// } +// QueryWrapper Arinvoices_item0soitemqueryWrapper = new QueryWrapper<>(); +// Arinvoices_item0soitemqueryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, entity.getDocumentNo()); +// arinvoices_item0soitemService.remove(Arinvoices_item0soitemqueryWrapper); +// List Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class); +// for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setSalesOrderNo(entity.getDocumentNo()); +// arinvoices_item0soitemService.save(entitys); +// } +// QueryWrapper CollectionsoitemqueryWrapper = new QueryWrapper<>(); +// CollectionsoitemqueryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, entity.getDocumentNo()); +// collectionsoitemService.remove(CollectionsoitemqueryWrapper); +// List CollectionsoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getCollectionsoitemList(),CollectionsoitemEntity.class); +// for(CollectionsoitemEntity entitys : CollectionsoitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setSalesOrderNo(entity.getDocumentNo()); +// collectionsoitemService.save(entitys); +// } +// QueryWrapper SalesbacksoitemqueryWrapper = new QueryWrapper<>(); +// SalesbacksoitemqueryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, entity.getId()); +// salesbacksoitemService.remove(SalesbacksoitemqueryWrapper); +// List SalesbacksoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class); +// for(SalesbacksoitemEntity entitys : SalesbacksoitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setSalesOrderId(entity.getId()); +// salesbacksoitemService.save(entitys); +// } +// QueryWrapper PaymentsoitemqueryWrapper = new QueryWrapper<>(); +// PaymentsoitemqueryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, entity.getDocumentNo()); +// paymentsoitemService.remove(PaymentsoitemqueryWrapper); +// List PaymentsoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getPaymentsoitemList(),PaymentsoitemEntity.class); +// for(PaymentsoitemEntity entitys : PaymentsoitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setPaymentno(entity.getDocumentNo()); +// paymentsoitemService.save(entitys); +// } + + } + + + + /** + * 删除 + * + * @param id + * @return + */ + @DeleteMapping("/{id}") + @Transactional + public ActionResult delete(@PathVariable("id") String id){ + SaleorderitemEntity entity= saleorderitemService.getInfo(id); + if(entity!=null){ + saleorderitemService.delete(entity); + QueryWrapper queryWrapperSalesorder_item0=new QueryWrapper<>(); + queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId()); + salesorder_item0Service.remove(queryWrapperSalesorder_item0); + QueryWrapper queryWrapperReceiptoutsoitem=new QueryWrapper<>(); + queryWrapperReceiptoutsoitem.lambda().eq(ReceiptoutsoitemEntity::getSourceNo,entity.getDocumentNo()); + receiptoutsoitemService.remove(queryWrapperReceiptoutsoitem); + QueryWrapper queryWrapperArinvoices_item0soitem=new QueryWrapper<>(); + queryWrapperArinvoices_item0soitem.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo,entity.getDocumentNo()); + arinvoices_item0soitemService.remove(queryWrapperArinvoices_item0soitem); + QueryWrapper queryWrapperCollectionsoitem=new QueryWrapper<>(); + queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getSalesOrderNo,entity.getDocumentNo()); + collectionsoitemService.remove(queryWrapperCollectionsoitem); + QueryWrapper queryWrapperSalesbacksoitem=new QueryWrapper<>(); + queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId()); + salesbacksoitemService.remove(queryWrapperSalesbacksoitem); + QueryWrapper queryWrapperPaymentsoitem=new QueryWrapper<>(); + queryWrapperPaymentsoitem.lambda().eq(PaymentsoitemEntity::getPaymentno,entity.getDocumentNo()); + paymentsoitemService.remove(queryWrapperPaymentsoitem); + + } + return ActionResult.success("删除成功"); + } + + + + + + + + + + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java index ba670b29..1f8898cd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_arinvoices_item0") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java index 5292462d..4bc75888 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_collection") @@ -26,36 +26,6 @@ public class CollectionsoitemEntity { @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; @@ -92,9 +62,15 @@ public class CollectionsoitemEntity { @TableField("PAYMENT_TYPE") private String paymentType; + @TableField("VOUCHER") + private String voucher; + @TableField("SETTLEMENT_TYPE") private String settlementType; + @TableField("IS_COLLECTION") + private String isCollection; + @TableField("REMARK") private String remark; @@ -104,4 +80,40 @@ public class CollectionsoitemEntity { @TableField("COLLECTION_BANK") private String collectionBank; + @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("CUSTOMER_ID") + private String customerId; + + @TableField("CONTRACT_ID") + private String contractId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java index 2ed6f0f5..757262ae 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_payment") @@ -114,4 +114,7 @@ public class PaymentsoitemEntity { @TableField("PAYMENTBANK") private String paymentbank; + @TableField("IS_PAY") + private String isPay; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java index 5525bf16..78c9187c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_receiptout") @@ -96,4 +96,11 @@ public class ReceiptoutsoitemEntity { @TableField("REMARK") private String remark; + @TableField("SALES_ID") + private String salesId; + + @TableField("CUSTOMER_ID") + private String customerId; + + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java index 7739105b..8acee2c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java @@ -4,6 +4,7 @@ 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 jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; import java.util.Date; @@ -18,6 +19,8 @@ import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,11 +30,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_salesorder") -public class SaleorderitemEntity { +public class SaleorderitemEntity { @TableId("ID") private String id; @@ -78,11 +81,11 @@ public class SaleorderitemEntity { @TableField("ERP_NO") private String erpNo; - @TableField("SOURCE_PO_NO") - private String sourcePoNo; + @TableField("SOURCE_PO_ID") + private String sourcePoId; - @TableField("CONTRACT_CODE") - private String contractCode; +// @TableField("CONTRACT_CODE") +// private String contractCode; @TableField("CONTRACT_NAME") private String contractName; @@ -90,8 +93,8 @@ public class SaleorderitemEntity { @TableField("CONTRACT_NO") private String contractNo; - @TableField("COSTOMER_CODE") - private String costomerCode; +// @TableField("COSTOMER_CODE") +// private String costomerCode; @TableField("COSTOMER_NAME") private String costomerName; @@ -153,4 +156,16 @@ public class SaleorderitemEntity { @TableField("OVERDUE_INTEREST") private BigDecimal overdueInterest; + @TableField("SOURCE_PO_NO") + private String sourcePoNo; + + @TableField(exist = false) + private List list; + + @TableField("CONTRACT_ID") + private String contractId; + + @TableField("CUSTOMER_ID") + private String customerId; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java index 1994b92c..519179f4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_salesback") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java index 045aedc2..4839ea7c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java @@ -4,6 +4,7 @@ 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 jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; import java.util.Date; @@ -12,6 +13,8 @@ import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data @TableName("jg_salesorder_item0") @@ -72,8 +75,8 @@ public class Salesorder_item0Entity { @TableField("POUNDLIST_ID") private String poundlistId; -// @TableField("LICENSE_NUM") -// private String licenseNum; + @TableField("LICENSE_NUM") + private String licenseNum; @TableField("MATERIAL_CODE") private String materialCode; @@ -87,8 +90,8 @@ public class Salesorder_item0Entity { @TableField("POUND_DATE") private Date poundDate; - @TableField("POUND_USER") - private String poundUser; + @TableField("BUSINESS_ID") + private String businessId; @TableField("POUND_TYPE") private String poundType; @@ -123,7 +126,29 @@ public class Salesorder_item0Entity { @TableField("VEHICLE_PICTURES") private String vehiclePictures; + @TableField("REMARK") + private String remark; + @TableField("VEHICLE_ID") private String vehicleId; + @TableField("MATERIAL_ID") + private String materialId; + + @TableField("CUSTOMER_ID") + private String customerId; + + /** 库区id */ + @TableField(exist = false) + private String reservoirareaId; + + /** 仓库id */ + @TableField(exist = false) + private String warehouseId; + + @TableField(exist = false) + private PoundlistEntity poundEntity; + + + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java index 8f5eb42a..9af50048 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface Arinvoices_item0soitemMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java index 8b428d91..d2b970b8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface CollectionsoitemMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java index 3ba1847d..5ee7c517 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface PaymentsoitemMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java index acd6f6da..1079d6fa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface ReceiptoutsoitemMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java index f54ad134..69d7d4e6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface SaleorderitemMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java index 5b1cfc2d..d8a40584 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface SalesbacksoitemMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java index a7f80053..c0035ddf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface Salesorder_item0Mapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java deleted file mode 100644 index ca6c0462..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java +++ /dev/null @@ -1,37 +0,0 @@ -package jnpf.saleorder.model.saleorder; - -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-02-03 - */ -@Data -public class ReceiptoutsoitemModel { - - /** 出库单号 **/ - @JsonProperty("documentNo") - private String documentNo; - - /** 出库日期 **/ - @JsonProperty("issueDate") - private Long issueDate; - /** 出库数量 **/ - @JsonProperty("num") - private String num; - - /** 出库金额 **/ - @JsonProperty("amount") - private String amount; - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java similarity index 84% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java index c03d2cf5..3bc144ff 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; import java.util.List; @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Data public class Arinvoices_item0soitemModel { @@ -26,14 +26,10 @@ public class Arinvoices_item0soitemModel { @JsonProperty("invoiceCode") private String invoiceCode; - /** 发票金额 **/ + /** 金额 **/ @JsonProperty("involceAmount") private String involceAmount; - /** 发票数量 **/ - @JsonProperty("invoiceQuantity") - private String invoiceQuantity; - /** 税率 **/ @JsonProperty("taxRate") private String taxRate; @@ -50,14 +46,14 @@ public class Arinvoices_item0soitemModel { @JsonProperty("invoiceStatus") private String invoiceStatus; + /** 开票日期 **/ + @JsonProperty("invoiceDate") + private Long invoiceDate; /** 开票人 **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 开票日期 **/ - @JsonProperty("invoiceDate") - private Long invoiceDate; - /** 发票附件 **/ + /** 发票文件 **/ @JsonProperty("attachMent") private String attachMent; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java similarity index 61% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java index 40ad7aa8..3c64ccc2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; import java.util.List; @@ -13,22 +13,33 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Data public class CollectionsoitemModel { - /** 收款类型 **/ - @JsonProperty("paymentType") - private String paymentType; + /** 收款单号 **/ + @JsonProperty("documentNo") + private String documentNo; + /** 收款时间 **/ + @JsonProperty("businessDate") + private Long businessDate; /** 收款金额 **/ @JsonProperty("amountCollected") private String amountCollected; + /** 收款方式 **/ + @JsonProperty("paymentType") + private String paymentType; + /** 备注 **/ @JsonProperty("remark") private String remark; + /** 创建人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java similarity index 91% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java index 3246af21..6cf2f864 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; import java.util.List; @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Data public class PaymentsoitemModel { @@ -22,10 +22,6 @@ public class PaymentsoitemModel { @JsonProperty("documentno") private String documentno; - /** 付款方式 **/ - @JsonProperty("settlementtype") - private String settlementtype; - /** 付款日期 **/ @JsonProperty("duedate") private Long duedate; @@ -33,6 +29,10 @@ public class PaymentsoitemModel { @JsonProperty("paymentamount") private String paymentamount; + /** 付款方式 **/ + @JsonProperty("settlementtype") + private String settlementtype; + /** 备注 **/ @JsonProperty("remark") private String remark; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java new file mode 100644 index 00000000..a755fffc --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java @@ -0,0 +1,83 @@ +package jnpf.saleorder.model.saleorderitem; + +import com.baomidou.mybatisplus.annotation.TableField; +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-02-22 + */ +@Data +public class ReceiptoutsoitemModel { + + /** 出库单号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 出库日期 **/ + @JsonProperty("issueDate") + private Long issueDate; + /** 车牌号 **/ + @JsonProperty("vehicleId") + private String vehicleId; + + /** 物料名称 **/ + @JsonProperty("materialId") + private String materialId; + + /** 库区名称 **/ + @JsonProperty("reservoirareaId") + private String reservoirareaId; + + /** 仓库名称 **/ + @JsonProperty("warehouseId") + private String warehouseId; + + /** 出库重量 **/ + @JsonProperty("deliveryNum") + private String deliveryNum; + +// /** 计量单位 **/ +// @JsonProperty("jnpf_jg_collection_jnpf_collectionCount") +// private String jnpf_jg_collection_jnpf_collectionCount; + + /** 计量单位 **/ + @JsonProperty("unit") + private String unit; + + /** 单价 **/ + @JsonProperty("price") + private String price; + + /** 税率 **/ + @JsonProperty("rate") + private String rate; + + /** 金额 **/ + @JsonProperty("amount") + private String amount; + + /** 税额 **/ + @JsonProperty("rateAmount") + private String rateAmount; + + /** 批次号 **/ + @JsonProperty("batchNo") + private String batchNo; + + /** 磅单类型 **/ + @JsonProperty("poundType") + private String poundType; + + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java similarity index 60% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java index ee9a716d..d49729c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java @@ -1,14 +1,18 @@ -package jnpf.saleorder.model.saleorder; - -import jnpf.saleorder.model.saleorder.Salesorder_item0Model; -import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel; -import jnpf.saleorder.model.saleorder.CollectionsoitemModel; -import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel; -import jnpf.saleorder.model.saleorder.SalesbacksoitemModel; -import jnpf.saleorder.model.saleorder.PaymentsoitemModel; +package jnpf.saleorder.model.saleorderitem; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model; +import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel; +import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel; +import jnpf.saleorder.model.saleorderitem.CollectionsoitemModel; +import jnpf.saleorder.model.saleorderitem.SalesbacksoitemModel; +import jnpf.saleorder.model.saleorderitem.PaymentsoitemModel; import lombok.Data; + +import java.util.Date; import java.util.List; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; @@ -20,22 +24,22 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderCrForm { +public class SaleorderitemCrForm { /** 单据编号 **/ @JsonProperty("documentNo") private String documentNo; - /** 合同编码 **/ - @JsonProperty("contractCode") - private String contractCode; - - /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; +// /** 合同名称 **/ +// @JsonProperty("contractCode") +// private String contractCode; +// +// /** 客户名称 **/ +// @JsonProperty("costomerCode") +// private String costomerCode; /** 币别 **/ @JsonProperty("currency") @@ -47,28 +51,24 @@ public class SaleorderCrForm { /** 垫资金额 **/ @JsonProperty("advanceAmount") - private String advanceAmount; + private Integer advanceAmount; - /** 数量 **/ + /** 重量 **/ @JsonProperty("num") - private String num; + private Integer num; /** 金额 **/ @JsonProperty("price") - private String price; + private Integer price; /** 不含税金额 **/ @JsonProperty("notPrice") - private String notPrice; + private Integer notPrice; /** 备注信息 **/ @JsonProperty("remark") private String remark; - /** 客户名称 **/ - @JsonProperty("costomerName") - private String costomerName; - /** 已回款金额 **/ @JsonProperty("amountCollected") private String amountCollected; @@ -81,18 +81,22 @@ public class SaleorderCrForm { @JsonProperty("invoiceAmount") private String invoiceAmount; - /** 来源系统 **/ - @JsonProperty("sourceSystem") - private String sourceSystem; - /** 单据状态 **/ @JsonProperty("status") private String status; + /** ERP订单号 **/ + @JsonProperty("erpNo") + private String erpNo; + /** 制单人 **/ @JsonProperty("creatorUserName") private String creatorUserName; + /** 制单时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + /** 子表数据 **/ @JsonProperty("salesorder_item0List") private List salesorder_item0List; @@ -100,17 +104,24 @@ public class SaleorderCrForm { @JsonProperty("receiptoutsoitemList") private List receiptoutsoitemList; /** 子表数据 **/ - @JsonProperty("collectionsoitemList") - private List collectionsoitemList; - /** 子表数据 **/ @JsonProperty("arinvoices_item0soitemList") private List arinvoices_item0soitemList; /** 子表数据 **/ + @JsonProperty("collectionsoitemList") + private List collectionsoitemList; + /** 子表数据 **/ @JsonProperty("salesbacksoitemList") private List salesbacksoitemList; /** 子表数据 **/ @JsonProperty("paymentsoitemList") private List paymentsoitemList; + /** 合同id**/ + @TableField("contractId") + private String contractId; + /** 客户id**/ + @TableField("customerId") + private String customerId; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java similarity index 63% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java index 03daa2a6..c94dee0c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java @@ -1,14 +1,15 @@ -package jnpf.saleorder.model.saleorder; - -import jnpf.saleorder.model.saleorder.Salesorder_item0Model; -import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel; -import jnpf.saleorder.model.saleorder.CollectionsoitemModel; -import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel; -import jnpf.saleorder.model.saleorder.SalesbacksoitemModel; -import jnpf.saleorder.model.saleorder.PaymentsoitemModel; +package jnpf.saleorder.model.saleorderitem; + +import com.baomidou.mybatisplus.annotation.TableField; +import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model; +import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel; +import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel; +import jnpf.saleorder.model.saleorderitem.CollectionsoitemModel; +import jnpf.saleorder.model.saleorderitem.SalesbacksoitemModel; +import jnpf.saleorder.model.saleorderitem.PaymentsoitemModel; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -21,10 +22,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderInfoVO{ +public class SaleorderitemInfoVO{ /** 主键 **/ @JsonProperty("id") private String id; @@ -33,13 +34,13 @@ public class SaleorderInfoVO{ @JsonProperty("documentNo") private String documentNo; - /** 合同编码 **/ - @JsonProperty("contractCode") - private String contractCode; - - /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; +// /** 合同名称 **/ +// @JsonProperty("contractCode") +// private String contractCode; +// +// /** 客户名称 **/ +// @JsonProperty("costomerCode") +// private String costomerCode; /** 币别 **/ @JsonProperty("currency") @@ -51,28 +52,24 @@ public class SaleorderInfoVO{ /** 垫资金额 **/ @JsonProperty("advanceAmount") - private String advanceAmount; + private Integer advanceAmount; - /** 数量 **/ + /** 重量 **/ @JsonProperty("num") - private String num; + private Integer num; /** 金额 **/ @JsonProperty("price") - private String price; + private Integer price; /** 不含税金额 **/ @JsonProperty("notPrice") - private String notPrice; + private Integer notPrice; /** 备注信息 **/ @JsonProperty("remark") private String remark; - /** 客户名称 **/ - @JsonProperty("costomerName") - private String costomerName; - /** 已回款金额 **/ @JsonProperty("amountCollected") private String amountCollected; @@ -85,18 +82,23 @@ public class SaleorderInfoVO{ @JsonProperty("invoiceAmount") private String invoiceAmount; - /** 来源系统 **/ - @JsonProperty("sourceSystem") - private String sourceSystem; - /** 单据状态 **/ @JsonProperty("status") private String status; + /** ERP订单号 **/ + @JsonProperty("erpNo") + private String erpNo; + /** 制单人 **/ @JsonProperty("creatorUserName") private String creatorUserName; + /** 制单时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + /** 子表数据 **/ @JsonProperty("salesorder_item0List") private List salesorder_item0List; @@ -104,15 +106,22 @@ public class SaleorderInfoVO{ @JsonProperty("receiptoutsoitemList") private List receiptoutsoitemList; /** 子表数据 **/ - @JsonProperty("collectionsoitemList") - private List collectionsoitemList; - /** 子表数据 **/ @JsonProperty("arinvoices_item0soitemList") private List arinvoices_item0soitemList; /** 子表数据 **/ + @JsonProperty("collectionsoitemList") + private List collectionsoitemList; + /** 子表数据 **/ @JsonProperty("salesbacksoitemList") private List salesbacksoitemList; /** 子表数据 **/ @JsonProperty("paymentsoitemList") private List paymentsoitemList; + + /** 合同id**/ + @TableField("contractId") + private String contractId; + /** 客户id**/ + @TableField("customerId") + private String customerId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListQuery.java similarity index 75% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListQuery.java index 9681467c..6a775792 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListQuery.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; import java.util.Date; @@ -10,10 +10,10 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderListQuery extends Pagination { +public class SaleorderitemListQuery extends Pagination { /** 单据编号 */ private String documentNo; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java similarity index 60% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java index 9a18cadd..e0d262a7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java @@ -1,8 +1,9 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.sql.Time; import java.util.Date; @@ -15,10 +16,10 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderListVO{ +public class SaleorderitemListVO{ /** 主键 */ private String id; @@ -28,14 +29,15 @@ public class SaleorderListVO{ @JsonProperty("documentNo") private String documentNo; - /** 合同编码 **/ - @JsonProperty("contractCode") - private String contractCode; - - /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; +// /** 合同名称 **/ +// @JsonProperty("contractCode") +// private String contractCode; +// +// +// /** 客户名称 **/ +// @JsonProperty("costomerCode") +// private String costomerCode; /** 币别 **/ @@ -50,34 +52,25 @@ public class SaleorderListVO{ /** 垫资金额 **/ @JsonProperty("advanceAmount") - private String advanceAmount; - + private Integer advanceAmount; - /** 数量 **/ + /** 重量 **/ @JsonProperty("num") - private String num; - + private Integer num; /** 金额 **/ @JsonProperty("price") - private String price; - + private Integer price; /** 不含税金额 **/ @JsonProperty("notPrice") - private String notPrice; - + private Integer notPrice; /** 备注信息 **/ @JsonProperty("remark") private String remark; - /** 客户名称 **/ - @JsonProperty("costomerName") - private String costomerName; - - /** 已回款金额 **/ @JsonProperty("amountCollected") private String amountCollected; @@ -93,19 +86,32 @@ public class SaleorderListVO{ private String invoiceAmount; - /** 来源系统 **/ - @JsonProperty("sourceSystem") - private String sourceSystem; - - /** 单据状态 **/ @JsonProperty("status") private String status; + /** ERP订单号 **/ + @JsonProperty("erpNo") + private String erpNo; + + /** 制单人 **/ @JsonProperty("creatorUserName") private String creatorUserName; + /** 制单时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + + /** 合同id**/ + @TableField("contractId") + private String contractId; + /** 客户id**/ + @TableField("customerId") + private String customerId; + + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java similarity index 73% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java index 20a5482b..604d4987 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; @@ -11,10 +11,10 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderPagination extends Pagination { +public class SaleorderitemPagination extends Pagination { /** 单据编号 */ private String documentNo; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java similarity index 72% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java index 6c8ae4e3..725f8453 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPaginationExportModel.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; import jnpf.base.Pagination; @@ -9,10 +9,10 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderPaginationExportModel extends Pagination { +public class SaleorderitemPaginationExportModel extends Pagination { private String selectKey; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java similarity index 61% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java index 11e1c67e..c905cd12 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemUpForm.java @@ -1,14 +1,18 @@ -package jnpf.saleorder.model.saleorder; - -import jnpf.saleorder.model.saleorder.Salesorder_item0Model; -import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel; -import jnpf.saleorder.model.saleorder.CollectionsoitemModel; -import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel; -import jnpf.saleorder.model.saleorder.SalesbacksoitemModel; -import jnpf.saleorder.model.saleorder.PaymentsoitemModel; +package jnpf.saleorder.model.saleorderitem; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model; +import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel; +import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel; +import jnpf.saleorder.model.saleorderitem.CollectionsoitemModel; +import jnpf.saleorder.model.saleorderitem.SalesbacksoitemModel; +import jnpf.saleorder.model.saleorderitem.PaymentsoitemModel; import lombok.Data; + +import java.util.Date; import java.util.List; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,10 +25,10 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-03 + * @日期： 2023-02-22 */ @Data -public class SaleorderUpForm{ +public class SaleorderitemUpForm{ /** 主键 */ private String id; @@ -33,14 +37,15 @@ public class SaleorderUpForm{ @JsonProperty("documentNo") private String documentNo; - /** 合同编码 **/ - @JsonProperty("contractCode") - private String contractCode; - - /** 合同名称 **/ - @JsonProperty("contractName") - private String contractName; +// /** 合同名称 **/ +// @JsonProperty("contractCode") +// private String contractCode; +// +// +// /** 客户名称 **/ +// @JsonProperty("costomerCode") +// private String costomerCode; /** 币别 **/ @@ -55,22 +60,22 @@ public class SaleorderUpForm{ /** 垫资金额 **/ @JsonProperty("advanceAmount") - private String advanceAmount; + private Integer advanceAmount; - /** 数量 **/ + /** 重量 **/ @JsonProperty("num") - private String num; + private Integer num; /** 金额 **/ @JsonProperty("price") - private String price; + private Integer price; /** 不含税金额 **/ @JsonProperty("notPrice") - private String notPrice; + private Integer notPrice; /** 备注信息 **/ @@ -78,11 +83,6 @@ public class SaleorderUpForm{ private String remark; - /** 客户名称 **/ - @JsonProperty("costomerName") - private String costomerName; - - /** 已回款金额 **/ @JsonProperty("amountCollected") private String amountCollected; @@ -98,20 +98,25 @@ public class SaleorderUpForm{ private String invoiceAmount; - /** 来源系统 **/ - @JsonProperty("sourceSystem") - private String sourceSystem; - - /** 单据状态 **/ @JsonProperty("status") private String status; + /** ERP订单号 **/ + @JsonProperty("erpNo") + private String erpNo; + + /** 制单人 **/ @JsonProperty("creatorUserName") private String creatorUserName; + + /** 制单时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + /** 子表数据 **/ @JsonProperty("salesorder_item0List") private List salesorder_item0List; @@ -119,16 +124,23 @@ public class SaleorderUpForm{ @JsonProperty("receiptoutsoitemList") private List receiptoutsoitemList; /** 子表数据 **/ - @JsonProperty("collectionsoitemList") - private List collectionsoitemList; - /** 子表数据 **/ @JsonProperty("arinvoices_item0soitemList") private List arinvoices_item0soitemList; /** 子表数据 **/ + @JsonProperty("collectionsoitemList") + private List collectionsoitemList; + /** 子表数据 **/ @JsonProperty("salesbacksoitemList") private List salesbacksoitemList; /** 子表数据 **/ @JsonProperty("paymentsoitemList") private List paymentsoitemList; + /** 合同id**/ + @TableField("contractId") + private String contractId; + /** 客户id**/ + @TableField("customerId") + private String customerId; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java similarity index 81% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java index b701e8a0..04ed9a64 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java @@ -1,4 +1,4 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; import lombok.Data; import java.util.List; @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Data public class SalesbacksoitemModel { @@ -22,6 +22,9 @@ public class SalesbacksoitemModel { @JsonProperty("documentNo") private String documentNo; + /** 退货日期 **/ + @JsonProperty("creatorTime") + private Long creatorTime; /** 退货数量 **/ @JsonProperty("refundNum") private String refundNum; @@ -30,8 +33,9 @@ public class SalesbacksoitemModel { @JsonProperty("refundAmount") private String refundAmount; - /** 退货日期 **/ - @JsonProperty("creatorTime") - private Long creatorTime; + /** 退货人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java similarity index 71% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java index 6cbbe30d..57ff4b61 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java @@ -1,5 +1,6 @@ -package jnpf.saleorder.model.saleorder; +package jnpf.saleorder.model.saleorderitem; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.List; import java.util.Date; @@ -13,18 +14,18 @@ import com.alibaba.fastjson.annotation.JSONField; * 版本： V3.2.0 * 版权: LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Data public class Salesorder_item0Model { - /** 车牌号 **/ - @JsonProperty("licenseNum") - private String licenseNum; + /** 车号 **/ + @JsonProperty("vehicleId") + private String vehicleId; /** 物料名称 **/ - @JsonProperty("materialName") - private String materialName; + @JsonProperty("materialId") + private String materialId; /** 类型 **/ @JsonProperty("poundType") @@ -42,7 +43,7 @@ public class Salesorder_item0Model { @JsonProperty("advance") private String advance; - /** 含税单价 **/ + /** 单价 **/ @JsonProperty("unitPrice") private String unitPrice; @@ -62,15 +63,15 @@ public class Salesorder_item0Model { @JsonProperty("noPrice") private String noPrice; - /** 磅单图片 **/ - @JsonProperty("poundPictures") - private String poundPictures; + /** 备注 **/ + @JsonProperty("remark") + private String remark; + + @TableField(exist = false) + private String poundlistId; + + @JsonProperty("businessId") + private String businessId; - /** 车辆图片 **/ - @JsonProperty("vehiclePictures") - private String vehiclePictures; - /** id **/ - @JsonProperty("vehicleId") - private String vehicleId; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java index d9ee01cc..933e9365 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface Arinvoices_item0soitemService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java index a41cf7b1..af1dadd1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface CollectionsoitemService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java index 7cff3cdd..508e1662 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface PaymentsoitemService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java index 450c5f2d..9d3df460 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface ReceiptoutsoitemService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java index 4bc76677..990fe05c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java @@ -1,14 +1,23 @@ package jnpf.saleorder.service; +import jnpf.receiptout.entity.Receiptout_item0Entity; import jnpf.saleorder.entity.Salesorder_item0Entity; +import jnpf.saleorder.service.Salesorder_item0Service; import jnpf.saleorder.entity.ReceiptoutsoitemEntity; -import jnpf.saleorder.entity.CollectionsoitemEntity; +import jnpf.saleorder.service.ReceiptoutsoitemService; import jnpf.saleorder.entity.Arinvoices_item0soitemEntity; +import jnpf.saleorder.service.Arinvoices_item0soitemService; +import jnpf.saleorder.entity.CollectionsoitemEntity; +import jnpf.saleorder.service.CollectionsoitemService; import jnpf.saleorder.entity.SalesbacksoitemEntity; +import jnpf.saleorder.service.SalesbacksoitemService; import jnpf.saleorder.entity.PaymentsoitemEntity; +import jnpf.saleorder.service.PaymentsoitemService; import jnpf.saleorder.entity.SaleorderitemEntity; import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.saleorder.model.saleorder.SaleorderPagination; +import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; +import org.bytedeco.opencv.presets.opencv_core; + import java.util.*; /** * @@ -16,13 +25,13 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface SaleorderitemService extends IService { - List getList(SaleorderPagination saleorderPagination); + List getList(SaleorderitemPagination saleorderitemPagination); - List getTypeList(SaleorderPagination saleorderPagination, String dataType); + List getTypeList(SaleorderitemPagination saleorderitemPagination,String dataType); @@ -37,10 +46,13 @@ public interface SaleorderitemService extends IService { // 子表方法 List GetSalesorder_item0List(String id); List GetReceiptoutsoitemList(String id); - List GetCollectionsoitemList(String id); List GetArinvoices_item0soitemList(String id); + List GetCollectionsoitemList(String id); List GetSalesbacksoitemList(String id); List GetPaymentsoitemList(String id); + + List getReceiptout(String id); + //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java index df0f60ab..f20afecd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface SalesbacksoitemService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java index 9b021329..49ed80f4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ public interface Salesorder_item0Service extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java index ee7751a4..38523964 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service public class Arinvoices_item0soitemServiceImpl extends ServiceImpl implements Arinvoices_item0soitemService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java index 91c593cc..e35c5ad5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service public class CollectionsoitemServiceImpl extends ServiceImpl implements CollectionsoitemService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java index 29fec0bf..4306af26 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service public class PaymentsoitemServiceImpl extends ServiceImpl implements PaymentsoitemService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java index 156ff5c8..ddf06e47 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service public class ReceiptoutsoitemServiceImpl extends ServiceImpl implements ReceiptoutsoitemService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java index cb5e0321..2a0404ab 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java @@ -1,25 +1,36 @@ package jnpf.saleorder.service.impl; +import jnpf.receiptout.entity.Receiptout_item0Entity; +import jnpf.receiptout.service.Receiptout_item0Service; import jnpf.saleorder.entity.*; import jnpf.saleorder.mapper.SaleorderitemMapper; import jnpf.saleorder.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.saleorder.model.saleorder.SaleorderPagination; +import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; 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.*; @@ -29,10 +40,10 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service -public class SaleorderitemServiceImpl extends ServiceImpl implements SaleorderitemService { +public class SaleorderitemServiceImpl extends ServiceImpl implements SaleorderitemService{ @Autowired @@ -49,27 +60,29 @@ public class SaleorderitemServiceImpl extends ServiceImpl getList(SaleorderPagination saleorderPagination){ + public List getList(SaleorderitemPagination saleorderitemPagination){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; - int saleorderNum =0; - QueryWrapper saleorderQueryWrapper=new QueryWrapper<>(); + int saleorderitemNum =0; + QueryWrapper saleorderitemQueryWrapper=new QueryWrapper<>(); int salesorder_item0Num =0; QueryWrapper salesorder_item0QueryWrapper=new QueryWrapper<>(); int receiptoutsoitemNum =0; @@ -87,49 +100,49 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { - saleorderQueryWrapper = (QueryWrapper)saleorderObj; - saleorderNum++; + saleorderitemQueryWrapper = (QueryWrapper)saleorderitemObj; + saleorderitemNum++; } - Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); + Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0")); if (ObjectUtil.isEmpty(salesorder_item0Obj)){ return new ArrayList<>(); } else { salesorder_item0QueryWrapper = (QueryWrapper)salesorder_item0Obj; salesorder_item0Num++; } - Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem")); + Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem")); if (ObjectUtil.isEmpty(receiptoutsoitemObj)){ return new ArrayList<>(); } else { receiptoutsoitemQueryWrapper = (QueryWrapper)receiptoutsoitemObj; receiptoutsoitemNum++; } - Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); + Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem")); if (ObjectUtil.isEmpty(collectionsoitemObj)){ return new ArrayList<>(); } else { collectionsoitemQueryWrapper = (QueryWrapper)collectionsoitemObj; collectionsoitemNum++; } - Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem")); + Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem")); if (ObjectUtil.isEmpty(salesbacksoitemObj)){ return new ArrayList<>(); } else { salesbacksoitemQueryWrapper = (QueryWrapper)salesbacksoitemObj; salesbacksoitemNum++; } - Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem")); + Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem")); if (ObjectUtil.isEmpty(paymentsoitemObj)){ return new ArrayList<>(); } else { paymentsoitemQueryWrapper = (QueryWrapper)paymentsoitemObj; paymentsoitemNum++; } - Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem")); + Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem")); if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){ return new ArrayList<>(); } else { @@ -140,16 +153,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { - saleorderQueryWrapper = (QueryWrapper)saleorderObj; - saleorderNum++; + saleorderitemQueryWrapper = (QueryWrapper)saleorderitemObj; + saleorderitemNum++; } - Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); + Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0")); if (ObjectUtil.isEmpty(salesorder_item0Obj)){ return new ArrayList<>(); } else { @@ -158,7 +171,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -167,7 +180,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -176,7 +189,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -185,7 +198,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -194,7 +207,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -205,50 +218,50 @@ public class SaleorderitemServiceImpl extends ServiceImpl0){ - saleorderQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); + saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); } //排序 - if(StringUtil.isEmpty(saleorderPagination.getSidx())){ - saleorderQueryWrapper.lambda().orderByDesc(SaleorderitemEntity::getId); + if(StringUtil.isEmpty(saleorderitemPagination.getSidx())){ + saleorderitemQueryWrapper.lambda().orderByDesc(SaleorderitemEntity::getId); }else{ try { - String sidx = saleorderPagination.getSidx(); + String sidx = saleorderitemPagination.getSidx(); SaleorderitemEntity saleorderitemEntity = new SaleorderitemEntity(); Field declaredField = saleorderitemEntity.getClass().getDeclaredField(sidx); declaredField.setAccessible(true); String value = declaredField.getAnnotation(TableField.class).value(); - saleorderQueryWrapper="asc".equals(saleorderPagination.getSort().toLowerCase())?saleorderQueryWrapper.orderByAsc(value):saleorderQueryWrapper.orderByDesc(value); + saleorderitemQueryWrapper="asc".equals(saleorderitemPagination.getSort().toLowerCase())?saleorderitemQueryWrapper.orderByAsc(value):saleorderitemQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } } if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(saleorderPagination.getCurrentPage(), saleorderPagination.getPageSize()); - IPage userIPage=this.page(page, saleorderQueryWrapper); - return saleorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + Page page=new Page<>(saleorderitemPagination.getCurrentPage(), saleorderitemPagination.getPageSize()); + IPage userIPage=this.page(page, saleorderitemQueryWrapper); + return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ List list = new ArrayList(); - return saleorderPagination.setData(list, list.size()); + return saleorderitemPagination.setData(list, list.size()); } } @Override - public List getTypeList(SaleorderPagination saleorderPagination, String dataType){ + public List getTypeList(SaleorderitemPagination saleorderitemPagination,String dataType){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; - int saleorderNum =0; - QueryWrapper saleorderQueryWrapper=new QueryWrapper<>(); + int saleorderitemNum =0; + QueryWrapper saleorderitemQueryWrapper=new QueryWrapper<>(); int salesorder_item0Num =0; QueryWrapper salesorder_item0QueryWrapper=new QueryWrapper<>(); int receiptoutsoitemNum =0; @@ -266,49 +279,49 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { - saleorderQueryWrapper = (QueryWrapper)saleorderObj; - saleorderNum++; + saleorderitemQueryWrapper = (QueryWrapper)saleorderitemObj; + saleorderitemNum++; } - Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); + Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0")); if (ObjectUtil.isEmpty(salesorder_item0Obj)){ return new ArrayList<>(); } else { salesorder_item0QueryWrapper = (QueryWrapper)salesorder_item0Obj; salesorder_item0Num++; } - Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem")); + Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem")); if (ObjectUtil.isEmpty(receiptoutsoitemObj)){ return new ArrayList<>(); } else { receiptoutsoitemQueryWrapper = (QueryWrapper)receiptoutsoitemObj; receiptoutsoitemNum++; } - Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); + Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem")); if (ObjectUtil.isEmpty(collectionsoitemObj)){ return new ArrayList<>(); } else { collectionsoitemQueryWrapper = (QueryWrapper)collectionsoitemObj; collectionsoitemNum++; } - Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem")); + Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem")); if (ObjectUtil.isEmpty(salesbacksoitemObj)){ return new ArrayList<>(); } else { salesbacksoitemQueryWrapper = (QueryWrapper)salesbacksoitemObj; salesbacksoitemNum++; } - Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem")); + Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem")); if (ObjectUtil.isEmpty(paymentsoitemObj)){ return new ArrayList<>(); } else { paymentsoitemQueryWrapper = (QueryWrapper)paymentsoitemObj; paymentsoitemNum++; } - Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem")); + Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem")); if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){ return new ArrayList<>(); } else { @@ -319,16 +332,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { - saleorderQueryWrapper = (QueryWrapper)saleorderObj; - saleorderNum++; + saleorderitemQueryWrapper = (QueryWrapper)saleorderitemObj; + saleorderitemNum++; } - Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"salesorder_item0")); + Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0")); if (ObjectUtil.isEmpty(salesorder_item0Obj)){ return new ArrayList<>(); } else { @@ -337,7 +350,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -346,7 +359,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -355,7 +368,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -364,7 +377,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -373,7 +386,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -384,45 +397,45 @@ public class SaleorderitemServiceImpl extends ServiceImpl0){ - saleorderQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); + saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); } //排序 - if(StringUtil.isEmpty(saleorderPagination.getSidx())){ - saleorderQueryWrapper.lambda().orderByDesc(SaleorderitemEntity::getId); + if(StringUtil.isEmpty(saleorderitemPagination.getSidx())){ + saleorderitemQueryWrapper.lambda().orderByDesc(SaleorderitemEntity::getId); }else{ try { - String sidx = saleorderPagination.getSidx(); + String sidx = saleorderitemPagination.getSidx(); SaleorderitemEntity saleorderitemEntity = new SaleorderitemEntity(); Field declaredField = saleorderitemEntity.getClass().getDeclaredField(sidx); declaredField.setAccessible(true); String value = declaredField.getAnnotation(TableField.class).value(); - saleorderQueryWrapper="asc".equals(saleorderPagination.getSort().toLowerCase())?saleorderQueryWrapper.orderByAsc(value):saleorderQueryWrapper.orderByDesc(value); + saleorderitemQueryWrapper="asc".equals(saleorderitemPagination.getSort().toLowerCase())?saleorderitemQueryWrapper.orderByAsc(value):saleorderitemQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } } if("0".equals(dataType)){ if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(saleorderPagination.getCurrentPage(), saleorderPagination.getPageSize()); - IPage userIPage=this.page(page, saleorderQueryWrapper); - return saleorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + Page page=new Page<>(saleorderitemPagination.getCurrentPage(), saleorderitemPagination.getPageSize()); + IPage userIPage=this.page(page, saleorderitemQueryWrapper); + return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ List list = new ArrayList(); - return saleorderPagination.setData(list, list.size()); + return saleorderitemPagination.setData(list, list.size()); } }else{ - return this.list(saleorderQueryWrapper); + return this.list(saleorderitemQueryWrapper); } } @@ -459,22 +472,22 @@ public class SaleorderitemServiceImpl extends ServiceImpl GetReceiptoutsoitemList(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, id); + queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSalesId, id); return receiptoutsoitemService.list(queryWrapper); } @Override - public List GetCollectionsoitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, id); - return collectionsoitemService.list(queryWrapper); - } - @Override public List GetArinvoices_item0soitemList(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, id); + queryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getArinvoicesId, id); return arinvoices_item0soitemService.list(queryWrapper); } @Override + public List GetCollectionsoitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CollectionsoitemEntity::getId, id); + return collectionsoitemService.list(queryWrapper); + } + @Override public List GetSalesbacksoitemList(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, id); @@ -487,6 +500,13 @@ public class SaleorderitemServiceImpl extends ServiceImpl getReceiptout(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,id); + return receiptout_item0Service.list(queryWrapper); + } + //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java index a5b8013e..3503d5be 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java @@ -8,6 +8,14 @@ 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; @@ -24,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service public class SalesbacksoitemServiceImpl extends ServiceImpl implements SalesbacksoitemService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java index a8228611..fa0924e4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java @@ -32,7 +32,7 @@ import java.util.*; * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-03 + * 日期： 2023-02-22 */ @Service public class Salesorder_item0ServiceImpl extends ServiceImpl implements Salesorder_item0Service{ diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml new file mode 100644 index 00000000..bb823bd3 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue index 497cfd97..71d4ee80 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue @@ -2,7 +2,7 @@ + width="1000px">