diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java index bb9869f3..eecafdba 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java @@ -1,63 +1,54 @@ package jnpf.reservoirarea.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 cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; 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.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; -import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; +import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.model.reservoirarea.*; -import jnpf.reservoirarea.model.reservoirarea.ReservoirareaPagination; -import jnpf.reservoirarea.entity.*; +import jnpf.reservoirarea.service.ReservoirareaService; 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 jnpf.util.enums.FileTypeEnum; +import jnpf.util.file.UploadUtil; import lombok.Cleanup; +import lombok.extern.slf4j.Slf4j; 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.reservoirarea.entity.ReservoirareaEntity; -import jnpf.reservoirarea.service.ReservoirareaService; -import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.multipart.MultipartFile; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + 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; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * - * reservoirarea + * 库区管理 * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Slf4j @RestController -@Api(tags = "reservoirarea" , value = "reservoirarea") -@RequestMapping("/api/reservoirarea/Reservoirarea") +@Api(tags = "库区管理" , value = "example") +@RequestMapping("/api/example/Reservoirarea") public class ReservoirareaController { @Autowired @@ -87,9 +78,7 @@ public class ReservoirareaController { //处理id字段转名称，若无需转或者为空可删除 for(ReservoirareaEntity entity:list){ Map warehouseIdMap = new HashMap<>(); - entity.setWarehouseId(generaterSwapUtil.getPopupSelectValue("380988259175524165","id","name",entity.getWarehouseId(),warehouseIdMap)); - entity.setOrgnizeId(generaterSwapUtil.comSelectValues(entity.getOrgnizeId())); - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); + entity.setWarehouseId(generaterSwapUtil.getPopupSelectValue("394860934465658373","id","NAME",entity.getWarehouseId(),warehouseIdMap)); } List listVO=JsonUtil.getJsonToList(list,ReservoirareaListVO.class); for(ReservoirareaListVO reservoirareaVO:listVO){ @@ -115,6 +104,7 @@ public class ReservoirareaController { public ActionResult create(@RequestBody @Valid ReservoirareaCrForm reservoirareaCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); + reservoirareaCrForm.setCreatorTime(DateUtil.getNow()); ReservoirareaEntity entity = JsonUtil.getJsonToBean(reservoirareaCrForm, ReservoirareaEntity.class); entity.setId(mainId); reservoirareaService.save(entity); @@ -159,9 +149,7 @@ public class ReservoirareaController { //处理id字段转名称，若无需转或者为空可删除 for(ReservoirareaEntity entity:list){ Map warehouseIdMap = new HashMap<>(); - entity.setWarehouseId(generaterSwapUtil.swapRelationFormValue("comInputField109",entity.getWarehouseId(),"294090217084722181",warehouseIdMap)); - entity.setOrgnizeId(generaterSwapUtil.comSelectValues(entity.getOrgnizeId())); - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); + entity.setWarehouseId(generaterSwapUtil.getPopupSelectValue("394860934465658373","id","NAME",entity.getWarehouseId(),warehouseIdMap)); } List listVO=JsonUtil.getJsonToList(list,ReservoirareaListVO.class); for(ReservoirareaListVO reservoirareaVO:listVO){ @@ -202,23 +190,11 @@ public class ReservoirareaController { case "warehouseId" : entitys.add(new ExcelExportEntity("仓库" ,"warehouseId")); break; - case "orgnizeId" : - entitys.add(new ExcelExportEntity("组织" ,"orgnizeId")); - break; - case "departmentId" : - entitys.add(new ExcelExportEntity("部门" ,"departmentId")); - break; - case "creatortime" : - entitys.add(new ExcelExportEntity("创建时间" ,"creatortime")); - break; - case "creatorusername" : - entitys.add(new ExcelExportEntity("创建人名称" ,"creatorusername")); + case "creatorTime" : + entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime")); break; - case "lastmodifytime" : - entitys.add(new ExcelExportEntity("修改时间" ,"lastmodifytime")); - break; - case "lastmodifyusername" : - entitys.add(new ExcelExportEntity("修改人名称" ,"lastmodifyusername")); + case "lastModifyTime" : + entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime")); break; default: break; @@ -283,6 +259,12 @@ public class ReservoirareaController { public ActionResult info(@PathVariable("id") String id){ ReservoirareaEntity entity= reservoirareaService.getInfo(id); ReservoirareaInfoVO vo=JsonUtil.getJsonToBean(entity, ReservoirareaInfoVO.class); + if(vo.getCreatorTime()!=null){ + vo.setCreatorTime(vo.getCreatorTime()); + } + if(vo.getLastModifyTime()!=null){ + vo.setLastModifyTime(vo.getLastModifyTime()); + } //子表 //副表 @@ -306,9 +288,7 @@ public class ReservoirareaController { //添加到详情表单对象中 Map warehouseIdMap = new HashMap<>(); - vo.setWarehouseId(generaterSwapUtil.swapRelationFormValue("comInputField109",vo.getWarehouseId(),"294090217084722181",warehouseIdMap)); - vo.setOrgnizeId(generaterSwapUtil.comSelectValues(vo.getOrgnizeId())); - vo.setDepartmentId(generaterSwapUtil.comSelectValues(vo.getDepartmentId())); + vo.setWarehouseId(generaterSwapUtil.getPopupSelectValue("394860934465658373","id","NAME",vo.getWarehouseId(),warehouseIdMap)); return ActionResult.success(vo); } @@ -328,7 +308,9 @@ public class ReservoirareaController { UserInfo userInfo=userProvider.get(); ReservoirareaEntity entity= reservoirareaService.getInfo(id); if(entity!=null){ + reservoirareaUpForm.setLastModifyTime(DateUtil.getNow()); ReservoirareaEntity subentity=JsonUtil.getJsonToBean(reservoirareaUpForm, ReservoirareaEntity.class); + subentity.setCreatorTime(entity.getCreatorTime()); reservoirareaService.update(id, subentity); return ActionResult.success("更新成功"); }else{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java index 259518ef..5a21f3b9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data @TableName("jg_reservoirarea") @@ -26,34 +26,34 @@ public class ReservoirareaEntity { private String id; @TableField("CREATOR_USER_ID") - private String creatoruserid; + private String creatorUserId; @TableField("CREATOR_USER_NAME") - private String creatorusername; + private String creatorUserName; @TableField("CREATOR_TIME") - private Date creatortime; + private Date creatorTime; @TableField("LAST_MODIFY_USER_ID") - private String lastmodifyuserid; + private String lastModifyUserId; @TableField("LAST_MODIFY_USER_NAME") - private String lastmodifyusername; + private String lastModifyUserName; @TableField("LAST_MODIFY_TIME") - private Date lastmodifytime; + private Date lastModifyTime; @TableField("DELETE_USER_ID") - private String deleteuserid; + private String deleteUserId; @TableField("DELETE_USER_NAME") - private String deleteusername; + private String deleteUserName; @TableField("DELETE_TIME") - private Date deletetime; + private Date deleteTime; @TableField("DELETE_MARK") - private String deletemark; + private String deleteMark; @TableField("ORGNIZE_ID") private String orgnizeId; @@ -82,4 +82,10 @@ public class ReservoirareaEntity { @TableField("UNIT") private String unit; + @TableField("CLOSE_NUM") + private Integer closeNum; + + @TableField("CLOSE_TIME") + private Date closeTime; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/mapper/ReservoirareaMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/mapper/ReservoirareaMapper.java index 5b2fdefe..8ebcff12 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/mapper/ReservoirareaMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/mapper/ReservoirareaMapper.java @@ -1,16 +1,16 @@ package jnpf.reservoirarea.mapper; -import jnpf.reservoirarea.entity.ReservoirareaEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.reservoirarea.entity.ReservoirareaEntity; /** * - * reservoirarea + * 库区管理 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 + * 日期： 2023-02-13 */ public interface ReservoirareaMapper extends BaseMapper { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaCrForm.java index cb77b753..09f547ac 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaCrForm.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaCrForm { @@ -47,29 +47,13 @@ public class ReservoirareaCrForm { @JsonProperty("warehouseId") private String warehouseId; - /** 组织 **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - /** 部门 **/ - @JsonProperty("departmentId") - private String departmentId; - /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorTime") + private String creatorTime; /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonProperty("lastModifyTime") + private String lastModifyTime; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaInfoVO.java index 9f68f700..8dfa9b94 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaInfoVO.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaInfoVO{ @@ -51,28 +51,14 @@ public class ReservoirareaInfoVO{ @JsonProperty("warehouseId") private String warehouseId; - /** 组织 **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - /** 部门 **/ - @JsonProperty("departmentId") - private String departmentId; - /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("lastModifyTime") + private Date lastModifyTime; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListQuery.java index 2a5bf31c..b119110c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListQuery.java @@ -10,7 +10,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaListQuery extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListVO.java index 6ba248c9..806b5113 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaListVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaListVO{ @@ -56,36 +56,16 @@ public class ReservoirareaListVO{ private String warehouseId; - /** 组织 **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - - /** 部门 **/ - @JsonProperty("departmentId") - private String departmentId; - - /** 创建时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("creatortime") - private Date creatortime; - - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; /** 修改时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("lastmodifytime") - private Date lastmodifytime; - - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("lastModifyTime") + private Date lastModifyTime; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPagination.java index b7d8f10f..2af2477e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaPagination extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java index 1450c657..c9f36c29 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPaginationExportModel.java @@ -9,7 +9,7 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaPaginationExportModel extends Pagination { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaUpForm.java index 9b54893a..0a0da1be 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaUpForm.java @@ -15,7 +15,7 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data public class ReservoirareaUpForm{ @@ -58,34 +58,14 @@ public class ReservoirareaUpForm{ private String warehouseId; - /** 组织 **/ - @JsonProperty("orgnizeId") - private String orgnizeId; - - - /** 部门 **/ - @JsonProperty("departmentId") - private String departmentId; - - /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorTime") + private String creatorTime; /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; - - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonProperty("lastModifyTime") + private String lastModifyTime; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/ReservoirareaService.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/ReservoirareaService.java index 8e7bdd99..1f20f4e3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/ReservoirareaService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/ReservoirareaService.java @@ -1,16 +1,17 @@ package jnpf.reservoirarea.service; -import jnpf.reservoirarea.entity.ReservoirareaEntity; import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.model.reservoirarea.ReservoirareaPagination; -import java.util.*; + +import java.util.List; /** * - * reservoirarea + * 库区管理 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 + * 日期： 2023-02-13 */ public interface ReservoirareaService extends IService { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java index ad685eba..fa37c56d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java @@ -1,47 +1,37 @@ package jnpf.reservoirarea.service.impl; -import jnpf.reservoirarea.entity.*; -import jnpf.reservoirarea.mapper.ReservoirareaMapper; -import jnpf.reservoirarea.service.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.util.RandomUtil; -import java.math.BigDecimal; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.permission.model.authorize.AuthorizeConditionModel; - - +import jnpf.permission.service.AuthorizeService; +import jnpf.reservoirarea.entity.ReservoirareaEntity; +import jnpf.reservoirarea.mapper.ReservoirareaMapper; import jnpf.reservoirarea.model.reservoirarea.ReservoirareaPagination; +import jnpf.reservoirarea.service.ReservoirareaService; +import jnpf.util.ServletUtil; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; -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.*; +import java.util.ArrayList; +import java.util.List; /** * - * reservoirarea + * 库区管理 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 + * 日期： 2023-02-13 */ @Service -public class ReservoirareaServiceImpl extends ServiceImpl implements ReservoirareaService{ +public class ReservoirareaServiceImpl extends ServiceImpl implements ReservoirareaService { @Autowired @@ -103,7 +93,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl list= warehouseService.getList(warehousePagination); + public ActionResult list(@RequestBody WareHousePagination wareHousePagination)throws IOException{ + List list= wareHouseService.getList(wareHousePagination); //处理id字段转名称，若无需转或者为空可删除 - for(WarehouseEntity entity:list){ + for(WareHouseEntity entity:list){ + Map companyCodeMap = new HashMap<>(); + entity.setCompanyCode(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyCode(),companyCodeMap)); + Map sublibraryMap = new HashMap<>(); + entity.setSublibrary(generaterSwapUtil.getPopupSelectValue("394818245032483845","id","inventory_org_detail_name",entity.getSublibrary(),sublibraryMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); + entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); +// entity.setOrgId(generaterSwapUtil.comSelectValue(entity.getOrgId(), "all")); +// entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId())); } - List listVO=JsonUtil.getJsonToList(list,WarehouseListVO.class); - for(WarehouseListVO warehouseVO:listVO){ + List listVO=JsonUtil.getJsonToList(list,WareHouseListVO.class); + for(WareHouseListVO wareHouseVO:listVO){ } PageListVO vo=new PageListVO(); vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(warehousePagination,PaginationVO.class); + PaginationVO page=JsonUtil.getJsonToBean(wareHousePagination,PaginationVO.class); vo.setPagination(page); return ActionResult.success(vo); } @@ -104,17 +102,23 @@ public class WarehouseController { /** * 创建 * - * @param warehouseCrForm + * @param wareHouseCrForm * @return */ @PostMapping @Transactional - public ActionResult create(@RequestBody @Valid WarehouseCrForm warehouseCrForm) throws DataException { + public ActionResult create(@RequestBody @Valid WareHouseCrForm wareHouseCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - WarehouseEntity entity = JsonUtil.getJsonToBean(warehouseCrForm, WarehouseEntity.class); + wareHouseCrForm.setCreatorUserName(userInfo.getUserId()); + wareHouseCrForm.setCreatorTime(DateUtil.getNow()); + wareHouseCrForm.setOrgId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId()); + if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){ + wareHouseCrForm.setDepartmentId(userInfo.getPositionIds()[0]); + } + WareHouseEntity entity = JsonUtil.getJsonToBean(wareHouseCrForm, WareHouseEntity.class); entity.setId(mainId); - warehouseService.save(entity); + wareHouseService.save(entity); return ActionResult.success("创建成功"); @@ -147,22 +151,30 @@ public class WarehouseController { */ @ApiOperation("导出Excel") @GetMapping("/Actions/Export") - public ActionResult Export(WarehousePaginationExportModel warehousePaginationExportModel) throws IOException { - if (StringUtil.isEmpty(warehousePaginationExportModel.getSelectKey())){ + public ActionResult Export(WareHousePaginationExportModel wareHousePaginationExportModel) throws IOException { + if (StringUtil.isEmpty(wareHousePaginationExportModel.getSelectKey())){ return ActionResult.fail("请选择导出字段"); } - WarehousePagination warehousePagination=JsonUtil.getJsonToBean(warehousePaginationExportModel, WarehousePagination.class); - List list= warehouseService.getTypeList(warehousePagination,warehousePaginationExportModel.getDataType()); + WareHousePagination wareHousePagination=JsonUtil.getJsonToBean(wareHousePaginationExportModel, WareHousePagination.class); + List list= wareHouseService.getTypeList(wareHousePagination,wareHousePaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 - for(WarehouseEntity entity:list){ + for(WareHouseEntity entity:list){ + Map companyCodeMap = new HashMap<>(); + entity.setCompanyCode(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyCode(),companyCodeMap)); + Map sublibraryMap = new HashMap<>(); + entity.setSublibrary(generaterSwapUtil.getPopupSelectValue("394818245032483845","id","inventory_org_detail_name",entity.getSublibrary(),sublibraryMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); + entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); + entity.setOrgId(generaterSwapUtil.comSelectValue(entity.getOrgId(), "all")); + entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId())); } - List listVO=JsonUtil.getJsonToList(list,WarehouseListVO.class); - for(WarehouseListVO warehouseVO:listVO){ + List listVO=JsonUtil.getJsonToList(list,WareHouseListVO.class); + for(WareHouseListVO wareHouseVO:listVO){ } //转换为map输出 List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); - String[]keys=!StringUtil.isEmpty(warehousePaginationExportModel.getSelectKey())?warehousePaginationExportModel.getSelectKey().split(","):new String[0]; + String[]keys=!StringUtil.isEmpty(wareHousePaginationExportModel.getSelectKey())?wareHousePaginationExportModel.getSelectKey().split(","):new String[0]; UserInfo userInfo=userProvider.get(); DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); return ActionResult.success(vo); @@ -177,11 +189,11 @@ public class WarehouseController { case "code" : entitys.add(new ExcelExportEntity("仓库编码" ,"code")); break; - case "companyCode" : - entitys.add(new ExcelExportEntity("公司代码" ,"companyCode")); + case "name" : + entitys.add(new ExcelExportEntity("仓库名称" ,"name")); break; - case "companyName" : - entitys.add(new ExcelExportEntity("公司名称" ,"companyName")); + case "companyCode" : + entitys.add(new ExcelExportEntity("公司" ,"companyCode")); break; case "location" : entitys.add(new ExcelExportEntity("仓库位置" ,"location")); @@ -189,9 +201,6 @@ public class WarehouseController { case "type" : entitys.add(new ExcelExportEntity("仓库类型" ,"type")); break; - case "organization" : - entitys.add(new ExcelExportEntity("ERP库存组织" ,"organization")); - break; case "sublibrary" : entitys.add(new ExcelExportEntity("ERP子库" ,"sublibrary")); break; @@ -201,17 +210,23 @@ public class WarehouseController { case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark")); break; - case "creatorusername" : - entitys.add(new ExcelExportEntity("创建人名称" ,"creatorusername")); + case "creatorUserName" : + entitys.add(new ExcelExportEntity("创建人名称" ,"creatorUserName")); + break; + case "creatorTime" : + entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime")); break; - case "creatortime" : - entitys.add(new ExcelExportEntity("创建时间" ,"creatortime")); + case "lastModifyUserName" : + entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName")); break; - case "lastmodifyusername" : - entitys.add(new ExcelExportEntity("修改人名称" ,"lastmodifyusername")); + case "lastModifyTime" : + entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime")); break; - case "lastmodifytime" : - entitys.add(new ExcelExportEntity("修改时间" ,"lastmodifytime")); + case "orgId" : + entitys.add(new ExcelExportEntity("组织ID" ,"orgId")); + break; + case "departmentId" : + entitys.add(new ExcelExportEntity("部门ID" ,"departmentId")); break; default: break; @@ -273,9 +288,19 @@ public class WarehouseController { * @return */ @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - WarehouseEntity entity= warehouseService.getInfo(id); - WarehouseInfoVO vo=JsonUtil.getJsonToBean(entity, WarehouseInfoVO.class); + public ActionResult info(@PathVariable("id") String id){ + WareHouseEntity entity= wareHouseService.getInfo(id); + WareHouseInfoVO vo=JsonUtil.getJsonToBean(entity, WareHouseInfoVO.class); + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + if(vo.getCreatorTime()!=null){ + vo.setCreatorTime(vo.getCreatorTime()); + } + vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); + if(vo.getLastModifyTime()!=null){ + vo.setLastModifyTime(vo.getLastModifyTime()); + } +// vo.setOrgId(generaterSwapUtil.comSelectValue(vo.getOrgId(), "all")); +// vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId())); //子表 //副表 @@ -289,15 +314,23 @@ public class WarehouseController { * @return */ @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - WarehouseEntity entity= warehouseService.getInfo(id); - WarehouseInfoVO vo=JsonUtil.getJsonToBean(entity, WarehouseInfoVO.class); + public ActionResult detailInfo(@PathVariable("id") String id){ + WareHouseEntity entity= wareHouseService.getInfo(id); + WareHouseInfoVO vo=JsonUtil.getJsonToBean(entity, WareHouseInfoVO.class); //子表数据转换 //附表数据转换 //添加到详情表单对象中 + Map companyCodeMap = new HashMap<>(); + vo.setCompanyCode(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",vo.getCompanyCode(),companyCodeMap)); + Map sublibraryMap = new HashMap<>(); + vo.setSublibrary(generaterSwapUtil.getPopupSelectValue("394818245032483845","id","inventory_org_detail_name",vo.getSublibrary(),sublibraryMap)); + vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); + vo.setOrgId(generaterSwapUtil.comSelectValue(vo.getOrgId(), "all")); + vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId())); return ActionResult.success(vo); } @@ -313,12 +346,18 @@ public class WarehouseController { */ @PutMapping("/{id}") @Transactional - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid WarehouseUpForm warehouseUpForm) throws DataException { + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid WareHouseUpForm wareHouseUpForm) throws DataException { UserInfo userInfo=userProvider.get(); - WarehouseEntity entity= warehouseService.getInfo(id); + WareHouseEntity entity= wareHouseService.getInfo(id); if(entity!=null){ - WarehouseEntity subentity=JsonUtil.getJsonToBean(warehouseUpForm, WarehouseEntity.class); - warehouseService.update(id, subentity); + wareHouseUpForm.setLastModifyUserName(userInfo.getUserId()); + wareHouseUpForm.setLastModifyTime(DateUtil.getNow()); + wareHouseUpForm.setOrgId(entity.getOrgId()); + wareHouseUpForm.setDepartmentId(entity.getDepartmentId()); + WareHouseEntity subentity=JsonUtil.getJsonToBean(wareHouseUpForm, WareHouseEntity.class); + subentity.setCreatorUserName(entity.getCreatorUserName()); + subentity.setCreatorTime(entity.getCreatorTime()); + wareHouseService.update(id, subentity); return ActionResult.success("更新成功"); }else{ return ActionResult.fail("更新失败，数据不存在"); @@ -336,9 +375,9 @@ public class WarehouseController { @DeleteMapping("/{id}") @Transactional public ActionResult delete(@PathVariable("id") String id){ - WarehouseEntity entity= warehouseService.getInfo(id); + WareHouseEntity entity= wareHouseService.getInfo(id); if(entity!=null){ - warehouseService.delete(entity); + wareHouseService.delete(entity); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WarehouseEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java similarity index 68% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WarehouseEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java index 263b1aa7..6deb1557 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WarehouseEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/entity/WareHouseEntity.java @@ -1,13 +1,11 @@ package jnpf.warehouse.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 com.fasterxml.jackson.annotation.JsonProperty; /** @@ -16,44 +14,44 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data @TableName("jg_warehouse") -public class WarehouseEntity { +public class WareHouseEntity { @TableId("ID") private String id; @TableField("CREATOR_USER_ID") - private String creatoruserid; + private String creatorUserId; @TableField("CREATOR_USER_NAME") - private String creatorusername; + private String creatorUserName; @TableField("CREATOR_TIME") - private Date creatortime; + private Date creatorTime; @TableField("LAST_MODIFY_USER_ID") - private String lastmodifyuserid; + private String lastModifyUserId; @TableField("LAST_MODIFY_USER_NAME") - private String lastmodifyusername; + private String lastModifyUserName; @TableField("LAST_MODIFY_TIME") - private Date lastmodifytime; + private Date lastModifyTime; @TableField("DELETE_USER_ID") - private String deleteuserid; + private String deleteUserId; @TableField("DELETE_USER_NAME") - private String deleteusername; + private String deleteUserName; @TableField("DELETE_TIME") - private Date deletetime; + private Date deleteTime; @TableField("DELETE_MARK") - private String deletemark; + private String deleteMark; @TableField("ORG_ID") private String orgId; @@ -70,15 +68,9 @@ public class WarehouseEntity { @TableField("COMPANY_CODE") private String companyCode; - @TableField("COMPANY_NAME") - private String companyName; - @TableField("TYPE") private String type; - @TableField("ORGANIZATION") - private String organization; - @TableField("SUBLIBRARY") private String sublibrary; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/mapper/WarehouseMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/mapper/WareHouseMapper.java similarity index 56% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/mapper/WarehouseMapper.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/mapper/WareHouseMapper.java index 1762ef2d..1e43e9ea 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/mapper/WarehouseMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/mapper/WareHouseMapper.java @@ -1,17 +1,17 @@ package jnpf.warehouse.mapper; -import jnpf.warehouse.entity.WarehouseEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.warehouse.entity.WareHouseEntity; /** * - * warehouse + * 仓库管理 * 版本： V3.2.0 * 版权： LINKAGE-BOOT * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 + * 日期： 2023-02-13 */ -public interface WarehouseMapper extends BaseMapper { +public interface WareHouseMapper extends BaseMapper { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseCrForm.java similarity index 61% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseCrForm.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseCrForm.java index 908eef80..2ef5270c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseCrForm.java @@ -14,23 +14,23 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehouseCrForm { +public class WareHouseCrForm { /** 仓库编码 **/ @JsonProperty("code") private String code; - /** 公司代码 **/ + /** 仓库名称 **/ + @JsonProperty("name") + private String name; + + /** 公司 **/ @JsonProperty("companyCode") private String companyCode; - /** 公司名称 **/ - @JsonProperty("companyName") - private String companyName; - /** 仓库位置 **/ @JsonProperty("location") private String location; @@ -39,10 +39,6 @@ public class WarehouseCrForm { @JsonProperty("type") private String type; - /** ERP库存组织 **/ - @JsonProperty("organization") - private String organization; - /** ERP子库 **/ @JsonProperty("sublibrary") private String sublibrary; @@ -56,20 +52,28 @@ public class WarehouseCrForm { private String remark; /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; + @JsonProperty("creatorTime") + private String creatorTime; /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; + @JsonProperty("lastModifyTime") + private String lastModifyTime; + + /** 组织ID **/ + @JsonProperty("orgId") + private String orgId; + + /** 部门ID **/ + @JsonProperty("departmentId") + private String departmentId; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseInfoVO.java similarity index 59% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseInfoVO.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseInfoVO.java index d12bcbae..173d5fc1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseInfoVO.java @@ -15,10 +15,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehouseInfoVO{ +public class WareHouseInfoVO{ /** 主键 **/ @JsonProperty("id") private String id; @@ -27,14 +27,14 @@ public class WarehouseInfoVO{ @JsonProperty("code") private String code; - /** 公司代码 **/ + /** 仓库名称 **/ + @JsonProperty("name") + private String name; + + /** 公司 **/ @JsonProperty("companyCode") private String companyCode; - /** 公司名称 **/ - @JsonProperty("companyName") - private String companyName; - /** 仓库位置 **/ @JsonProperty("location") private String location; @@ -43,10 +43,6 @@ public class WarehouseInfoVO{ @JsonProperty("type") private String type; - /** ERP库存组织 **/ - @JsonProperty("organization") - private String organization; - /** ERP子库 **/ @JsonProperty("sublibrary") private String sublibrary; @@ -60,19 +56,29 @@ public class WarehouseInfoVO{ private String remark; /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("lastModifyTime") + private Date lastModifyTime; + + /** 组织ID **/ + @JsonProperty("orgId") + private String orgId; + + /** 部门ID **/ + @JsonProperty("departmentId") + private String departmentId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseListQuery.java similarity index 71% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListQuery.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseListQuery.java index 64e814ee..5860b812 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseListQuery.java @@ -10,16 +10,16 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehouseListQuery extends Pagination { - - /** 激活状态 */ - private String activestate; +public class WareHouseListQuery extends Pagination { /** 仓库编码 */ private String code; + + /** 仓库名称 */ + private String name; /** * 菜单id */ 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 similarity index 59% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseListVO.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseListVO.java index 3d9ee615..af0ad065 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 @@ -3,44 +3,39 @@ package jnpf.warehouse.model.warehouse; -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; +import lombok.Data; + +import java.util.Date; /** * * * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehouseListVO{ +public class WareHouseListVO{ /** 主键 */ private String id; -/*仓库名称 */ - @JsonProperty("name") - private String name; - /** 仓库编码 **/ @JsonProperty("code") private String code; - /** 公司代码 **/ - @JsonProperty("companyCode") - private String companyCode; + /** 仓库名称 **/ + @JsonProperty("name") + private String name; - /** 公司名称 **/ - @JsonProperty("companyName") - private String companyName; + /** 公司 **/ + @JsonProperty("companyCode") + private String companyCode; /** 仓库位置 **/ @@ -53,11 +48,6 @@ public class WarehouseListVO{ private String type; - /** ERP库存组织 **/ - @JsonProperty("organization") - private String organization; - - /** ERP子库 **/ @JsonProperty("sublibrary") private String sublibrary; @@ -74,25 +64,35 @@ public class WarehouseListVO{ /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; /** 创建时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("creatortime") - private Date creatortime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; /** 修改时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("lastmodifytime") - private Date lastmodifytime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("lastModifyTime") + private Date lastModifyTime; + + + /** 组织ID **/ + @JsonProperty("orgId") + private String orgId; + + + /** 部门ID **/ + @JsonProperty("departmentId") + private String departmentId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehousePagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePagination.java similarity index 69% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehousePagination.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePagination.java index f8834c91..a60e5d7b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehousePagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePagination.java @@ -11,16 +11,16 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehousePagination extends Pagination { - - /** 激活状态 */ - private String activestate; +public class WareHousePagination extends Pagination { /** 仓库编码 */ private String code; + + /** 仓库名称 */ + private String name; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehousePaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java similarity index 70% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehousePaginationExportModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java index 17d1dc4e..4f1b7c6a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehousePaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHousePaginationExportModel.java @@ -9,10 +9,10 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehousePaginationExportModel extends Pagination { +public class WareHousePaginationExportModel extends Pagination { private String selectKey; @@ -21,9 +21,9 @@ public class WarehousePaginationExportModel extends Pagination { private String dataType; - /** 激活状态 */ - private String activestate; - /** 仓库编码 */ private String code; + + /** 仓库名称 */ + private String name; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseUpForm.java similarity index 62% rename from SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseUpForm.java rename to SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseUpForm.java index ec6bfc7c..12f35091 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WarehouseUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/model/warehouse/WareHouseUpForm.java @@ -15,10 +15,10 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class WarehouseUpForm{ +public class WareHouseUpForm{ /** 主键 */ private String id; @@ -28,14 +28,14 @@ public class WarehouseUpForm{ private String code; - /** 公司代码 **/ - @JsonProperty("companyCode") - private String companyCode; + /** 仓库名称 **/ + @JsonProperty("name") + private String name; - /** 公司名称 **/ - @JsonProperty("companyName") - private String companyName; + /** 公司 **/ + @JsonProperty("companyCode") + private String companyCode; /** 仓库位置 **/ @@ -48,11 +48,6 @@ public class WarehouseUpForm{ private String type; - /** ERP库存组织 **/ - @JsonProperty("organization") - private String organization; - - /** ERP子库 **/ @JsonProperty("sublibrary") private String sublibrary; @@ -69,23 +64,33 @@ public class WarehouseUpForm{ /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; + @JsonProperty("creatorUserName") + private String creatorUserName; /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; + @JsonProperty("creatorTime") + private String creatorTime; /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; + @JsonProperty("lastModifyUserName") + private String lastModifyUserName; /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; + @JsonProperty("lastModifyTime") + private String lastModifyTime; + + + /** 组织ID **/ + @JsonProperty("orgId") + private String orgId; + + + /** 部门ID **/ + @JsonProperty("departmentId") + private String departmentId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/WareHouseService.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/WareHouseService.java new file mode 100644 index 00000000..ffa8e783 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/WareHouseService.java @@ -0,0 +1,35 @@ +package jnpf.warehouse.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.warehouse.entity.WareHouseEntity; +import jnpf.warehouse.model.warehouse.WareHousePagination; + +import java.util.List; +/** + * + * 仓库管理 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-02-13 + */ +public interface WareHouseService extends IService { + + List getList(WareHousePagination wareHousePagination); + + List getTypeList(WareHousePagination wareHousePagination,String dataType); + + + + WareHouseEntity getInfo(String id); + + void delete(WareHouseEntity entity); + + void create(WareHouseEntity entity); + + boolean update( String id, WareHouseEntity entity); + +// 子表方法 + + //列表子表数据方法 +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/WarehouseService.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/WarehouseService.java deleted file mode 100644 index 1e22511a..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/WarehouseService.java +++ /dev/null @@ -1,34 +0,0 @@ -package jnpf.warehouse.service; - -import jnpf.warehouse.entity.WarehouseEntity; -import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.warehouse.model.warehouse.WarehousePagination; -import java.util.*; -/** - * - * warehouse - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface WarehouseService extends IService { - - List getList(WarehousePagination warehousePagination); - - List getTypeList(WarehousePagination warehousePagination,String dataType); - - - - WarehouseEntity getInfo(String id); - - void delete(WarehouseEntity entity); - - void create(WarehouseEntity entity); - - boolean update( String id, WarehouseEntity entity); - -// 子表方法 - - //列表子表数据方法 -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java new file mode 100644 index 00000000..375cc856 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java @@ -0,0 +1,222 @@ +package jnpf.warehouse.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.permission.model.authorize.AuthorizeConditionModel; +import jnpf.permission.service.AuthorizeService; +import jnpf.util.ServletUtil; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import jnpf.warehouse.entity.WareHouseEntity; +import jnpf.warehouse.mapper.WareHouseMapper; +import jnpf.warehouse.model.warehouse.WareHousePagination; +import jnpf.warehouse.service.WareHouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +/** + * + * 仓库管理 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-02-13 + */ +@Service +public class WareHouseServiceImpl extends ServiceImpl implements WareHouseService { + + + @Autowired + private UserProvider userProvider; + + @Autowired + private AuthorizeService authorizeService; + + + + + + @Override + public List getList(WareHousePagination wareHousePagination){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int wareHouseNum =0; + QueryWrapper wareHouseQueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); + if (ObjectUtil.isEmpty(wareHouseObj)){ + return new ArrayList<>(); + } else { + wareHouseQueryWrapper = (QueryWrapper)wareHouseObj; + wareHouseNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); + if (ObjectUtil.isEmpty(wareHouseObj)){ + return new ArrayList<>(); + } else { + wareHouseQueryWrapper = (QueryWrapper)wareHouseObj; + wareHouseNum++; + } + + + } + } + if(StringUtil.isNotEmpty(wareHousePagination.getCode())){ + wareHouseNum++; + wareHouseQueryWrapper.lambda().like(WareHouseEntity::getCode,wareHousePagination.getCode()); + } + + if(StringUtil.isNotEmpty(wareHousePagination.getName())){ + wareHouseNum++; + wareHouseQueryWrapper.lambda().like(WareHouseEntity::getName,wareHousePagination.getName()); + } + + if(AllIdList.size()>0){ + wareHouseQueryWrapper.lambda().in(WareHouseEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(wareHousePagination.getSidx())){ + wareHouseQueryWrapper.lambda().orderByDesc(WareHouseEntity::getCreatorTime); + }else{ + try { + String sidx = wareHousePagination.getSidx(); + WareHouseEntity wareHouseEntity = new WareHouseEntity(); + Field declaredField = wareHouseEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + wareHouseQueryWrapper="asc".equals(wareHousePagination.getSort().toLowerCase())?wareHouseQueryWrapper.orderByAsc(value):wareHouseQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(wareHousePagination.getCurrentPage(), wareHousePagination.getPageSize()); + IPage userIPage=this.page(page, wareHouseQueryWrapper); + return wareHousePagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return wareHousePagination.setData(list, list.size()); + } + } + @Override + public List getTypeList(WareHousePagination wareHousePagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int wareHouseNum =0; + QueryWrapper wareHouseQueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); + if (ObjectUtil.isEmpty(wareHouseObj)){ + return new ArrayList<>(); + } else { + wareHouseQueryWrapper = (QueryWrapper)wareHouseObj; + wareHouseNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse")); + if (ObjectUtil.isEmpty(wareHouseObj)){ + return new ArrayList<>(); + } else { + wareHouseQueryWrapper = (QueryWrapper)wareHouseObj; + wareHouseNum++; + } + + + } + } + if(StringUtil.isNotEmpty(wareHousePagination.getCode())){ + wareHouseNum++; + wareHouseQueryWrapper.lambda().like(WareHouseEntity::getCode,wareHousePagination.getCode()); + } + + if(StringUtil.isNotEmpty(wareHousePagination.getName())){ + wareHouseNum++; + wareHouseQueryWrapper.lambda().like(WareHouseEntity::getName,wareHousePagination.getName()); + } + + if(AllIdList.size()>0){ + wareHouseQueryWrapper.lambda().in(WareHouseEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(wareHousePagination.getSidx())){ + wareHouseQueryWrapper.lambda().orderByDesc(WareHouseEntity::getCreatorTime); + }else{ + try { + String sidx = wareHousePagination.getSidx(); + WareHouseEntity wareHouseEntity = new WareHouseEntity(); + Field declaredField = wareHouseEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + wareHouseQueryWrapper="asc".equals(wareHousePagination.getSort().toLowerCase())?wareHouseQueryWrapper.orderByAsc(value):wareHouseQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(wareHousePagination.getCurrentPage(), wareHousePagination.getPageSize()); + IPage userIPage=this.page(page, wareHouseQueryWrapper); + return wareHousePagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return wareHousePagination.setData(list, list.size()); + } + }else{ + return this.list(wareHouseQueryWrapper); + } + } + + @Override + public WareHouseEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(WareHouseEntity::getId,id); + return this.getOne(queryWrapper); + } + + @Override + public void create(WareHouseEntity entity){ + this.save(entity); + } + + @Override + public boolean update(String id, WareHouseEntity entity){ + entity.setId(id); + return this.updateById(entity); + } + @Override + public void delete(WareHouseEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + //子表方法 + + //列表子表数据方法 + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WarehouseServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WarehouseServiceImpl.java deleted file mode 100644 index e53623f8..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WarehouseServiceImpl.java +++ /dev/null @@ -1,232 +0,0 @@ -package jnpf.warehouse.service.impl; - -import jnpf.warehouse.entity.*; -import jnpf.warehouse.mapper.WarehouseMapper; -import jnpf.warehouse.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.warehouse.model.warehouse.WarehousePagination; - -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.*; - -/** - * - * warehouse - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -@Service -public class WarehouseServiceImpl extends ServiceImpl implements WarehouseService{ - - - @Autowired - private UserProvider userProvider; - - @Autowired - private AuthorizeService authorizeService; - - - - - - @Override - public List getList(WarehousePagination warehousePagination){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int warehouseNum =0; - QueryWrapper warehouseQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object warehouseObj=authorizeService.getCondition(new AuthorizeConditionModel(warehouseQueryWrapper,warehousePagination.getMenuId(),"warehouse")); - if (ObjectUtil.isEmpty(warehouseObj)){ - return new ArrayList<>(); - } else { - warehouseQueryWrapper = (QueryWrapper)warehouseObj; - warehouseNum++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object warehouseObj=authorizeService.getCondition(new AuthorizeConditionModel(warehouseQueryWrapper,warehousePagination.getMenuId(),"warehouse")); - if (ObjectUtil.isEmpty(warehouseObj)){ - return new ArrayList<>(); - } else { - warehouseQueryWrapper = (QueryWrapper)warehouseObj; - warehouseNum++; - } - - - } - } - if(StringUtil.isNotEmpty(warehousePagination.getActivestate())){ - warehouseNum++; - warehouseQueryWrapper.lambda().eq(WarehouseEntity::getActivestate,warehousePagination.getActivestate()); - } - - if(StringUtil.isNotEmpty(warehousePagination.getCode())){ - warehouseNum++; - warehouseQueryWrapper.lambda().like(WarehouseEntity::getCode,warehousePagination.getCode()); - } - - if(AllIdList.size()>0){ - warehouseQueryWrapper.lambda().in(WarehouseEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(warehousePagination.getSidx())){ - warehouseQueryWrapper.lambda().orderByDesc(WarehouseEntity::getId); - }else{ - try { - String sidx = warehousePagination.getSidx(); - WarehouseEntity warehouseEntity = new WarehouseEntity(); - Field declaredField = warehouseEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - warehouseQueryWrapper="asc".equals(warehousePagination.getSort().toLowerCase())?warehouseQueryWrapper.orderByAsc(value):warehouseQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(warehousePagination.getCurrentPage(), warehousePagination.getPageSize()); - IPage userIPage=this.page(page, warehouseQueryWrapper); - return warehousePagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return warehousePagination.setData(list, list.size()); - } - } - @Override - public List getTypeList(WarehousePagination warehousePagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int warehouseNum =0; - QueryWrapper warehouseQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object warehouseObj=authorizeService.getCondition(new AuthorizeConditionModel(warehouseQueryWrapper,warehousePagination.getMenuId(),"warehouse")); - if (ObjectUtil.isEmpty(warehouseObj)){ - return new ArrayList<>(); - } else { - warehouseQueryWrapper = (QueryWrapper)warehouseObj; - warehouseNum++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object warehouseObj=authorizeService.getCondition(new AuthorizeConditionModel(warehouseQueryWrapper,warehousePagination.getMenuId(),"warehouse")); - if (ObjectUtil.isEmpty(warehouseObj)){ - return new ArrayList<>(); - } else { - warehouseQueryWrapper = (QueryWrapper)warehouseObj; - warehouseNum++; - } - - - } - } - if(StringUtil.isNotEmpty(warehousePagination.getActivestate())){ - warehouseNum++; - warehouseQueryWrapper.lambda().eq(WarehouseEntity::getActivestate,warehousePagination.getActivestate()); - } - - if(StringUtil.isNotEmpty(warehousePagination.getCode())){ - warehouseNum++; - warehouseQueryWrapper.lambda().like(WarehouseEntity::getCode,warehousePagination.getCode()); - } - - if(AllIdList.size()>0){ - warehouseQueryWrapper.lambda().in(WarehouseEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(warehousePagination.getSidx())){ - warehouseQueryWrapper.lambda().orderByDesc(WarehouseEntity::getId); - }else{ - try { - String sidx = warehousePagination.getSidx(); - WarehouseEntity warehouseEntity = new WarehouseEntity(); - Field declaredField = warehouseEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - warehouseQueryWrapper="asc".equals(warehousePagination.getSort().toLowerCase())?warehouseQueryWrapper.orderByAsc(value):warehouseQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(warehousePagination.getCurrentPage(), warehousePagination.getPageSize()); - IPage userIPage=this.page(page, warehouseQueryWrapper); - return warehousePagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return warehousePagination.setData(list, list.size()); - } - }else{ - return this.list(warehouseQueryWrapper); - } - } - - @Override - public WarehouseEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(WarehouseEntity::getId,id); - return this.getOne(queryWrapper); - } - - @Override - public void create(WarehouseEntity entity){ - this.save(entity); - } - - @Override - public boolean update(String id, WarehouseEntity entity){ - entity.setId(id); - return this.updateById(entity); - } - @Override - public void delete(WarehouseEntity entity){ - if(entity!=null){ - this.removeById(entity.getId()); - } - } - //子表方法 - - //列表子表数据方法 - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml new file mode 100644 index 00000000..853fdbb6 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml new file mode 100644 index 00000000..10128bba --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/Detail.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/Detail.vue index aa11cdf9..bc19004c 100644 --- a/SC-web/src/views/scm/basicInformation/reservoirarea/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/reservoirarea/Detail.vue @@ -48,42 +48,6 @@

{{dataForm.warehouseId}}

- - -

{{dataForm.orgnizeId}}

- - - - -

{{dataForm.departmentId}}

- - - - -

{{jnpf.dateFormat(dataForm.creatortime)}}

- - - - -

{{dataForm.creatorusername}}

- - - - -

{{jnpf.dateFormat(dataForm.lastmodifytime)}}

- - - - -

{{dataForm.lastmodifyusername}}

- - @@ -114,12 +78,8 @@ minimum : 1, unit : "", warehouseId : "", - orgnizeId : '', - departmentId : '', - creatortime : '', - creatorusername : '', - lastmodifytime : '', - lastmodifyusername : '', + creatorTime : "", + lastModifyTime : "", }, unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], @@ -144,7 +104,7 @@ if(this.dataForm.id){ this.loading = true request({ - url: '/api/reservoirarea/Reservoirarea/detail/'+this.dataForm.id, + url: '/api/example/Reservoirarea/detail/'+this.dataForm.id, method: 'get' }).then(res => { this.dataInfo(res.data) diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue index efef62aa..dac14085 100644 --- a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue +++ b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue @@ -1,270 +1,215 @@ diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue index a5854afa..af73a433 100644 --- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue +++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue @@ -1,336 +1,268 @@ diff --git a/SC-web/src/views/scm/basicInformation/warehouse/Detail.vue b/SC-web/src/views/scm/basicInformation/warehouse/Detail.vue index 7f33b754..a9f0c743 100644 --- a/SC-web/src/views/scm/basicInformation/warehouse/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/warehouse/Detail.vue @@ -13,15 +13,15 @@ - -

{{dataForm.companyCode}}

+ +

{{dataForm.name}}

 - -

{{dataForm.companyName}}

+ +

{{dataForm.companyCode}}

 @@ -36,16 +36,10 @@

{{ dataForm.type | dynamicText(typeOptions) }}

- - -

{{ dataForm.organization | dynamicText(organizationOptions) }}

- - -

{{ dataForm.sublibrary | dynamicText(sublibraryOptions) }}

+

{{dataForm.sublibrary}}

 @@ -60,30 +54,6 @@

{{dataForm.remark}}

 - - -

{{dataForm.creatorusername}}

- - - - -

{{jnpf.dateFormat(dataForm.creatortime)}}

- - - - -

{{dataForm.lastmodifyusername}}

- - - - -

{{jnpf.dateFormat(dataForm.lastmodifytime)}}

- - @@ -108,22 +78,21 @@ dataForm: { id :'', code : '', - companyCode : '', - companyName : '', + name : '', + companyCode : "", location : '', type : "", - organization : "", sublibrary : "", activestate : "2", remark : '', - creatorusername : '', - creatortime : '', - lastmodifyusername : '', - lastmodifytime : '', + creatorUserName : "", + creatorTime : "", + lastModifyUserName : "", + lastModifyTime : "", + orgId : "", + departmentId : "", }, typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}], - organizationOptions:[{"fullName":"济钢集团","id":"0"},{"fullName":"日照","id":"1"}], - sublibraryOptions:[{"fullName":"城市矿产钢材库","id":"0"},{"fullName":"黄河爆破待发库","id":"1"},{"fullName":"黄河爆破完工库","id":"2"}], activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}], } @@ -147,7 +116,7 @@ if(this.dataForm.id){ this.loading = true request({ - url: '/api/warehouse/Warehouse/detail/'+this.dataForm.id, + url: '/api/example/WareHouse/detail/'+this.dataForm.id, method: 'get' }).then(res => { this.dataInfo(res.data) diff --git a/SC-web/src/views/scm/basicInformation/warehouse/Form.vue b/SC-web/src/views/scm/basicInformation/warehouse/Form.vue index f3a56b9f..3d530e7c 100644 --- a/SC-web/src/views/scm/basicInformation/warehouse/Form.vue +++ b/SC-web/src/views/scm/basicInformation/warehouse/Form.vue @@ -1,336 +1,229 @@ diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue index 8e36e6d3..635a82d2 100644 --- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue +++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue @@ -1,414 +1,277 @@