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 new file mode 100644 index 00000000..ef950d58 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -0,0 +1,401 @@ + + +package jnpf.collection.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import jnpf.base.ActionResult; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.base.UserInfo; +import jnpf.base.vo.DownloadVO; +import jnpf.config.ConfigValueUtil; +import jnpf.exception.DataException; +import org.springframework.transaction.annotation.Transactional; +import jnpf.base.entity.ProvinceEntity; +import jnpf.collection.model.collection.*; +import jnpf.collection.model.collection.CollectionPagination; +import jnpf.collection.entity.*; +import jnpf.collection.entity.Collection_item0Entity; +import jnpf.util.*; +import jnpf.base.util.*; +import jnpf.base.vo.ListVO; +import jnpf.util.context.SpringContext; +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import lombok.Cleanup; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import jnpf.collection.entity.CollectionEntity; +import jnpf.collection.service.CollectionService; +import jnpf.collection.entity.Collection_item0Entity; +import jnpf.collection.service.Collection_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; +import java.util.*; + +import jnpf.util.file.UploadUtil; +import jnpf.util.enums.FileTypeEnum; + +/** + * + * collection + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-11 + */ +@Slf4j +@RestController +@Api(tags = "collection" , value = "collection") +@RequestMapping("/api/collection/Collection") +public class CollectionController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private ConfigValueUtil configValueUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private CollectionService collectionService; + + @Autowired + private Collection_item0Service collection_item0Service; + + + + /** + * 列表 + * + * @param collectionPagination + * @return + */ + @PostMapping("/getList") + public ActionResult list(@RequestBody CollectionPagination collectionPagination)throws IOException{ + List list= collectionService.getList(collectionPagination); + //处理id字段转名称，若无需转或者为空可删除 + for(CollectionEntity entity:list){ + } + List listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); + for(CollectionListVO collectionVO:listVO){ + } + + + PageListVO vo=new PageListVO(); + vo.setList(listVO); + PaginationVO page=JsonUtil.getJsonToBean(collectionPagination,PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + + /** + * 创建 + * + * @param collectionCrForm + * @return + */ + @PostMapping + @Transactional + public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException { + String mainId =RandomUtil.uuId(); + UserInfo userInfo=userProvider.get(); + 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.setId(RandomUtil.uuId()); + entitys.setCollectionId(entity.getId()); + + + + + + + collection_item0Service.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(CollectionPaginationExportModel collectionPaginationExportModel) throws IOException { + if (StringUtil.isEmpty(collectionPaginationExportModel.getSelectKey())){ + return ActionResult.fail("请选择导出字段"); + } + CollectionPagination collectionPagination=JsonUtil.getJsonToBean(collectionPaginationExportModel, CollectionPagination.class); + List list= collectionService.getTypeList(collectionPagination,collectionPaginationExportModel.getDataType()); + //处理id字段转名称，若无需转或者为空可删除 + for(CollectionEntity entity:list){ + } + List listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); + for(CollectionListVO collectionVO:listVO){ + } + + //转换为map输出 + List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); + String[]keys=!StringUtil.isEmpty(collectionPaginationExportModel.getSelectKey())?collectionPaginationExportModel.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 "businessDate" : + entitys.add(new ExcelExportEntity("业务日期" ,"businessDate")); + break; + case "customerName" : + entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); + break; + case "amountCollected" : + entitys.add(new ExcelExportEntity("收款金额" ,"amountCollected")); + break; + case "paymentType" : + entitys.add(new ExcelExportEntity("收款类型 " ,"paymentType")); + break; + case "collectionCount" : + entitys.add(new ExcelExportEntity("收款账户" ,"collectionCount")); + break; + case "collectionBank" : + entitys.add(new ExcelExportEntity("收款银行" ,"collectionBank")); + break; + case "settlementType" : + entitys.add(new ExcelExportEntity("结算类型" ,"settlementType")); + 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 "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){ + CollectionEntity entity= collectionService.getInfo(id); + CollectionInfoVO vo=JsonUtil.getJsonToBean(entity, CollectionInfoVO.class); + + //子表 + List Collection_item0List = collectionService.GetCollection_item0List(id); + for(Collection_item0Entity collection_item0Entity : Collection_item0List){ + } + vo.setCollection_item0List(JsonUtil.getJsonToList(Collection_item0List,Collection_item0Model.class )); + //副表 + return ActionResult.success(vo); + } + + /** + * 表单信息(详情页) + * + * @param id + * @return + */ + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + CollectionEntity entity= collectionService.getInfo(id); + CollectionInfoVO vo=JsonUtil.getJsonToBean(entity, CollectionInfoVO.class); + + //子表数据转换 + 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){ + } + vo.setCollection_item0List(jg_collection_item0ModelList); + + //附表数据转换 + +//添加到详情表单对象中 + + return ActionResult.success(vo); + } + + + + + /** + * 更新 + * + * @param id + * @return + */ + @PutMapping("/{id}") + @Transactional + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CollectionUpForm collectionUpForm) throws DataException { + UserInfo userInfo=userProvider.get(); + CollectionEntity entity= collectionService.getInfo(id); + if(entity!=null){ + CollectionEntity subentity=JsonUtil.getJsonToBean(collectionUpForm, CollectionEntity.class); + collectionService.update(id, subentity); + + QueryWrapper Collection_item0queryWrapper = new QueryWrapper<>(); + Collection_item0queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, entity.getId()); + collection_item0Service.remove(Collection_item0queryWrapper); + + List Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class); + for(Collection_item0Entity entitys : Collection_item0List){ + + + + + + + entitys.setId(RandomUtil.uuId()); + entitys.setCollectionId(entity.getId()); + collection_item0Service.save(entitys); + } + + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } + } + + + + /** + * 删除 + * + * @param id + * @return + */ + @DeleteMapping("/{id}") + @Transactional + public ActionResult delete(@PathVariable("id") String id){ + CollectionEntity entity= collectionService.getInfo(id); + if(entity!=null){ + collectionService.delete(entity); + QueryWrapper queryWrapperCollection_item0=new QueryWrapper<>(); + queryWrapperCollection_item0.lambda().eq(Collection_item0Entity::getCollectionId,entity.getId()); + collection_item0Service.remove(queryWrapperCollection_item0); + + } + return ActionResult.success("删除成功"); + } + + + + + + + + + + + +} 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 new file mode 100644 index 00000000..78af104c --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java @@ -0,0 +1,107 @@ +package jnpf.collection.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 com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * 收款单 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-11 + */ +@Data +@TableName("jg_collection") +public class CollectionEntity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("DOCUMENT_NO") + private String documentNo; + + @TableField("SALES_ORDER_NO") + private String salesOrderNo; + + @TableField("CONTRACT_NAME") + private String contractName; + + @TableField("AMOUNT_COLLECTED") + private BigDecimal amountCollected; + + @TableField("BUSINESS_DATE") + private Date businessDate; + + @TableField("STATUS") + private String status; + + @TableField("CUSTOMER_CODE") + private String customerCode; + + @TableField("CUSTOMER_NAME") + private String customerName; + + @TableField("CURRENCY") + private String currency; + + @TableField("PAYMENT_TYPE") + private String paymentType; + + @TableField("SETTLEMENT_TYPE") + private String settlementType; + + @TableField("REMARK") + private String remark; + + @TableField("COLLECTION_COUNT") + private String collectionCount; + + @TableField("COLLECTION_BANK") + private String collectionBank; + +} 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 new file mode 100644 index 00000000..d9af4e3f --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java @@ -0,0 +1,102 @@ +package jnpf.collection.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 com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * 收款单明细 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-11 + */ +@Data +@TableName("jg_collection_item0") +public class Collection_item0Entity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("COLLECTION_ID") + private String collectionId; + + @TableField("ORDER_ID") + private Integer orderId; + + @TableField("CAR_NUMBER") + private String carNumber; + + @TableField("MATERIAL_NAME") + private String materialName; + + @TableField("QUANTITY") + private BigDecimal quantity; + + @TableField("SALE_PRICE") + private BigDecimal salePrice; + + @TableField("TAX_RATE") + private String taxRate; + + @TableField("AMOUNT") + private BigDecimal amount; + + @TableField("AMOUNT_NOT_TAX") + private BigDecimal amountNotTax; + + @TableField("TAX_AMOUNT") + private BigDecimal taxAmount; + + @TableField("REMARK") + private String remark; + +} 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 new file mode 100644 index 00000000..1f05e8c1 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java @@ -0,0 +1,17 @@ +package jnpf.collection.mapper; + + +import jnpf.collection.entity.CollectionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * collection + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-11 + */ +public interface CollectionMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..c9101ec8 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/Collection_item0Mapper.java @@ -0,0 +1,17 @@ +package jnpf.collection.mapper; + + +import jnpf.collection.entity.Collection_item0Entity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * + * jg_collection_item0 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-11 + */ +public interface Collection_item0Mapper 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 new file mode 100644 index 00000000..7d2652de --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java @@ -0,0 +1,76 @@ + + +package jnpf.collection.model.collection; + +import jnpf.collection.model.collection.Collection_item0Model; +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-11 + */ +@Data +public class CollectionCrForm { + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 业务日期 **/ + @JsonProperty("businessDate") + private Long businessDate; + + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; + + /** 收款金额 **/ + @JsonProperty("amountCollected") + private String amountCollected; + + /** 收款类型 **/ + @JsonProperty("paymentType") + private String paymentType; + + /** 收款账户 **/ + @JsonProperty("collectionCount") + private String collectionCount; + + /** 收款银行 **/ + @JsonProperty("collectionBank") + private String collectionBank; + + /** 结算类型 **/ + @JsonProperty("settlementType") + private String settlementType; + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + /** 备注信息 **/ + @JsonProperty("remark") + private String remark; + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 制单人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 子表数据 **/ + @JsonProperty("collection_item0List") + private List collection_item0List; + + +} \ No newline at end of file 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 new file mode 100644 index 00000000..179f5242 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java @@ -0,0 +1,78 @@ + + + +package jnpf.collection.model.collection; + +import jnpf.collection.model.collection.Collection_item0Model; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-11 + */ +@Data +public class CollectionInfoVO{ + /** 主键 **/ + @JsonProperty("id") + private String id; + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 业务日期 **/ + @JsonProperty("businessDate") + private Long businessDate; + + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; + + /** 收款金额 **/ + @JsonProperty("amountCollected") + private String amountCollected; + + /** 收款类型 **/ + @JsonProperty("paymentType") + private String paymentType; + + /** 收款账户 **/ + @JsonProperty("collectionCount") + private String collectionCount; + + /** 收款银行 **/ + @JsonProperty("collectionBank") + private String collectionBank; + + /** 结算类型 **/ + @JsonProperty("settlementType") + private String settlementType; + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + /** 备注信息 **/ + @JsonProperty("remark") + private String remark; + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 制单人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 子表数据 **/ + @JsonProperty("collection_item0List") + private List collection_item0List; +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java similarity index 63% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java rename to SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java index 684a3de2..7ed3b299 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java @@ -1,4 +1,4 @@ -package jnpf.purchaseorder.model.purchaseorder; +package jnpf.collection.model.collection; import lombok.Data; import java.util.Date; @@ -10,13 +10,13 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-01-11 */ @Data -public class PurchaseorderListQuery extends Pagination { +public class CollectionListQuery extends Pagination { /** 单据编号 */ - private String documentno; + private String documentNo; /** * 菜单id */ 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 new file mode 100644 index 00000000..d973cfe4 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java @@ -0,0 +1,88 @@ + + +package jnpf.collection.model.collection; + + +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-11 + */ +@Data +public class CollectionListVO{ + + /** 主键 */ + private String id; + + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + + /** 业务日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("businessDate") + private Date businessDate; + + + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; + + + /** 收款金额 **/ + @JsonProperty("amountCollected") + private String amountCollected; + + + /** 收款类型 **/ + @JsonProperty("paymentType") + private String paymentType; + + + /** 收款账户 **/ + @JsonProperty("collectionCount") + private String collectionCount; + + + /** 收款银行 **/ + @JsonProperty("collectionBank") + private String collectionBank; + + + /** 结算类型 **/ + @JsonProperty("settlementType") + private String settlementType; + + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + + /** 备注信息 **/ + @JsonProperty("remark") + private String remark; + + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + + /** 制单人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java similarity index 61% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java rename to SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java index 52eb5a7c..66e7b1d0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java @@ -1,4 +1,4 @@ -package jnpf.purchaseorder.model.purchaseorder; +package jnpf.collection.model.collection; import lombok.Data; @@ -11,13 +11,13 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-01-11 */ @Data -public class PurchaseorderPagination extends Pagination { +public class CollectionPagination extends Pagination { /** 单据编号 */ - private String documentno; + private String documentNo; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java similarity index 62% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java index 28dee8c6..c9bcc162 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java @@ -1,4 +1,4 @@ -package jnpf.purchaseorder.model.purchaseorder; +package jnpf.collection.model.collection; import lombok.Data; import jnpf.base.Pagination; @@ -9,10 +9,10 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-01-11 */ @Data -public class PurchaseorderPaginationExportModel extends Pagination { +public class CollectionPaginationExportModel extends Pagination { private String selectKey; @@ -22,5 +22,5 @@ public class PurchaseorderPaginationExportModel extends Pagination { /** 单据编号 */ - private String documentno; + private String documentNo; } \ No newline at end of file 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 new file mode 100644 index 00000000..b36a8b69 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java @@ -0,0 +1,90 @@ + + +package jnpf.collection.model.collection; + +import jnpf.collection.model.collection.Collection_item0Model; +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Data; + +/** + * + * + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-01-11 + */ +@Data +public class CollectionUpForm{ + /** 主键 */ + private String id; + + + /** 单据编号 **/ + @JsonProperty("documentNo") + private String documentNo; + + + /** 业务日期 **/ + @JsonProperty("businessDate") + private Long businessDate; + + + /** 客户名称 **/ + @JsonProperty("customerName") + private String customerName; + + + /** 收款金额 **/ + @JsonProperty("amountCollected") + private String amountCollected; + + + /** 收款类型 **/ + @JsonProperty("paymentType") + private String paymentType; + + + /** 收款账户 **/ + @JsonProperty("collectionCount") + private String collectionCount; + + + /** 收款银行 **/ + @JsonProperty("collectionBank") + private String collectionBank; + + + /** 结算类型 **/ + @JsonProperty("settlementType") + private String settlementType; + + + /** 币别 **/ + @JsonProperty("currency") + private String currency; + + + /** 备注信息 **/ + @JsonProperty("remark") + private String remark; + + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + + /** 制单人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 子表数据 **/ + @JsonProperty("collection_item0List") + private List collection_item0List; + +} \ No newline at end of file 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 new file mode 100644 index 00000000..41142344 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java @@ -0,0 +1,46 @@ +package jnpf.collection.model.collection; + +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-11 + */ +@Data +public class Collection_item0Model { + + /** 金额 **/ + @JsonProperty("amount") + private String amount; + + /** 数量 **/ + @JsonProperty("quantity") + private String quantity; + + /** 税率 **/ + @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/collection/service/CollectionService.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java new file mode 100644 index 00000000..15c4d688 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java @@ -0,0 +1,37 @@ +package jnpf.collection.service; +import jnpf.collection.entity.Collection_item0Entity; +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 java.util.*; +/** + * + * collection + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-11 + */ +public interface CollectionService extends IService { + + List getList(CollectionPagination collectionPagination); + + List getTypeList(CollectionPagination collectionPagination,String dataType); + + + + CollectionEntity getInfo(String id); + + void delete(CollectionEntity entity); + + void create(CollectionEntity entity); + + boolean update( String id, CollectionEntity entity); + +// 子表方法 + List GetCollection_item0List(String id); + + //列表子表数据方法 +} 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 new file mode 100644 index 00000000..d9434395 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/Collection_item0Service.java @@ -0,0 +1,15 @@ +package jnpf.collection.service; + +import jnpf.collection.entity.Collection_item0Entity; +import com.baomidou.mybatisplus.extension.service.IService; +/** + * + * jg_collection_item0 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-11 + */ +public interface Collection_item0Service 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 new file mode 100644 index 00000000..4af6afa5 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java @@ -0,0 +1,267 @@ +package jnpf.collection.service.impl; + +import jnpf.collection.entity.*; +import jnpf.collection.mapper.CollectionMapper; +import jnpf.collection.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.collection.model.collection.CollectionPagination; + +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.*; + +/** + * + * collection + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-01-11 + */ +@Service +public class CollectionServiceImpl extends ServiceImpl implements CollectionService{ + + + @Autowired + private UserProvider userProvider; + + @Autowired + private AuthorizeService authorizeService; + + + @Autowired + private Collection_item0Service collection_item0Service; + + + + + @Override + public List getList(CollectionPagination collectionPagination){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int collectionNum =0; + QueryWrapper collectionQueryWrapper=new QueryWrapper<>(); + int collection_item0Num =0; + QueryWrapper collection_item0QueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); + if (ObjectUtil.isEmpty(collectionObj)){ + return new ArrayList<>(); + } else { + collectionQueryWrapper = (QueryWrapper)collectionObj; + collectionNum++; + } + Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); + if (ObjectUtil.isEmpty(collection_item0Obj)){ + return new ArrayList<>(); + } else { + collection_item0QueryWrapper = (QueryWrapper)collection_item0Obj; + collection_item0Num++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); + if (ObjectUtil.isEmpty(collectionObj)){ + return new ArrayList<>(); + } else { + collectionQueryWrapper = (QueryWrapper)collectionObj; + collectionNum++; + } + + + Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); + if (ObjectUtil.isEmpty(collection_item0Obj)){ + return new ArrayList<>(); + } else { + collection_item0QueryWrapper = (QueryWrapper)collection_item0Obj; + collection_item0Num++; + } + + + } + } + if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){ + collectionNum++; + collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo()); + } + + if(AllIdList.size()>0){ + collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(collectionPagination.getSidx())){ + collectionQueryWrapper.lambda().orderByDesc(CollectionEntity::getId); + }else{ + try { + String sidx = collectionPagination.getSidx(); + CollectionEntity collectionEntity = new CollectionEntity(); + Field declaredField = collectionEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + collectionQueryWrapper="asc".equals(collectionPagination.getSort().toLowerCase())?collectionQueryWrapper.orderByAsc(value):collectionQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(collectionPagination.getCurrentPage(), collectionPagination.getPageSize()); + IPage userIPage=this.page(page, collectionQueryWrapper); + return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return collectionPagination.setData(list, list.size()); + } + } + @Override + public List getTypeList(CollectionPagination collectionPagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int collectionNum =0; + QueryWrapper collectionQueryWrapper=new QueryWrapper<>(); + int collection_item0Num =0; + QueryWrapper collection_item0QueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); + if (ObjectUtil.isEmpty(collectionObj)){ + return new ArrayList<>(); + } else { + collectionQueryWrapper = (QueryWrapper)collectionObj; + collectionNum++; + } + Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); + if (ObjectUtil.isEmpty(collection_item0Obj)){ + return new ArrayList<>(); + } else { + collection_item0QueryWrapper = (QueryWrapper)collection_item0Obj; + collection_item0Num++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection")); + if (ObjectUtil.isEmpty(collectionObj)){ + return new ArrayList<>(); + } else { + collectionQueryWrapper = (QueryWrapper)collectionObj; + collectionNum++; + } + + + Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0")); + if (ObjectUtil.isEmpty(collection_item0Obj)){ + return new ArrayList<>(); + } else { + collection_item0QueryWrapper = (QueryWrapper)collection_item0Obj; + collection_item0Num++; + } + + + } + } + if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){ + collectionNum++; + collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo()); + } + + if(AllIdList.size()>0){ + collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(collectionPagination.getSidx())){ + collectionQueryWrapper.lambda().orderByDesc(CollectionEntity::getId); + }else{ + try { + String sidx = collectionPagination.getSidx(); + CollectionEntity collectionEntity = new CollectionEntity(); + Field declaredField = collectionEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + collectionQueryWrapper="asc".equals(collectionPagination.getSort().toLowerCase())?collectionQueryWrapper.orderByAsc(value):collectionQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(collectionPagination.getCurrentPage(), collectionPagination.getPageSize()); + IPage userIPage=this.page(page, collectionQueryWrapper); + return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return collectionPagination.setData(list, list.size()); + } + }else{ + return this.list(collectionQueryWrapper); + } + } + + @Override + public CollectionEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(CollectionEntity::getId,id); + return this.getOne(queryWrapper); + } + + @Override + public void create(CollectionEntity entity){ + this.save(entity); + } + + @Override + public boolean update(String id, CollectionEntity entity){ + entity.setId(id); + return this.updateById(entity); + } + @Override + public void delete(CollectionEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + //子表方法 + @Override + public List GetCollection_item0List(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id); + return collection_item0Service.list(queryWrapper); + } + + //列表子表数据方法 + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java similarity index 67% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java rename to SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java index 575d17b3..f742787a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java @@ -1,8 +1,8 @@ -package jnpf.purchaseorder.service.impl; +package jnpf.collection.service.impl; -import jnpf.purchaseorder.entity.*; -import jnpf.purchaseorder.mapper.Purchaseorder_item0Mapper; -import jnpf.purchaseorder.service.*; +import jnpf.collection.entity.*; +import jnpf.collection.mapper.Collection_item0Mapper; +import jnpf.collection.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.util.RandomUtil; import java.math.BigDecimal; @@ -28,14 +28,14 @@ import java.util.*; /** * - * jg_purchaseorder_item0 + * jg_collection_item0 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 + * 日期： 2023-01-11 */ @Service -public class Purchaseorder_item0ServiceImpl extends ServiceImpl implements Purchaseorder_item0Service{ +public class Collection_item0ServiceImpl extends ServiceImpl implements Collection_item0Service{ } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java deleted file mode 100644 index c88a1857..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ /dev/null @@ -1,429 +0,0 @@ - - -package jnpf.purchaseorder.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import jnpf.base.ActionResult; -import jnpf.base.vo.PageListVO; -import jnpf.base.vo.PaginationVO; -import jnpf.base.UserInfo; -import jnpf.base.vo.DownloadVO; -import jnpf.config.ConfigValueUtil; -import jnpf.exception.DataException; -import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; -import jnpf.purchaseorder.model.purchaseorder.*; -import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; -import jnpf.purchaseorder.entity.*; -import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import jnpf.util.*; -import jnpf.base.util.*; -import jnpf.base.vo.ListVO; -import jnpf.util.context.SpringContext; -import cn.hutool.core.util.ObjectUtil; -import lombok.extern.slf4j.Slf4j; -import lombok.Cleanup; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import jnpf.purchaseorder.entity.PurchaseorderEntity; -import jnpf.purchaseorder.service.PurchaseorderService; -import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import jnpf.purchaseorder.service.Purchaseorder_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; -import java.util.*; - -import jnpf.util.file.UploadUtil; -import jnpf.util.enums.FileTypeEnum; - -/** - * - * purchaseorder - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Slf4j -@RestController -@Api(tags = "purchaseorder" , value = "purchaseorder") -@RequestMapping("/api/purchaseorder/Purchaseorder") -public class PurchaseorderController { - - @Autowired - private GeneraterSwapUtil generaterSwapUtil; - - @Autowired - private ConfigValueUtil configValueUtil; - - @Autowired - private UserProvider userProvider; - - @Autowired - private PurchaseorderService purchaseorderService; - - @Autowired - private Purchaseorder_item0Service purchaseorder_item0Service; - - - - /** - * 列表 - * - * @param purchaseorderPagination - * @return - */ - @PostMapping("/getList") - public ActionResult list(@RequestBody PurchaseorderPagination purchaseorderPagination)throws IOException{ - List list= purchaseorderService.getList(purchaseorderPagination); - //处理id字段转名称，若无需转或者为空可删除 - for(PurchaseorderEntity entity:list){ - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); - } - List listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class); - for(PurchaseorderListVO purchaseorderVO:listVO){ - } - - - PageListVO vo=new PageListVO(); - vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(purchaseorderPagination,PaginationVO.class); - vo.setPagination(page); - return ActionResult.success(vo); - } - - - /** - * 创建 - * - * @param purchaseorderCrForm - * @return - */ - @PostMapping - @Transactional - public ActionResult create(@RequestBody @Valid PurchaseorderCrForm purchaseorderCrForm) throws DataException { - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); - PurchaseorderEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderEntity.class); - entity.setId(mainId); - purchaseorderService.save(entity); - List Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(),Purchaseorder_item0Entity.class); - for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){ - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseorderId(entity.getId()); - - - - - - - - - - - - - purchaseorder_item0Service.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(PurchaseorderPaginationExportModel purchaseorderPaginationExportModel) throws IOException { - if (StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey())){ - return ActionResult.fail("请选择导出字段"); - } - PurchaseorderPagination purchaseorderPagination=JsonUtil.getJsonToBean(purchaseorderPaginationExportModel, PurchaseorderPagination.class); - List list= purchaseorderService.getTypeList(purchaseorderPagination,purchaseorderPaginationExportModel.getDataType()); - //处理id字段转名称，若无需转或者为空可删除 - for(PurchaseorderEntity entity:list){ - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); - } - List listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class); - for(PurchaseorderListVO purchaseorderVO:listVO){ - } - - //转换为map输出 - List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); - String[]keys=!StringUtil.isEmpty(purchaseorderPaginationExportModel.getSelectKey())?purchaseorderPaginationExportModel.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 "suppliername" : - entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername")); - break; - case "contractname" : - entitys.add(new ExcelExportEntity("合同名称" ,"contractname")); - break; - case "creatorusername" : - entitys.add(new ExcelExportEntity("制单人" ,"creatorusername")); - break; - case "departmentId" : - entitys.add(new ExcelExportEntity("采购部门" ,"departmentId")); - break; - case "contractno" : - entitys.add(new ExcelExportEntity("对方合同号" ,"contractno")); - break; - case "num" : - entitys.add(new ExcelExportEntity("数量" ,"num")); - break; - case "amount" : - entitys.add(new ExcelExportEntity("金额" ,"amount")); - break; - case "notamount" : - entitys.add(new ExcelExportEntity("不含税金额" ,"notamount")); - break; - case "currency" : - entitys.add(new ExcelExportEntity("币别 " ,"currency")); - break; - case "remark" : - entitys.add(new ExcelExportEntity("备注" ,"remark")); - break; - case "erpno" : - entitys.add(new ExcelExportEntity("ERP订单号" ,"erpno")); - break; - case "payprice" : - entitys.add(new ExcelExportEntity("已付款金额" ,"payprice")); - break; - case "invoicenum" : - entitys.add(new ExcelExportEntity("发票数量" ,"invoicenum")); - break; - case "invoiceamount" : - entitys.add(new ExcelExportEntity("发票金额" ,"invoiceamount")); - break; - case "advanceamount" : - entitys.add(new ExcelExportEntity("垫资金额" ,"advanceamount")); - break; - case "status" : - entitys.add(new ExcelExportEntity("单据状态" ,"status")); - 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){ - PurchaseorderEntity entity= purchaseorderService.getInfo(id); - PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class); - - //子表 - List Purchaseorder_item0List = purchaseorderService.GetPurchaseorder_item0List(id); - for(Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List){ - } - vo.setPurchaseorder_item0List(JsonUtil.getJsonToList(Purchaseorder_item0List,Purchaseorder_item0Model.class )); - //副表 - return ActionResult.success(vo); - } - - /** - * 表单信息(详情页) - * - * @param id - * @return - */ - @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - PurchaseorderEntity entity= purchaseorderService.getInfo(id); - PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class); - - //子表数据转换 - List jg_purchaseorder_item0List = purchaseorderService.GetPurchaseorder_item0List(id); - List jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class); - for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){ - } - vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList); - - //附表数据转换 - -//添加到详情表单对象中 - vo.setDepartmentId(generaterSwapUtil.comSelectValues(vo.getDepartmentId())); - - return ActionResult.success(vo); - } - - - - - /** - * 更新 - * - * @param id - * @return - */ - @PutMapping("/{id}") - @Transactional - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) throws DataException { - UserInfo userInfo=userProvider.get(); - PurchaseorderEntity entity= purchaseorderService.getInfo(id); - if(entity!=null){ - PurchaseorderEntity subentity=JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderEntity.class); - purchaseorderService.update(id, subentity); - - QueryWrapper Purchaseorder_item0queryWrapper = new QueryWrapper<>(); - Purchaseorder_item0queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); - purchaseorder_item0Service.remove(Purchaseorder_item0queryWrapper); - - List Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchaseorder_item0List(),Purchaseorder_item0Entity.class); - for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){ - - - - - - - - - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseorderId(entity.getId()); - purchaseorder_item0Service.save(entitys); - } - - return ActionResult.success("更新成功"); - }else{ - return ActionResult.fail("更新失败，数据不存在"); - } - } - - - - /** - * 删除 - * - * @param id - * @return - */ - @DeleteMapping("/{id}") - @Transactional - public ActionResult delete(@PathVariable("id") String id){ - PurchaseorderEntity entity= purchaseorderService.getInfo(id); - if(entity!=null){ - purchaseorderService.delete(entity); - QueryWrapper queryWrapperPurchaseorder_item0=new QueryWrapper<>(); - queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId()); - purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0); - - } - return ActionResult.success("删除成功"); - } - - - - - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderEntity.java deleted file mode 100644 index d85da082..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderEntity.java +++ /dev/null @@ -1,149 +0,0 @@ -package jnpf.purchaseorder.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 com.fasterxml.jackson.annotation.JsonProperty; - - -/** - * - * 采购订单 - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -@TableName("jg_purchaseorder") -public class PurchaseorderEntity { - - @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("DOCUMENTNO") - private String documentno; - - @TableField("ERPNO") - private String erpno; - - @TableField("CONTRACTCODE") - private String contractcode; - - @TableField("CONTRACTNAME") - private String contractname; - - @TableField("CONTRACTNO") - private String contractno; - - @TableField("SUPPLIERCODE") - private String suppliercode; - - @TableField("SUPPLIERNAME") - private String suppliername; - - @TableField("NUM") - private BigDecimal num; - - @TableField("AMOUNT") - private BigDecimal amount; - - @TableField("NOTAMOUNT") - private BigDecimal notamount; - - @TableField("RATE") - private BigDecimal rate; - - @TableField("POUNDNUM") - private Integer poundnum; - - @TableField("CURRENCY") - private String currency; - - @TableField("ADVANCEAMOUNT") - private BigDecimal advanceamount; - - @TableField("PAYPRICE") - private BigDecimal payprice; - - @TableField("INVOICENUM") - private BigDecimal invoicenum; - - @TableField("INVOICEAMOUNT") - private BigDecimal invoiceamount; - - @TableField("REFUNDABLENUM") - private BigDecimal refundablenum; - - @TableField("REFUNDABLEAMOUNT") - private BigDecimal refundableamount; - - @TableField("STATUS") - private String status; - - @TableField("SOURCESYSTEM") - private String sourcesystem; - - @TableField("ISSETTLE") - private String issettle; - - @TableField("ISSUE") - private String issue; - - @TableField("ISTRANSFER") - private String istransfer; - - @TableField("REMARK") - private String remark; - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java deleted file mode 100644 index d0c7065b..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java +++ /dev/null @@ -1,129 +0,0 @@ -package jnpf.purchaseorder.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 com.fasterxml.jackson.annotation.JsonProperty; - - -/** - * - * 采购订单明细 - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -@TableName("jg_purchaseorder_item0") -public class Purchaseorder_item0Entity { - - @TableId("ID") - private String id; - - @TableField("CREATOR_USER_ID") - private String creatoruserid; - - @TableField("CREATOR_USER_NAME") - private String creatorusername; - - @TableField("CREATOR_TIME") - private Date creatortime; - - @TableField("LAST_MODIFY_USER_ID") - private String lastmodifyuserid; - - @TableField("LAST_MODIFY_USER_NAME") - private String lastmodifyusername; - - @TableField("LAST_MODIFY_TIME") - private Date lastmodifytime; - - @TableField("DELETE_USER_ID") - private String deleteuserid; - - @TableField("DELETE_USER_NAME") - private String deleteusername; - - @TableField("DELETE_TIME") - private Date deletetime; - - @TableField("DELETE_MARK") - private String deletemark; - - @TableField("ORGNIZE_ID") - private String orgnizeId; - - @TableField("DEPARTMENT_ID") - private String departmentId; - - @TableField("PURCHASEORDER_ID") - private String purchaseorderId; - - @TableField("POUNDLIST_ID") - private String poundlistId; - - @TableField("LICENSENUM") - private String licensenum; - - @TableField("MATERIALCODE") - private String materialcode; - - @TableField("MATERIALNAME") - private String materialname; - - @TableField("SUPPLIERNAME") - private String suppliername; - - @TableField("POUNTDATE") - private Date pountdate; - - @TableField("POUNTUSER") - private String pountuser; - - @TableField("POUNTTYPE") - private String pounttype; - - @TableField("ADVANCE") - private String advance; - - @TableField("NETWEIGHT") - private BigDecimal netweight; - - @TableField("PRICE") - private BigDecimal price; - - @TableField("SETTLEMENT") - private BigDecimal settlement; - - @TableField("RATE") - private String rate; - - @TableField("UNIT") - private String unit; - - @TableField("AMOUNT") - private BigDecimal amount; - - @TableField("NOTAMOUNT") - private BigDecimal notamount; - - @TableField("POUNDPICTURES") - private String poundpictures; - - @TableField("VEHICLEPICTURES") - private String vehiclepictures; - - @TableField("REMARK") - private String remark; - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderMapper.java deleted file mode 100644 index 53c9ca4b..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package jnpf.purchaseorder.mapper; - - -import jnpf.purchaseorder.entity.PurchaseorderEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * - * purchaseorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface PurchaseorderMapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java deleted file mode 100644 index 506c8da8..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package jnpf.purchaseorder.mapper; - - -import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * - * jg_purchaseorder_item0 - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface Purchaseorder_item0Mapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java deleted file mode 100644 index 35c2a040..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java +++ /dev/null @@ -1,100 +0,0 @@ - - -package jnpf.purchaseorder.model.purchaseorder; - -import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; -import lombok.Data; -import java.util.List; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonProperty; - - -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class PurchaseorderCrForm { - - /** 单据编号 **/ - @JsonProperty("documentno") - private String documentno; - - /** 供应商名称 **/ - @JsonProperty("suppliername") - private String suppliername; - - /** 合同名称 **/ - @JsonProperty("contractname") - private String contractname; - - /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - /** 采购部门 **/ - @JsonProperty("departmentId") - private String departmentId; - - /** 对方合同号 **/ - @JsonProperty("contractno") - private String contractno; - - /** 数量 **/ - @JsonProperty("num") - private Integer num; - - /** 金额 **/ - @JsonProperty("amount") - private String amount; - - /** 不含税金额 **/ - @JsonProperty("notamount") - private String notamount; - - /** 币别 **/ - @JsonProperty("currency") - private String currency; - - /** 备注 **/ - @JsonProperty("remark") - private String remark; - - /** ERP订单号 **/ - @JsonProperty("erpno") - private String erpno; - - /** 已付款金额 **/ - @JsonProperty("payprice") - private String payprice; - - /** 发票数量 **/ - @JsonProperty("invoicenum") - private String invoicenum; - - /** 发票金额 **/ - @JsonProperty("invoiceamount") - private String invoiceamount; - - /** 垫资金额 **/ - @JsonProperty("advanceamount") - private String advanceamount; - - /** 单据状态 **/ - @JsonProperty("status") - private String status; - - /** 制单时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 子表数据 **/ - @JsonProperty("purchaseorder_item0List") - private List purchaseorder_item0List; - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java deleted file mode 100644 index 3d0dbcb7..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ /dev/null @@ -1,102 +0,0 @@ - - - -package jnpf.purchaseorder.model.purchaseorder; - -import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class PurchaseorderInfoVO{ - /** 主键 **/ - @JsonProperty("id") - private String id; - - /** 单据编号 **/ - @JsonProperty("documentno") - private String documentno; - - /** 供应商名称 **/ - @JsonProperty("suppliername") - private String suppliername; - - /** 合同名称 **/ - @JsonProperty("contractname") - private String contractname; - - /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - /** 采购部门 **/ - @JsonProperty("departmentId") - private String departmentId; - - /** 对方合同号 **/ - @JsonProperty("contractno") - private String contractno; - - /** 数量 **/ - @JsonProperty("num") - private Integer num; - - /** 金额 **/ - @JsonProperty("amount") - private String amount; - - /** 不含税金额 **/ - @JsonProperty("notamount") - private String notamount; - - /** 币别 **/ - @JsonProperty("currency") - private String currency; - - /** 备注 **/ - @JsonProperty("remark") - private String remark; - - /** ERP订单号 **/ - @JsonProperty("erpno") - private String erpno; - - /** 已付款金额 **/ - @JsonProperty("payprice") - private String payprice; - - /** 发票数量 **/ - @JsonProperty("invoicenum") - private String invoicenum; - - /** 发票金额 **/ - @JsonProperty("invoiceamount") - private String invoiceamount; - - /** 垫资金额 **/ - @JsonProperty("advanceamount") - private String advanceamount; - - /** 单据状态 **/ - @JsonProperty("status") - private String status; - - /** 制单时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 子表数据 **/ - @JsonProperty("purchaseorder_item0List") - private List purchaseorder_item0List; -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java deleted file mode 100644 index 0be933b6..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java +++ /dev/null @@ -1,117 +0,0 @@ - - -package jnpf.purchaseorder.model.purchaseorder; - - -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-05 - */ -@Data -public class PurchaseorderListVO{ - - /** 主键 */ - private String id; - - - /** 单据编号 **/ - @JsonProperty("documentno") - private String documentno; - - - /** 供应商名称 **/ - @JsonProperty("suppliername") - private String suppliername; - - - /** 合同名称 **/ - @JsonProperty("contractname") - private String contractname; - - - /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - - /** 采购部门 **/ - @JsonProperty("departmentId") - private String departmentId; - - - /** 对方合同号 **/ - @JsonProperty("contractno") - private String contractno; - - - /** 数量 **/ - @JsonProperty("num") - private Integer num; - - /** 金额 **/ - @JsonProperty("amount") - private String amount; - - - /** 不含税金额 **/ - @JsonProperty("notamount") - private String notamount; - - - /** 币别 **/ - @JsonProperty("currency") - private String currency; - - - /** 备注 **/ - @JsonProperty("remark") - private String remark; - - - /** ERP订单号 **/ - @JsonProperty("erpno") - private String erpno; - - - /** 已付款金额 **/ - @JsonProperty("payprice") - private String payprice; - - - /** 发票数量 **/ - @JsonProperty("invoicenum") - private String invoicenum; - - - /** 发票金额 **/ - @JsonProperty("invoiceamount") - private String invoiceamount; - - - /** 垫资金额 **/ - @JsonProperty("advanceamount") - private String advanceamount; - - - /** 单据状态 **/ - @JsonProperty("status") - private String status; - - - /** 制单时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("creatortime") - private Date creatortime; - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java deleted file mode 100644 index da6fccef..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java +++ /dev/null @@ -1,120 +0,0 @@ - - -package jnpf.purchaseorder.model.purchaseorder; - -import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; -import lombok.Data; -import java.util.List; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonProperty; - -import lombok.Data; - -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class PurchaseorderUpForm{ - /** 主键 */ - private String id; - - - /** 单据编号 **/ - @JsonProperty("documentno") - private String documentno; - - - /** 供应商名称 **/ - @JsonProperty("suppliername") - private String suppliername; - - - /** 合同名称 **/ - @JsonProperty("contractname") - private String contractname; - - - /** 制单人 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - - /** 采购部门 **/ - @JsonProperty("departmentId") - private String departmentId; - - - /** 对方合同号 **/ - @JsonProperty("contractno") - private String contractno; - - - /** 数量 **/ - @JsonProperty("num") - private Integer num; - - - /** 金额 **/ - @JsonProperty("amount") - private String amount; - - - /** 不含税金额 **/ - @JsonProperty("notamount") - private String notamount; - - - /** 币别 **/ - @JsonProperty("currency") - private String currency; - - - /** 备注 **/ - @JsonProperty("remark") - private String remark; - - - /** ERP订单号 **/ - @JsonProperty("erpno") - private String erpno; - - - /** 已付款金额 **/ - @JsonProperty("payprice") - private String payprice; - - - /** 发票数量 **/ - @JsonProperty("invoicenum") - private String invoicenum; - - - /** 发票金额 **/ - @JsonProperty("invoiceamount") - private String invoiceamount; - - - /** 垫资金额 **/ - @JsonProperty("advanceamount") - private String advanceamount; - - - /** 单据状态 **/ - @JsonProperty("status") - private String status; - - - /** 制单时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 子表数据 **/ - @JsonProperty("purchaseorder_item0List") - private List purchaseorder_item0List; - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java deleted file mode 100644 index f475b82c..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java +++ /dev/null @@ -1,70 +0,0 @@ -package jnpf.purchaseorder.model.purchaseorder; - -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-05 - */ -@Data -public class Purchaseorder_item0Model { - - /** 车牌号 **/ - @JsonProperty("licensenum") - private String licensenum; - - /** 物料名称 **/ - @JsonProperty("materialname") - private String materialname; - - /** 类型 **/ - @JsonProperty("pounttype") - private String pounttype; - - /** 净重 **/ - @JsonProperty("netweight") - private String netweight; - - /** 单位 **/ - @JsonProperty("unit") - private String unit; - - /** 是否垫资 **/ - @JsonProperty("advance") - private String advance; - - /** 单价 **/ - @JsonProperty("price") - private String price; - - /** 结算重量 **/ - @JsonProperty("settlement") - private String settlement; - - /** 税率 **/ - @JsonProperty("rate") - private String rate; - - /** 金额 **/ - @JsonProperty("amount") - private String amount; - - /** 不含税金额 **/ - @JsonProperty("notamount") - private String notamount; - - /** 备注 **/ - @JsonProperty("remark") - private String remark; - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderService.java deleted file mode 100644 index 18355448..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderService.java +++ /dev/null @@ -1,37 +0,0 @@ -package jnpf.purchaseorder.service; -import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import jnpf.purchaseorder.service.Purchaseorder_item0Service; - -import jnpf.purchaseorder.entity.PurchaseorderEntity; -import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; -import java.util.*; -/** - * - * purchaseorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface PurchaseorderService extends IService { - - List getList(PurchaseorderPagination purchaseorderPagination); - - List getTypeList(PurchaseorderPagination purchaseorderPagination,String dataType); - - - - PurchaseorderEntity getInfo(String id); - - void delete(PurchaseorderEntity entity); - - void create(PurchaseorderEntity entity); - - boolean update( String id, PurchaseorderEntity entity); - -// 子表方法 - List GetPurchaseorder_item0List(String id); - - //列表子表数据方法 -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java deleted file mode 100644 index 37a17bcc..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java +++ /dev/null @@ -1,15 +0,0 @@ -package jnpf.purchaseorder.service; - -import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import com.baomidou.mybatisplus.extension.service.IService; -/** - * - * jg_purchaseorder_item0 - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface Purchaseorder_item0Service extends IService { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderServiceImpl.java deleted file mode 100644 index ffe65e41..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderServiceImpl.java +++ /dev/null @@ -1,267 +0,0 @@ -package jnpf.purchaseorder.service.impl; - -import jnpf.purchaseorder.entity.*; -import jnpf.purchaseorder.mapper.PurchaseorderMapper; -import jnpf.purchaseorder.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.purchaseorder.model.purchaseorder.PurchaseorderPagination; - -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.*; - -/** - * - * purchaseorder - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -@Service -public class PurchaseorderServiceImpl extends ServiceImpl implements PurchaseorderService{ - - - @Autowired - private UserProvider userProvider; - - @Autowired - private AuthorizeService authorizeService; - - - @Autowired - private Purchaseorder_item0Service purchaseorder_item0Service; - - - - - @Override - public List getList(PurchaseorderPagination purchaseorderPagination){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int purchaseorderNum =0; - QueryWrapper purchaseorderQueryWrapper=new QueryWrapper<>(); - int purchaseorder_item0Num =0; - QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); - if (ObjectUtil.isEmpty(purchaseorderObj)){ - return new ArrayList<>(); - } else { - purchaseorderQueryWrapper = (QueryWrapper)purchaseorderObj; - purchaseorderNum++; - } - Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); - if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ - return new ArrayList<>(); - } else { - purchaseorder_item0QueryWrapper = (QueryWrapper)purchaseorder_item0Obj; - purchaseorder_item0Num++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); - if (ObjectUtil.isEmpty(purchaseorderObj)){ - return new ArrayList<>(); - } else { - purchaseorderQueryWrapper = (QueryWrapper)purchaseorderObj; - purchaseorderNum++; - } - - - Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); - if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ - return new ArrayList<>(); - } else { - purchaseorder_item0QueryWrapper = (QueryWrapper)purchaseorder_item0Obj; - purchaseorder_item0Num++; - } - - - } - } - if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentno())){ - purchaseorderNum++; - purchaseorderQueryWrapper.lambda().like(PurchaseorderEntity::getDocumentno,purchaseorderPagination.getDocumentno()); - } - - if(AllIdList.size()>0){ - purchaseorderQueryWrapper.lambda().in(PurchaseorderEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){ - purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderEntity::getId); - }else{ - try { - String sidx = purchaseorderPagination.getSidx(); - PurchaseorderEntity purchaseorderEntity = new PurchaseorderEntity(); - Field declaredField = purchaseorderEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - purchaseorderQueryWrapper="asc".equals(purchaseorderPagination.getSort().toLowerCase())?purchaseorderQueryWrapper.orderByAsc(value):purchaseorderQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); - IPage userIPage=this.page(page, purchaseorderQueryWrapper); - return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return purchaseorderPagination.setData(list, list.size()); - } - } - @Override - public List getTypeList(PurchaseorderPagination purchaseorderPagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int purchaseorderNum =0; - QueryWrapper purchaseorderQueryWrapper=new QueryWrapper<>(); - int purchaseorder_item0Num =0; - QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); - if (ObjectUtil.isEmpty(purchaseorderObj)){ - return new ArrayList<>(); - } else { - purchaseorderQueryWrapper = (QueryWrapper)purchaseorderObj; - purchaseorderNum++; - } - Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); - if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ - return new ArrayList<>(); - } else { - purchaseorder_item0QueryWrapper = (QueryWrapper)purchaseorder_item0Obj; - purchaseorder_item0Num++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder")); - if (ObjectUtil.isEmpty(purchaseorderObj)){ - return new ArrayList<>(); - } else { - purchaseorderQueryWrapper = (QueryWrapper)purchaseorderObj; - purchaseorderNum++; - } - - - Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0")); - if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){ - return new ArrayList<>(); - } else { - purchaseorder_item0QueryWrapper = (QueryWrapper)purchaseorder_item0Obj; - purchaseorder_item0Num++; - } - - - } - } - if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentno())){ - purchaseorderNum++; - purchaseorderQueryWrapper.lambda().like(PurchaseorderEntity::getDocumentno,purchaseorderPagination.getDocumentno()); - } - - if(AllIdList.size()>0){ - purchaseorderQueryWrapper.lambda().in(PurchaseorderEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){ - purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderEntity::getId); - }else{ - try { - String sidx = purchaseorderPagination.getSidx(); - PurchaseorderEntity purchaseorderEntity = new PurchaseorderEntity(); - Field declaredField = purchaseorderEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - purchaseorderQueryWrapper="asc".equals(purchaseorderPagination.getSort().toLowerCase())?purchaseorderQueryWrapper.orderByAsc(value):purchaseorderQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); - IPage userIPage=this.page(page, purchaseorderQueryWrapper); - return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return purchaseorderPagination.setData(list, list.size()); - } - }else{ - return this.list(purchaseorderQueryWrapper); - } - } - - @Override - public PurchaseorderEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(PurchaseorderEntity::getId,id); - return this.getOne(queryWrapper); - } - - @Override - public void create(PurchaseorderEntity entity){ - this.save(entity); - } - - @Override - public boolean update(String id, PurchaseorderEntity entity){ - entity.setId(id); - return this.updateById(entity); - } - @Override - public void delete(PurchaseorderEntity entity){ - if(entity!=null){ - this.removeById(entity.getId()); - } - } - //子表方法 - @Override - public List GetPurchaseorder_item0List(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, id); - return purchaseorder_item0Service.list(queryWrapper); - } - - //列表子表数据方法 - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/CollectionMapper.xml similarity index 75% rename from SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml rename to SC-boot/linkage-scm/src/main/resources/CollectionMapper.xml index 8be9fa6a..d9ddd367 100644 --- a/SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/CollectionMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/Collection_item0Mapper.xml similarity index 73% rename from SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml rename to SC-boot/linkage-scm/src/main/resources/Collection_item0Mapper.xml index 4f111661..2e68fc88 100644 --- a/SC-boot/linkage-scm/src/main/resources/Purchaseorder_item0Mapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/Collection_item0Mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/SC-web/src/views/scm/basicInformation/collection/Detail.vue b/SC-web/src/views/scm/basicInformation/collection/Detail.vue new file mode 100644 index 00000000..413c0bbd --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/collection/Detail.vue @@ -0,0 +1,208 @@ + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/ExportBox.vue b/SC-web/src/views/scm/basicInformation/collection/ExportBox.vue similarity index 100% rename from SC-web/src/views/scm/basicInformation/purchaseorder/ExportBox.vue rename to SC-web/src/views/scm/basicInformation/collection/ExportBox.vue diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue new file mode 100644 index 00000000..83a29f73 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue @@ -0,0 +1,357 @@ + + diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue new file mode 100644 index 00000000..c8b1bc98 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/collection/index.vue @@ -0,0 +1,295 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue deleted file mode 100644 index 757d3b4b..00000000 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue +++ /dev/null @@ -1,281 +0,0 @@ - - diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue deleted file mode 100644 index 5d815317..00000000 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue +++ /dev/null @@ -1,517 +0,0 @@ - - diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue deleted file mode 100644 index 709d3653..00000000 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ /dev/null @@ -1,365 +0,0 @@ - - -