From 6ed099df61528a4ee15766dd25e38cc69e64ecd3 Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Tue, 7 Feb 2023 15:55:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mybatis=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E5=9C=A8=E5=8E=9F=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=8A=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-boot/linkage-admin/pom.xml | 1 + .../src/main/resources/application-dev.yml | 7 + .../database/config/MybatisPlusConfig.java | 1 + SC-boot/linkage-scm/pom.xml | 13 ++ .../controller/MaterialController.java | 7 +- .../jnpf/material/entity/MaterialEntity.java | 87 +++++++++++++ .../material/entity/MaterialMobileEntity.java | 120 ++++++++++++++++++ .../jnpf/material/mapper/MaterialMapper.java | 16 +++ .../model/material/MaterialListVO.java | 12 +- .../material/service/MaterialService.java | 12 +- .../service/impl/MaterialServiceImpl.java | 118 +++++++++++------ .../model/warehouse/WarehouseListVO.java | 4 + .../src/main/resources/MaterialMapper.xml | 7 - .../mapper/material/MaterialMapper.xml | 107 ++++++++++++++++ SC-screen-web/.idea/SC-screen-web.iml | 12 ++ SC-screen-web/.idea/modules.xml | 8 ++ SC-screen-web/.idea/vcs.xml | 6 + SC-screen-web/.idea/workspace.xml | 72 +++++------ 18 files changed, 516 insertions(+), 94 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java delete mode 100644 SC-boot/linkage-scm/src/main/resources/MaterialMapper.xml create mode 100644 SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml create mode 100644 SC-screen-web/.idea/SC-screen-web.iml create mode 100644 SC-screen-web/.idea/modules.xml create mode 100644 SC-screen-web/.idea/vcs.xml diff --git a/SC-boot/linkage-admin/pom.xml b/SC-boot/linkage-admin/pom.xml index dbd901a8..833c9ab4 100644 --- a/SC-boot/linkage-admin/pom.xml +++ b/SC-boot/linkage-admin/pom.xml @@ -115,5 +115,6 @@ + diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index 0eb3d0ec..f8f4cb5a 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -96,3 +96,10 @@ springfox: #knife4j knife4j: production: false # 开启/屏蔽文档资源 + +#开启语句打印 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:mapper/**/*.xml + diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java index 3a12fadd..c582b5cc 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java @@ -219,6 +219,7 @@ public class MybatisPlusConfig { ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); List mapperLocations = new ArrayList<>(); mapperLocations.add("classpath:mapper/*/*.xml"); + mapperLocations.add("classpath*:mapper/**/*.xml"); mapperLocations.add("classpath:mapper/*/*/*.xml"); List resources = new ArrayList(); for (String mapperLocation : mapperLocations) { diff --git a/SC-boot/linkage-scm/pom.xml b/SC-boot/linkage-scm/pom.xml index 49097941..cd0bc554 100644 --- a/SC-boot/linkage-scm/pom.xml +++ b/SC-boot/linkage-scm/pom.xml @@ -19,6 +19,14 @@ + + + com.google.guava + guava + 23.4-jre + + + com.jnpf linkage-common @@ -167,4 +175,9 @@ + + + + + diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java index 2d810f1a..1393d253 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java @@ -15,6 +15,7 @@ import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.material.entity.MaterialMobileEntity; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.material.model.material.*; @@ -84,9 +85,9 @@ public class MaterialController { @ApiOperation("列表") @PostMapping("/getList") public ActionResult list(@RequestBody MaterialPagination materialPagination)throws IOException{ - List list= materialService.getList(materialPagination); + List list= materialService.getList(materialPagination); //处理id字段转名称，若无需转或者为空可删除 - for(MaterialEntity entity:list){ + for(MaterialMobileEntity entity:list){ Map outAreaMap = new HashMap<>(); entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap)); Map inAreaMap = new HashMap<>(); @@ -156,7 +157,7 @@ public class MaterialController { return ActionResult.fail("请选择导出字段"); } MaterialPagination materialPagination=JsonUtil.getJsonToBean(materialPaginationExportModel, MaterialPagination.class); - List list= materialService.getTypeList(materialPagination,materialPaginationExportModel.getDataType()); + List list= materialService.getTypeList(materialPagination,materialPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(MaterialEntity entity:list){ Map outAreaMap = new HashMap<>(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialEntity.java index 782657b8..e512c081 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialEntity.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 com.google.common.base.Converter; import lombok.Data; import java.util.Date; @@ -112,4 +113,90 @@ public class MaterialEntity { @TableField("ERROR_MESSAGE") private String errorMessage; +// 转换方法 + + + public MaterialMobileEntity convertTo() { + OrderConverter convert = new OrderConverter(); + return convert.convert(this); + } + + public MaterialEntity convertFrom(MaterialMobileEntity order) { + OrderConverter convert = new OrderConverter(); + return convert.reverse().convert(order); + } + private static class OrderConverter extends Converter { + + @Override + protected MaterialMobileEntity doForward(MaterialEntity materialMobileEntty) { + MaterialMobileEntity dto = new MaterialMobileEntity(); + dto.setCreatortime(materialMobileEntty.getCreatortime()); + dto.setCreatoruserid(materialMobileEntty.getCreatoruserid()); + dto.setCreatorusername(materialMobileEntty.getCreatorusername()); + dto.setDeletemark(materialMobileEntty.getDeletemark()); + dto.setDeletetime(materialMobileEntty.getDeletetime()); + dto.setDeleteuserid(materialMobileEntty.getDeleteuserid()); + dto.setDeleteusername(materialMobileEntty.getDeleteusername()); + dto.setDepartmentId(materialMobileEntty.getDepartmentId()); + dto.setDescription(materialMobileEntty.getDescription()); + dto.setEffectiveStatus(materialMobileEntty.getEffectiveStatus()); + dto.setErrorMessage(materialMobileEntty.getErrorMessage()); + dto.setId(materialMobileEntty.getId()); + dto.setInArea(materialMobileEntty.getInArea()); + dto.setItemCode(materialMobileEntty.getItemCode()); + dto.setItemId(materialMobileEntty.getItemId()); + dto.setLastmodifytime(materialMobileEntty.getLastmodifytime()); + dto.setLastmodifyuserid(materialMobileEntty.getLastmodifyuserid()); + dto.setLastmodifyusername(materialMobileEntty.getLastmodifyusername()); + dto.setMId(materialMobileEntty.getMId()); + dto.setOrganizationCode(materialMobileEntty.getOrganizationCode()); + dto.setOrganizationId(materialMobileEntty.getOrganizationId()); + dto.setOrgnizeId(materialMobileEntty.getOrgnizeId()); + dto.setOutArea(materialMobileEntty.getOutArea()); + dto.setPrimaryUnitOmeasure(materialMobileEntty.getPrimaryUnitOmeasure()); + dto.setPrimaryUomCode(materialMobileEntty.getPrimaryUomCode()); + dto.setProcessingType(materialMobileEntty.getProcessingType()); + dto.setPurchaseFlag(materialMobileEntty.getPurchaseFlag()); + dto.setReadDate(materialMobileEntty.getReadDate()); + dto.setReadTag(materialMobileEntty.getReadTag()); + dto.setSalesFlag(materialMobileEntty.getSalesFlag()); + return dto; + } + //具体的转换内容 + @Override + protected MaterialEntity doBackward(MaterialMobileEntity materialMobileEntty) { + MaterialEntity dto = new MaterialEntity(); + dto.setCreatortime(materialMobileEntty.getCreatortime()); + dto.setCreatoruserid(materialMobileEntty.getCreatoruserid()); + dto.setCreatorusername(materialMobileEntty.getCreatorusername()); + dto.setDeletemark(materialMobileEntty.getDeletemark()); + dto.setDeletetime(materialMobileEntty.getDeletetime()); + dto.setDeleteuserid(materialMobileEntty.getDeleteuserid()); + dto.setDeleteusername(materialMobileEntty.getDeleteusername()); + dto.setDepartmentId(materialMobileEntty.getDepartmentId()); + dto.setDescription(materialMobileEntty.getDescription()); + dto.setEffectiveStatus(materialMobileEntty.getEffectiveStatus()); + dto.setErrorMessage(materialMobileEntty.getErrorMessage()); + dto.setId(materialMobileEntty.getId()); + dto.setInArea(materialMobileEntty.getInArea()); + dto.setItemCode(materialMobileEntty.getItemCode()); + dto.setItemId(materialMobileEntty.getItemId()); + dto.setLastmodifytime(materialMobileEntty.getLastmodifytime()); + dto.setLastmodifyuserid(materialMobileEntty.getLastmodifyuserid()); + dto.setLastmodifyusername(materialMobileEntty.getLastmodifyusername()); + dto.setMId(materialMobileEntty.getMId()); + dto.setOrganizationCode(materialMobileEntty.getOrganizationCode()); + dto.setOrganizationId(materialMobileEntty.getOrganizationId()); + dto.setOrgnizeId(materialMobileEntty.getOrgnizeId()); + dto.setOutArea(materialMobileEntty.getOutArea()); + dto.setPrimaryUnitOmeasure(materialMobileEntty.getPrimaryUnitOmeasure()); + dto.setPrimaryUomCode(materialMobileEntty.getPrimaryUomCode()); + dto.setProcessingType(materialMobileEntty.getProcessingType()); + dto.setPurchaseFlag(materialMobileEntty.getPurchaseFlag()); + dto.setReadDate(materialMobileEntty.getReadDate()); + dto.setReadTag(materialMobileEntty.getReadTag()); + dto.setSalesFlag(materialMobileEntty.getSalesFlag()); + return dto; + } + } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java new file mode 100644 index 00000000..af0aabbb --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java @@ -0,0 +1,120 @@ +package jnpf.material.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.util.Date; + +/** + * @Author: WangChuang + * @Date: 2/2/2023 下午3:31 + * @Description //注释： + * @Version 1.0 + */ +@Data +public class MaterialMobileEntity extends MaterialEntity { + @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("M_ID") + private String mId; + + @TableField("ITEM_ID") + private String itemId; + + @TableField("ITEM_CODE") + private String itemCode; + + @TableField("ORGANIZATION_ID") + private String organizationId; + + @TableField("ORGANIZATION_CODE") + private String organizationCode; + + @TableField("DESCRIPTION") + private String description; + + @TableField("PRIMARY_UOM_CODE") + private String primaryUomCode; + + @TableField("PRIMARY_UNIT_OF_MEASURE") + private String primaryUnitOmeasure; + + @TableField("PURCHASE_FLAG") + private String purchaseFlag; + + @TableField("SALES_FLAG") + private String salesFlag; + + @TableField("IN_AREA") + private String inArea; + + @TableField("OUT_AREA") + private String outArea; + + @TableField("EFFECTIVE_STATUS") + private String effectiveStatus; + + @TableField("PROCESSING_TYPE") + private String processingType; + + @TableField("READ_TAG") + private String readTag; + + @TableField("READ_DATE") + private Date readDate; + + @TableField("ERROR_MESSAGE") + private String errorMessage; +// 采购次数 + private Integer purchasesNumber; + // 采购量（吨） + private Double purchasesWeight; +// 销售次数 + private Integer salesNumber; +// 销售量 + private Double salesWeight; + +// 转换方法 +//创建转换方法 + + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java index cd2627e1..9e1e450c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java @@ -1,8 +1,13 @@ package jnpf.material.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import jnpf.material.entity.MaterialEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.material.entity.MaterialMobileEntity; +import org.apache.ibatis.annotations.Param; /** * @@ -14,4 +19,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface MaterialMapper extends BaseMapper { + /** + * 根据条件查询派工单信息 + * @param page 分页信息 + * @param queryWrapper 条件映射 + * @return 派工单信息 + */ + Object getMaterialMobileList111(); + IPage getMaterialMobileList(@Param("page") IPage page, + @Param("ew") Wrapper queryWrapper); + + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java index 0fea9986..bfb977b9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/model/material/MaterialListVO.java @@ -116,5 +116,15 @@ public class MaterialListVO{ @JsonProperty("errorMessage") private String errorMessage; - + @JsonProperty("purchasesNumber") + private Integer purchasesNumber; + // 采购量（吨） + @JsonProperty("purchasesWeight") + private Double purchasesWeight; + // 销售次数 + @JsonProperty("salesNumber") + private Integer salesNumber; + // 销售量 + @JsonProperty("salesWeight") + private Double salesWeight; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java index 82e13754..8473b089 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java @@ -1,7 +1,11 @@ package jnpf.material.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.material.entity.MaterialEntity; import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.material.entity.MaterialMobileEntity; import jnpf.material.model.material.MaterialPagination; import java.util.*; /** @@ -13,10 +17,12 @@ import java.util.*; * 日期： 2023-01-05 */ public interface MaterialService extends IService { + IPage pagee(Page page, Wrapper queryWrapper); + Object tesx(); + List getList(MaterialPagination materialPagination); - List getList(MaterialPagination materialPagination); + List getTypeList(MaterialPagination materialPagination,String dataType); - List getTypeList(MaterialPagination materialPagination,String dataType); @@ -27,7 +33,7 @@ public interface MaterialService extends IService { void create(MaterialEntity entity); boolean update( String id, MaterialEntity entity); - + // 子表方法 //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java index bc7f6d2c..2a26062b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java @@ -1,5 +1,8 @@ package jnpf.material.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.material.entity.*; import jnpf.material.mapper.MaterialMapper; import jnpf.material.service.*; @@ -22,14 +25,13 @@ 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.*; /** @@ -50,23 +52,25 @@ public class MaterialServiceImpl extends ServiceImpl getList(MaterialPagination materialPagination){ + public List getList(MaterialPagination materialPagination){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; - int materialNum =0; + int materialNum =0; QueryWrapper materialQueryWrapper=new QueryWrapper<>(); boolean pcPermission = false; boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); + if (!userProvider.get().getIsAdministrator()){ + Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); if (ObjectUtil.isEmpty(materialObj)){ return new ArrayList<>(); } else { @@ -76,24 +80,24 @@ public class MaterialServiceImpl extends ServiceImpl(); } else { materialQueryWrapper = (QueryWrapper)materialObj; materialNum++; - } + } - } + } } - if(StringUtil.isNotEmpty(materialPagination.getItemCode())){ + if(StringUtil.isNotEmpty(materialPagination.getItemCode())){ materialNum++; materialQueryWrapper.lambda().like(MaterialEntity::getItemCode,materialPagination.getItemCode()); } - if(StringUtil.isNotEmpty(materialPagination.getDescription())){ + if(StringUtil.isNotEmpty(materialPagination.getDescription())){ materialNum++; materialQueryWrapper.lambda().like(MaterialEntity::getDescription,materialPagination.getDescription()); } @@ -116,28 +120,35 @@ public class MaterialServiceImpl extends ServiceImpl list1 = new ArrayList<>(); if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize()); - IPage userIPage=this.page(page, materialQueryWrapper); - return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + Page page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize()); + IPage userIPage=this.pagee(page, materialQueryWrapper); + List materialEntities = materialPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + + return materialEntities; }else{ List list = new ArrayList(); - return materialPagination.setData(list, list.size()); + List materialEntities = materialPagination.setData(list, list.size()); + for (MaterialEntity materialEntity : materialEntities) { + list1.add(materialEntity.convertTo()); + } + return list1; } } @Override - public List getTypeList(MaterialPagination materialPagination,String dataType){ + public List getTypeList(MaterialPagination materialPagination,String dataType){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); - int total=0; - int materialNum =0; + int total=0; + int materialNum =0; QueryWrapper materialQueryWrapper=new QueryWrapper<>(); boolean pcPermission = false; boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); + if (!userProvider.get().getIsAdministrator()){ + Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material")); if (ObjectUtil.isEmpty(materialObj)){ return new ArrayList<>(); } else { @@ -147,41 +158,41 @@ public class MaterialServiceImpl extends ServiceImpl(); } else { materialQueryWrapper = (QueryWrapper)materialObj; materialNum++; - } + } - } + } } - if(StringUtil.isNotEmpty(materialPagination.getItemCode())){ + if(StringUtil.isNotEmpty(materialPagination.getItemCode())){ materialNum++; materialQueryWrapper.lambda().like(MaterialEntity::getItemCode,materialPagination.getItemCode()); } - if(StringUtil.isNotEmpty(materialPagination.getDescription())){ + if(StringUtil.isNotEmpty(materialPagination.getDescription())){ materialNum++; materialQueryWrapper.lambda().like(MaterialEntity::getDescription,materialPagination.getDescription()); } - if(AllIdList.size()>0){ + if(AllIdList.size()>0){ materialQueryWrapper.lambda().in(MaterialEntity::getId, AllIdList); - } + } //排序 if(StringUtil.isEmpty(materialPagination.getSidx())){ materialQueryWrapper.lambda().orderByDesc(MaterialEntity::getId); }else{ try { - String sidx = materialPagination.getSidx(); + String sidx = materialPagination.getSidx(); MaterialEntity materialEntity = new MaterialEntity(); - Field declaredField = materialEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); + Field declaredField = materialEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(value):materialQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); @@ -189,15 +200,20 @@ public class MaterialServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize()); - IPage userIPage=this.page(page, materialQueryWrapper); + Page page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize()); + IPage userIPage=this.pagee(page, materialQueryWrapper); return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ - List list = new ArrayList(); + List list = new ArrayList(); return materialPagination.setData(list, list.size()); } }else{ - return this.list(materialQueryWrapper); + List list = list(materialQueryWrapper); + List list2 = new ArrayList<>(); + for (MaterialEntity materialEntity : list) { + list2.add(materialEntity.convertTo()); + } + return list2; } } @@ -224,6 +240,24 @@ public class MaterialServiceImpl extends ServiceImpl> E page(E page) { + return super.page(page); + } + + + public IPage pagee(Page page, Wrapper queryWrapper) { + IPage materialMobileList = materialMapper.getMaterialMobileList(page, queryWrapper); +// IPage materialMobileList = materialMapper.getMaterialMobileList(null, null); +// return super.page(page, queryWrapper); + return materialMobileList; + } + + @Override + public Object tesx() { + return materialMapper.getMaterialMobileList111(); + } //子表方法 //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListVO.java index 209f04b3..3d9ee615 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListVO.java @@ -23,6 +23,10 @@ public class WarehouseListVO{ /** 主键 */ private String id; +/*仓库名称 */ + @JsonProperty("name") + private String name; + /** 仓库编码 **/ @JsonProperty("code") diff --git a/SC-boot/linkage-scm/src/main/resources/MaterialMapper.xml b/SC-boot/linkage-scm/src/main/resources/MaterialMapper.xml deleted file mode 100644 index 18cdf226..00000000 --- a/SC-boot/linkage-scm/src/main/resources/MaterialMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml new file mode 100644 index 00000000..aff0b603 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SC-screen-web/.idea/SC-screen-web.iml b/SC-screen-web/.idea/SC-screen-web.iml new file mode 100644 index 00000000..0c8867d7 --- /dev/null +++ b/SC-screen-web/.idea/SC-screen-web.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/SC-screen-web/.idea/modules.xml b/SC-screen-web/.idea/modules.xml new file mode 100644 index 00000000..85e1544a --- /dev/null +++ b/SC-screen-web/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/SC-screen-web/.idea/vcs.xml b/SC-screen-web/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/SC-screen-web/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SC-screen-web/.idea/workspace.xml b/SC-screen-web/.idea/workspace.xml index 18ae6c56..8b76febf 100644 --- a/SC-screen-web/.idea/workspace.xml +++ b/SC-screen-web/.idea/workspace.xml @@ -1,7 +1,12 @@ + + - + + + - - - - - - - + + @@ -44,40 +57,23 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file