diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/pom.xml b/cf-module-prod-manage/cf-module-prod-manage-api/pom.xml deleted file mode 100644 index 461c155e4..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - com.cf.imes - cf-module-prod-manage - ${revision} - - jar - - - - com.cf.imes - cf-common - - - - org.springdoc - springdoc-openapi-ui - provided - - - - - org.springframework.boot - spring-boot-starter-validation - true - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - true - - - - cf-module-prod-manage-api - - manage 模块 API，暴露给其它模块调用 - - - - 17 - 17 - UTF-8 - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/api/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/api/package-info.java deleted file mode 100644 index 5a5fc0245..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * manage API包 暴露给其他模块API - */ -package com.cf.imes.module.manage.api; \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/api/plate/PlateApi.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/api/plate/PlateApi.java deleted file mode 100644 index 7f8b6db62..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/api/plate/PlateApi.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.manage.api.plate; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.manage.enums.ApiConstants; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory = -@Tag(name = "RPC 服务 - 多组织") -public interface PlateApi { - - String PREFIX = ApiConstants.PREFIX + "/plate"; - - @GetMapping(PREFIX +"/get") - @Operation(summary = "获得板材信息表") - @Parameters({ - @Parameter(name = "id", description = "编号", required = true, example = "1024"), - @Parameter(name = "organId", description = "板材所属组织ID", required = true, example = "1024") - }) - CommonResult getPlate(@RequestParam("id") Long id, - @RequestParam("organId") Long organId); - - @GetMapping(PREFIX +"/getGoodsId") - @Operation(summary = "判断板材是否存在") - @Parameters({ - @Parameter(name = "id", description = "客户的商品编号", required = true, example = "1024"), - @Parameter(name = "organId", description = "板材所属组织ID", required = true, example = "1024") - }) - CommonResult getPlateGoods(@RequestParam("id") String goodsId, - @RequestParam("organId") Long organId); -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/ApiConstants.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/ApiConstants.java deleted file mode 100644 index 3ee70cd41..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/ApiConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.enums; - -import com.cf.imes.framework.common.enums.RpcConstants; - -/** - * API 相关的枚举 - * - * @author 晨丰科技 - */ -public class ApiConstants { - - /** - * 服务名 - * - * 注意，需要保证和 spring.application.name 保持一致 - */ - public static final String NAME = "manage-server"; - - public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/manage"; - - public static final String VERSION = "1.0.0"; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/DictTypeConstants.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/DictTypeConstants.java deleted file mode 100644 index 0b8f07135..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/DictTypeConstants.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.manage.enums; - -/** - * Manage 字典类型的枚举类 - * - * @author 晨丰科技 - */ -public class DictTypeConstants { - - public static final String PLATE_TEXTURE = "plate_texture_type";// 板件纹里 - - public static final String PART_CATEGORY = "part_category";// 配件主类型 - - public static final String BOOLEAN_STRING = "infra_boolean_string"; // Boolean 是否类型 - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/ErrorCodeConstants.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/ErrorCodeConstants.java deleted file mode 100644 index 8f28d5ec2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/ErrorCodeConstants.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cf.imes.module.manage.enums; - -import com.cf.imes.framework.common.exception.ErrorCode; - -/** - * @author there - * 生产管理服务错误码枚举 使用1-004-000-000 段 - */ -public class ErrorCodeConstants { - - public static final ErrorCode PARTS_NOT_EXISTS = new ErrorCode(1_004_001_000, "配件不存在"); - public static final ErrorCode PARTS_GOOD_ID_EXISTS = new ErrorCode(1_004_001_001, "配件编号已存在"); - public static final ErrorCode PARTS_UNIT_NOT_NULL = new ErrorCode(1_004_001_002, "配件－组件或五金或封边条，单位禁止为空"); - public static final ErrorCode PARTS_EDGE_NOT_NULL = new ErrorCode(1_004_001_003, "配件－封边条颜色、宽厚禁止为空"); - - public static final ErrorCode FILE_NULL = new ErrorCode(1_004_001_004, "上传文件为空"); - public static final ErrorCode FILE_FORMAT_ERROR = new ErrorCode(1_004_001_005, "导入文件格式有误"); - public static final ErrorCode FILE_EXCEED_SIZE = new ErrorCode(1_004_001_006, "文件大小超过 10M"); - public static final ErrorCode FILE_CONTENT_NULL = new ErrorCode(1_004_001_007, "文件大小为空"); -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/CategoryEnum.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/CategoryEnum.java deleted file mode 100644 index d8e9abd3c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/CategoryEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.enums.parts; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 配件主类的枚举值 - */ -@Getter -@AllArgsConstructor -public enum CategoryEnum implements ObjectEnum{ - - ASSEMBLY("组件"), - HARDWARE("五金"), - EDGING("封边条"), - OTHER("其他"); - - /** - * 类别名称 - */ - private final String value; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/ObjectEnum.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/ObjectEnum.java deleted file mode 100644 index 5b322d63c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/ObjectEnum.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.cf.imes.module.manage.enums.parts; - -public interface ObjectEnum { - - String getValue(); -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/WhetherEnum.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/WhetherEnum.java deleted file mode 100644 index 89d611c54..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/parts/WhetherEnum.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cf.imes.module.manage.enums.parts; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum WhetherEnum implements ObjectEnum{ - - TRUE("是"), - FALSE("否"); - - /** - * 类别名称 - */ - private final String value; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlatePlaceStyleEnum.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlatePlaceStyleEnum.java deleted file mode 100644 index 4d9031481..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlatePlaceStyleEnum.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cf.imes.module.manage.enums.remainPlate; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 余料板放置枚举类 - */ -@Getter -@AllArgsConstructor -public enum RemainPlatePlaceStyleEnum { - - ZERO(0, "正面"), - ONE(1, "正面右转"), - TWO(2, "正面后转"), - THREE(3, "正面左转"), - FOUR(4, "反面"), - FIVE(5, "反面右转"), - SIX(6, "反面后转"), - SEVEN(7, "反面左转"); - - private final Integer status; - private String description; - - public boolean equals(Integer status) { - return this.status .equals(status) ; - } - - public boolean equals(RemainPlatePlaceStyleEnum enableStatusEnum) { - return enableStatusEnum != null && enableStatusEnum.status .equals(this.getStatus()) ; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlateStatusEnum.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlateStatusEnum.java deleted file mode 100644 index bd3ae4534..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlateStatusEnum.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cf.imes.module.manage.enums.remainPlate; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum RemainPlateStatusEnum { - UNUSED(0, "未使用"), - USED(1, "已使用"); - - private final Integer status; - private String description; - - public boolean equals(Integer status) { - return this.status .equals(status) ; - } - - public boolean equals(RemainPlateStatusEnum enableStatusEnum) { - return enableStatusEnum != null && enableStatusEnum.status .equals(this.getStatus()) ; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlateUseTypeEnum.java b/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlateUseTypeEnum.java deleted file mode 100644 index 437285c0e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/remainPlate/RemainPlateUseTypeEnum.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cf.imes.module.manage.enums.remainPlate; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum RemainPlateUseTypeEnum { - - TYPE_ZERO(0, ""), - TYPE_ONE(1, "核销"), - TYPE_TWO(2, "排单"), - TYPE_THREE(3, "补板"); - - private final Integer status; - private String description; - - public boolean equals(Integer status) { - return this.status .equals(status) ; - } - - public boolean equals(RemainPlateUseTypeEnum enableStatusEnum) { - return enableStatusEnum != null && enableStatusEnum.status .equals(this.getStatus()) ; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml deleted file mode 100644 index 52c5bfe39..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml +++ /dev/null @@ -1,335 +0,0 @@ - - - 4.0.0 - - com.cf.imes - cf-module-prod-manage - ${revision} - - - cf-module-prod-manage-biz - - - 17 - 17 - UTF-8 - - - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - - - com.cf.imes - cf-module-prod-manage-api - ${revision} - - - - - com.cf.imes - cf-spring-boot-starter-banner - - - com.cf.imes - cf-spring-boot-starter-biz-operatelog - - - com.cf.imes - cf-spring-boot-starter-biz-organ - - - com.cf.imes - cf-spring-boot-starter-biz-error-code - - - com.cf.imes - cf-spring-boot-starter-biz-dict - - - - com.cf.imes - cf-spring-boot-starter-security - - - - - - - com.cf.imes - cf-spring-boot-starter-mybatis - - - - com.cf.imes - cf-spring-boot-starter-redis - - - - - com.cf.imes - cf-spring-boot-starter-rpc - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - - com.cf.imes - cf-spring-boot-starter-test - test - - - - - com.cf.imes - cf-spring-boot-starter-excel - - - - cn.smallbun.screw - screw-core - - - - - com.cf.imes - cf-spring-boot-starter-monitor - - - - de.codecentric - spring-boot-admin-starter-server - - - - - com.cf.imes - cf-spring-boot-starter-file - - - com.cf.imes - cf-spring-boot-starter-biz-data-permission - - - - - com.cf.imes - cf-spring-boot-starter-excel - - - - - - com.github.pagehelper - pagehelper - 6.1.0 - - - com.github.jsqlparser - jsqlparser - - - - - com.github.pagehelper - sqlparser4.5 - 6.1.0 - - - - - - - com.hynnet - jacob - 1.18 - - - - - com.google.code.gson - gson - 2.8.8 - - - com.cf.imes - cf-module-prod-executor-api - ${revision} - - - - com.cf.imes - cf-spring-boot-starter-biz-id - - - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - ZIP - - - com.cf.imes - cf-common - - - com.cf.imes - cf-module-infra-api - - - com.cf.imes - cf-module-prod-executor-api - - - com.cf.imes - cf-module-prod-manage-api - - - com.cf.imes - cf-module-system-api - - - com.cf.imes - cf-spring-boot-starter-banner - - - com.cf.imes - cf-spring-boot-starter-biz-data-permission - - - com.cf.imes - cf-spring-boot-starter-biz-dict - - - com.cf.imes - cf-spring-boot-starter-biz-error-code - - - com.cf.imes - cf-spring-boot-starter-biz-operatelog - - - com.cf.imes - cf-spring-boot-starter-biz-organ - - - com.cf.imes - cf-spring-boot-starter-excel - - - com.cf.imes - cf-spring-boot-starter-file - - - com.cf.imes - cf-spring-boot-starter-monitor - - - com.cf.imes - cf-spring-boot-starter-mybatis - - - com.cf.imes - cf-spring-boot-starter-redis - - - com.cf.imes - cf-spring-boot-starter-rpc - - - com.cf.imes - cf-spring-boot-starter-security - - - com.cf.imes - cf-spring-boot-starter-web - - - com.cf.imes - cf-spring-boot-starter-biz-id - - - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.plugin.version} - - - prepare-package - - copy-dependencies - - - - target/lib - - com.cf.imes - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven.assembly.plugin.version} - - false - - - src/main/build/assembly.xml - - - - - bundle - package - - single - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/build/assembly.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/build/assembly.xml deleted file mode 100644 index 6357861d2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/build/assembly.xml +++ /dev/null @@ -1,45 +0,0 @@ - - bundle - - tar.gz - - false - - - - - ${basedir}/src/main/resources - config - - application-${profileActive}.yaml - bootstrap-${profileActive}.yaml - bootstrap.yaml - - - - - - ${basedir}/src/main/resources/type - type - - - - - ${basedir}/target/lib - - *.jar - - - lib - - - - ${project.build.directory} - / - - ${project.artifactId}.jar - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/ManageServerApplication.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/ManageServerApplication.java deleted file mode 100644 index d6aec9b73..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/ManageServerApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cf.imes.module.manage; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.EnableAspectJAutoProxy; - -/** - * @author there - */ -@SpringBootApplication -@EnableAspectJAutoProxy(exposeProxy = true) // add config -@EnableFeignClients -public class ManageServerApplication { - public static void main(String[] args) { - SpringApplication.run(ManageServerApplication.class, args); - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/api/plate/PlateServiceApiImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/api/plate/PlateServiceApiImpl.java deleted file mode 100644 index b5f5a8f21..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/api/plate/PlateServiceApiImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.manage.api.plate; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; -import com.cf.imes.module.manage.service.plate.PlateService; - -import javax.annotation.Resource; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - -public class PlateServiceApiImpl implements PlateApi{ - - @Resource - private PlateService plateService; - - @Override - public CommonResult getPlate(Long id, Long organId) { - PlateDO plateDO = plateService.getPlate(id, organId); - if (plateDO == null) { - return success(false); - } - return success(true); - } - - @Override - public CommonResult getPlateGoods(String goodsId, Long organId) { - if (goodsId == null) { - return success(0L); - } - PlateDO plateDO = plateService.getPlateGoods(goodsId, organId); - if (plateDO == null) { - return success(0L); - } - return success(plateDO.getId()); - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/config/DataSourceInitializer.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/config/DataSourceInitializer.java deleted file mode 100644 index e124f40d5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/config/DataSourceInitializer.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cf.imes.module.manage.config; - -import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.baomidou.dynamic.datasource.creator.DataSourceProperty; -import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; -import com.cf.imes.framework.organ.core.context.OrganContextHolder; -import com.cf.imes.module.manage.dal.dataobject.register.RegisterDO; -import com.cf.imes.module.manage.dal.mysql.register.RegisterMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import javax.sql.DataSource; -import java.util.List; - -/** - * @author there - */ -@Slf4j -@Component -public class DataSourceInitializer { - - @Autowired - private DefaultDataSourceCreator defaultDataSourceCreator; - - @Autowired - private RegisterMapper registerMapper; - - @Autowired - private DataSource dataSource; - - @PostConstruct - public void init(){ - DynamicRoutingDataSource dynamicRoutingDataSource=(DynamicRoutingDataSource)dataSource; - OrganContextHolder.setOrganId(0L); - List registerDOS=registerMapper.findAll(); - OrganContextHolder.clear(); - for(RegisterDO registerDO:registerDOS){ - DataSourceProperty dataSourceProperty=new DataSourceProperty(); - dataSourceProperty.setPoolName(registerDO.getCode()); - dataSourceProperty.setUrl(registerDO.getDbUrl()); - dataSourceProperty.setUsername(registerDO.getDbUsername()); - dataSourceProperty.setPassword(registerDO.getDbPassword()); - DataSource dataSource=defaultDataSourceCreator.createDataSource(dataSourceProperty); - dynamicRoutingDataSource.addDataSource(registerDO.getCode(),dataSource); - } - - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/config/VocieParameters.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/config/VocieParameters.java deleted file mode 100644 index a9fbc3308..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/config/VocieParameters.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cf.imes.module.manage.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "voices.parameters") -public class VocieParameters { - - // 设置音频的质量（ 越大越好，目前最大好像 22，最小为 4 ） - private Long quality; - - // 朗读声音大小 - private Long soundSize; - - // 朗读速度 - private Long readingSpeed; - - // 音频保存的路径 - private String path; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java deleted file mode 100644 index 924c68f21..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java +++ /dev/null @@ -1,275 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.pack.prePack.PrePackReqVO; -import com.cf.imes.module.manage.controller.admin.pack.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; -import com.cf.imes.module.manage.service.pack.PackService; -import com.cf.imes.module.manage.service.query.ProductionStatusService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 生产打包 ") -@RestController -@RequestMapping("/manage/pack") -@Validated -public class PackController { - - - - @Resource - private PackService packService; - - - - @Resource - private ProductionStatusService productionStatusService; - - - - - @GetMapping("/page") - @Operation(summary = "打包分页查询") - @PreAuthorize("@ss.hasPermission('manage:pack:query')") - public CommonResult> getPlatePage(@Valid PackPageReqVO pageReqVO) { - - return CommonResult.success(packService.getPackPage(pageReqVO)); - - } - - - @GetMapping("/getOrderPlate") - @Operation(summary = "查看生产订单对应的没有打包的板材信息") - @Parameter(name = "orderId", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasAnyPermissions('manage:pack:export-lost-plate','manage:pack:pack')") - public CommonResult> getOrderPlateList(@Valid @RequestParam("orderId") Long orderId) { - - return success(packService.getOrderPlateList(orderId)); - - } - - - @GetMapping("/getOrderPlateList") - @Operation(summary = "查询多个生产单对应的板材信息") - @Parameter(name = "orderIds", description = "生产单ID", required = true) - @PreAuthorize("@ss.hasAnyPermissions('manage:pack:create','manage:pack:pre-pack','manage:pack:pack')") - public CommonResult> getOrdersPlateList(@Valid @RequestParam("orderIds") List orderIds) { - - return success(packService.getOrdersPlateList(orderIds)); - - } - - - @GetMapping("/getOrderPack") - @Operation(summary = "查看生产订单对应的包裹信息-未分页") - @PreAuthorize("@ss.hasAnyPermissions('manage:pack:export-pack-num','manage:pack:pack')") - public CommonResult> getOrderPack(@Valid PackageDetailsReqVO reqVO) { - - return success(packService.getOrderPack(reqVO)); - - } - - - @GetMapping("/getPageOrderPack") - @Operation(summary = "查看生产订单对应的包裹信息-分页") - @PreAuthorize("@ss.hasPermission('manage:pack:pack-details')") - public CommonResult> getPageOrderPack(@Valid PackageDetailsReqVO reqVO) { - - return success(packService.getPageOrderPack(reqVO)); - - } - - - - @GetMapping("/queryPackageDetails") - @Operation(summary = "查询包裹的详细信息") - @PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-details','manage:pack:query')") - public CommonResult> queryPackageDetails(@Valid PackDetailsReqVO reqVO){ - - return CommonResult.success(productionStatusService.queryPackageDetails(reqVO)); - - } - - - - - - @GetMapping("/getParts") - @Operation(summary = "查看配件列表") - @PreAuthorize("@ss.hasPermission('manage:pack-parts:query')") - public CommonResult> getParts(@Valid OrderPartsReqVO reqVO) { - - return success(packService.getPartsList(reqVO)); - - - } - - - - - - - @PutMapping("/updatePack") - @Operation(summary = "板材包裹更新-即封包") - @PreAuthorize("@ss.hasPermission('manage:pack:update')") - public CommonResult updatePack(@Valid @RequestBody OrderPackReqVO packageVO) { - - return success(packService.updatePack(packageVO)); - - } - - - - - @PutMapping("/updateParts") - @Operation(summary = "配件包裹更新-即封包") - @PreAuthorize("@ss.hasPermission('manage:pack:update')") - public CommonResult updateParts(@Valid @RequestBody OrderPartsReqVO reqVO) { - - return success(packService.updateParts(reqVO)); - - - } - - - - - @GetMapping("/selectPack") - @Operation(summary = "查询包裹") - @Parameter(name = "orderId", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasPermission('manage:pack:query')") - public CommonResult> selectPack(@Valid @RequestParam("orderId") Long orderId) { - - return success(packService.selectPack(orderId)); - - } - - - - @DeleteMapping("/deletePack") - @Operation(summary = "删除包裹及其关联的包裹信息(删除全部)") - @PreAuthorize("@ss.hasPermission('manage:pack:delete')") - public CommonResult deleteOrderPack (@Valid @RequestBody PackReqVO reqVO) { - - packService.deleteOrderPack(reqVO); - return success(true); - - } - - - - - @PutMapping("/unpacking") - @Operation(summary = "拆包-更改包裹为未封包") - @PreAuthorize("@ss.hasPermission('manage:pack:unpacking')") - public CommonResult unpacking(@Valid @RequestBody PackingReqVO reqVO) { - - OrderPackRespVO unpacking = packService.unpacking(reqVO.getPackageId()); - - return success(unpacking); - } - - - - - - -// @GetMapping("/print") -// @Operation(summary = "包裹订单打印") -// @PreAuthorize("@ss.hasPermission('manage:pack:query')") - public CommonResult printOrderPack (@Valid PrintOrderPackReqVO reqVO) { - - return success(packService.printOrderPack(reqVO)); - - } - - - - - -// @PostMapping("/insertParts") -// @Operation(summary = "新增配件包裹") -// @PreAuthorize("@ss.hasPermission('manage:pack:insert')") - public CommonResult addNewPartsPack (@Valid @RequestBody OrderPackReqVO reqVO) { - - return success(packService.addNewPartsPack(reqVO)); - - } - - - - - @PostMapping("/insertOtherPack") - @Operation(summary = "新增外部配件-即新增一个包裹") - @PreAuthorize("@ss.hasPermission('manage:pack:external-parts')") - public CommonResult addNewOtherPack(@Valid @RequestBody OtherPackReqVO reqVO) { - - return success(packService.addNewOtherPack(reqVO)); - - } - - - @PutMapping("/insertOther") - @Operation(summary = "新增外部配件") - @PreAuthorize("@ss.hasPermission('manage:pack:external-parts')") - public CommonResult addNewOtherParts (@Valid @RequestBody OtherPackReqVO reqVO) { - - return success(packService.addNewOtherParts(reqVO)); - - } - - - - @DeleteMapping("/deleteOtherParts") - @Operation(summary = "删除包裹中的外部配件") - @PreAuthorize("@ss.hasPermission('manage:pack:delete')") - public CommonResult deleteOtherParts (@Valid @RequestBody DeleteOtherPartsReqVO reqVO) { - - packService.deleteOtherParts(reqVO); - return success(true); - - - } - - - - - @GetMapping("/getPrePackInfo") - @Operation(summary = "查询预打包优化信息") - @PreAuthorize("@ss.hasPermission('manage:pack:pre-pack')") - public CommonResult getPrePackInfo ( @RequestParam("orderId") Long orderId) { - - return success(packService.getPrePackInfo(orderId)); - - } - - - - - @PostMapping("/saveOptimizeInfo") - @Operation(summary = "预打包保存优化信息") - @PreAuthorize("@ss.hasPermission('manage:pack:pre-pack')") - public CommonResult saveOptimizeInfo(@Valid @RequestBody PrePackReqVO reqVO) { - - packService.saveOptimizeInfo(reqVO); - - return success(true); - - - } - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PackPlateList.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PackPlateList.java deleted file mode 100644 index 7cd2d2e9a..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PackPlateList.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.prePack; - - -import lombok.Builder; -import lombok.Data; -import lombok.ToString; - -@Data -@ToString(callSuper = true) -@Builder -public class PackPlateList { - - - // 包裹ID - private Long packId; - - // 包裹编号 - private String packNo; - - // 板材ID - private Long plateId; - - // 板材编号 - private String plateNo; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackData.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackData.java deleted file mode 100644 index b845ab08e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackData.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.prePack; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "预打包的优化结构") -@Data -@ToString(callSuper = true) -public class PrePackData { - - - @Schema(description = "包裹编号") - private String name; - - - @Schema(description = "点的位置信息") - private Double pointX; - private Double pointY; - - @Schema(description = "板材编号") - private String plateNo; - - @Schema(description = "板材宽度") - private Long plateWidth; - - @Schema(description = "板材高度") - private Long plateHeight; - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackOptimizeInfo.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackOptimizeInfo.java deleted file mode 100644 index 0cd371bb6..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackOptimizeInfo.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.prePack; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.Valid; -import java.util.List; - -@Schema(description = "预打包的优化结构") -@Data -@ToString(callSuper = true) -public class PrePackOptimizeInfo { - - - @Schema(description = "分组名称") - private String groupName; - - - @Schema(description = "优化的数据") - private List list; - - - - @Valid - @Data - public static class PrePackData { - - @Schema(description = "包裹编号") - private String name; - - @Schema(description = "") - private List list; - - } - - - @Valid - @Data - public static class PrerStoreyNum { - - @Schema(description = "包裹层数名称") - private String name; - - - @Schema(description = "") - private Long floor_place_width; - - @Schema(description = "") - private Long floor_place_height; - - @Schema(description = "") - private List list; - - } - - - @Valid - @Data - public static class PrerPlateData { - - @Schema(description = "小板名称") - private String name; - - - @Schema(description = "") - private String plateNo; - - @Schema(description = "") - private String plateId; - - @Schema(description = "") - private PrePlaceInfo placeInfo; - - } - - - @Valid - @Data - public static class PrePlaceInfo{ - - @Schema(description = "") - private String banid; - - @Schema(description = "") - private Double line; - - @Schema(description = "") - private Double x; - - @Schema(description = "") - private Double y; - - @Schema(description = "") - private Long pbg; - - @Schema(description = "") - private Long pbk; - - - } - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackReqVO.java deleted file mode 100644 index 9e431b891..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/prePack/PrePackReqVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.prePack; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 预打包保存优化信息") -@Data -@ToString(callSuper = true) -public class PrePackReqVO { - - - @Schema(description = "生产单ID") - @NotNull(message = "优化数据异常，请重新优化") - private Long orderId; - - - - @Schema(description = "优化信息") - @NotBlank(message = "优化数据异常，请重新优化") - private String optimizeInfo; - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/DeleteOtherPartsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/DeleteOtherPartsReqVO.java deleted file mode 100644 index ad9712244..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/DeleteOtherPartsReqVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 删除其他配件 Request VO") -@Data -@ToString(callSuper = true) -public class DeleteOtherPartsReqVO { - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号为空，请重新删除配件") - private Long orderId; - - - @Schema(description = "包裹Id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包裹号为空，请重新删除配件") - private Long packageId; - - @Schema(description = "配件ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "配件信息为空，请重新删除配件") - private Long partsId; - - - @Schema(description = "是否是其他类型的配件", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "配件类型为空，请重新删除配件") - private Boolean isOtherParts; - - - -} - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java deleted file mode 100644 index 5e8bcb57f..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - - - -@Schema(description = "工序组名称") -@Data -public class GroupNameList { - - @Schema(description = "工序组名称") - private String name; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPackReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPackReqVO.java deleted file mode 100644 index 71be2d83e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPackReqVO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.cf.imes.module.manage.validation.pack.PackTypeValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Schema(description = "管理后台 - 包裹新增 Request VO") -@Data -@ToString(callSuper = true) -public class OrderPackReqVO { - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long packId; - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号为空") - private Long orderId; - - - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String packNo; - - - @Schema(description = "包裹类型", requiredMode = Schema.RequiredMode.REQUIRED) - @PackTypeValid - private Integer packageType; - - -// @Schema(description = "包裹状态", requiredMode = Schema.RequiredMode.REQUIRED) -// private Long packStatus; - - - @Schema(description = "备注") - private String remark; - - - @Schema(description = "新增的板件ID", requiredMode = Schema.RequiredMode.REQUIRED) - private List addPlateIdList; - - - @Schema(description = "移除的板件ID", requiredMode = Schema.RequiredMode.REQUIRED) - private List deletePlateIdList; - - - @Schema(description = "新增的配件包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - private List addPartsIdList; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPackRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPackRespVO.java deleted file mode 100644 index cf672784c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPackRespVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.baomidou.mybatisplus.annotation.TableId; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; - - -@Schema(description = "管理后台 - 生产单包裹表 Response VO") -@Data -@Builder -public class OrderPackRespVO { - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderId; - - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String packageNo; - - @Schema(description = "包裹类型，-1未定义，0板材，1配件，2其他配件", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer packageType; - - @Schema(description = "包裹名", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; - - @Schema(description = "包裹状态，0未封包，1已封包，2已入库，3已出库", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer status; - - @Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long organId; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) - private String remark; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java deleted file mode 100644 index 135bd9c30..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsReqVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Schema(description = "管理后台 - 生产单模块表 Request VO") -@Data -//@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class OrderPartsReqVO /*extends PageParam*/ { - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号为空") - private Long orderId; - - - @Schema(description = "更新配件时传-包裹ID") - private Long packId; - - - @Schema(description = "新增的配件ID") - private List addPartsIdList; - - - @Schema(description = "更新配件时传-删除的配件ID") - private List deletePartsIdList; - - - @Schema(description = "新增的板件ID") - private List addPlateIdList; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsRespVO.java deleted file mode 100644 index 98b7fb5ec..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPartsRespVO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 配件列表详情 Response VO") -@Data -public class OrderPartsRespVO { - - - @Schema(description = "配件ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long partsId; - - @Schema(description = "配件名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; - - @Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED) - private String model; - - @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED) - private String spec; - - @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long num; - - @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) - private String unit; - - @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) - private String brand; - - @Schema(description = "厂家", requiredMode = Schema.RequiredMode.REQUIRED) - private String factory; - - - @Schema(description = "配件类型", requiredMode = Schema.RequiredMode.REQUIRED) - private String type; - - - @Schema(description = "是否复合配件", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean isComposite; - - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) - private String remark; - - - @Schema(description = "配件颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String partsColor; - - @Schema(description = "配件宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double partsWidth; - - @Schema(description = "配件长度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double partsLength; - - @Schema(description = "配件厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double partsThickness; - - @Schema(description = "配件主类：1封边2五金3组件", requiredMode = Schema.RequiredMode.REQUIRED) - private String category; - - @Schema(description = "子配件ID列表,复合部件时记录子配件ID,半角逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED) - private String subparts; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPlateDetailsRespVO.java deleted file mode 100644 index e96815ac8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPlateDetailsRespVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - - - -@Schema(description = "管理后台 - 查看生产单对应的板件信息") -@Data -@ExcelIgnoreUnannotated -public class OrderPlateDetailsRespVO { - - - @Schema(description = "板件总数", requiredMode = Schema.RequiredMode.REQUIRED) - private Long plateNum; - - @Schema(description = "已处理量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long plateProcessedNum; - - @Schema(description = "待处理量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long pendingNum; - - -// @Schema(description = "当前包裹的板件数", requiredMode = Schema.RequiredMode.REQUIRED) -// private Long currentPackNum; - - @Schema(description = "生产单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED) - List plateDetailsRespVO; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPlateGroupRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPlateGroupRespVO.java deleted file mode 100644 index 7263be8a3..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OrderPlateGroupRespVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.apache.poi.ss.formula.functions.Value; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -@Schema(description = "管理后台 - 板材列表显示 Response VO") -@Data -public class OrderPlateGroupRespVO { - - - @Schema(description = "房间id", requiredMode = Schema.RequiredMode.REQUIRED) - private Long roomId; - - - @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String roomName; - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java deleted file mode 100644 index b637737bc..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/OtherPackReqVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.cf.imes.framework.common.validation.NumberValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -@Schema(description = "管理后台 - 新增外部配件 Request VO") -@Data -@ToString(callSuper = true) -public class OtherPackReqVO { - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号为空，请重新新增外部配件") - private Long orderId; - - - @Schema(description = "配件名称", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "配件名称不能为空") - @Size(max = 64, message = "配件名称长度不能超过 64 个字符") - private String name; - - - @Schema(description = "配件数量", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "配件数量") - private Double num; - - - @Schema(description = "配件单位", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "配件单位不能为空") - @Size(max = 32, message = "配件单位长度不能超过 32 个字符") - private String unit; - - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String packNo; - - - @Schema(description = "备注") - private String remark; - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackDetailsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackDetailsReqVO.java deleted file mode 100644 index fbdffbf20..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackDetailsReqVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.manage.validation.pack.PackTypeValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 查看包裹详情") -@Data -@ToString(callSuper = true) -public class PackDetailsReqVO extends PageParam { - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包裹数据错误，请重新查看") - private Long packageId; - - - @Schema(description = "包裹类型", requiredMode = Schema.RequiredMode.REQUIRED) - @PackTypeValid - private Integer type; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java deleted file mode 100644 index d752dc7d9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackPageReqVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.manage.validation.pack.OrderPackagedStatusValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.Pattern; - -@Schema(description = "管理后台 - 打包分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PackPageReqVO extends PageParam { - - - @Schema(description = "打包状态(0：未打包，1：已打包)", requiredMode = Schema.RequiredMode.REQUIRED) - @OrderPackagedStatusValid - private Integer status; - - - @Schema(description = "订单号") - @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字") - @Length(max = 19,message = "生产单号长度不能超过19") - private String orderId; - - - @Schema(description = "自定义单号") - @Length(max = 32,message = "自定义单号数据过长，请重新输入") - private String customOrderNo; - - - @Schema(description = "经销商") - @Length(max = 255, message = "经销商数据过长，请重新输入") - private String dealer; - - - @Schema(description = "客户") - @Length(max = 255, message = "客户数据过长，请重新输入") - private String customer; - - - @Schema(description = "地址") - @Length(max = 255, message = "收货地址数据过长，请重新输入") - private String address; - - - @Schema(description = "是否翻页-true：上，false：下") - private Boolean isUp; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackReqVO.java deleted file mode 100644 index 7ace41b44..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackReqVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 删除订单包裹 Request VO") -@Data -@ToString(callSuper = true) -public class PackReqVO { - - @Schema(description = "生产单ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生产单号为空，请重新删除配件") - private Long orderId; - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包裹信息为空，请重新删除配件") - private Long packageId; - - - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long packageNo; - - - @Schema(description = "是否是其他类型的包裹", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包裹类型为空，请重新删除配件") - private Boolean isOther; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java deleted file mode 100644 index df566783d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; - - -@Schema(description = "管理后台 - 生产单表 order_{N} Response VO") -@Data -@Setter -public class PackRespVO { - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") - private Long id; - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") - private Long packId; - - - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String customOrderNo; - - - @Schema(description = "经销商电话", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String dealerPhoneNumber; - - - @Schema(description = "经销商", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String dealer; - - - @Schema(description = "订单日期", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private LocalDateTime orderDate; - - - @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private LocalDateTime deliveryDate; - - - @Schema(description = "打包状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "0") - private Integer packaged; - - - @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED,example = "张三") - private String customer; - - - @Schema(description = "客户地址", requiredMode = Schema.RequiredMode.REQUIRED,example = "AABB") - private String address; - - - @Schema(description = "客户电话", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String phoneNumber; - - - @Schema(description = "业务员", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String salesman; - - - @Schema(description = "拆单员", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String splitter; - - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - - - - @Schema(description = "已打包数-包裹数") - private Long packCount; - - - @Schema(description = "已打包片数-已处理量") - private Long packPieceCount; - - - @Schema(description = "总片数-板件总数") - private Long totalPieceCount; - - - @Schema(description = "待处理量") - private Long pendingNum; - - - @Schema(description = "生产单对应的板材ID集") - private List plateIdList; - - @Schema(description = "生产单对应的包裹ID集") - private List packIdList; - -// @Schema(description = "生产单对应的板件信息", requiredMode = Schema.RequiredMode.REQUIRED) -// List plateDetailsRespVO; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java deleted file mode 100644 index 559e418af..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.Pattern; - - -@Schema(description = "管理后台 - 查看生产单下对应的包裹信息") -@Data -@ToString(callSuper = true) -public class PackageDetailsReqVO extends PageParam { - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - @Pattern(regexp = "^[0-9]*$",message = "生产单号必须为数字") - @Length(max = 19,message = "生产单号长度不能超过 19 位") - private String orderId; - - - @Schema(description = "板编号") - @Pattern(regexp = "^[0-9]*$",message = "板编号必须为数字") - @Length(max = 13,message = "板编号长度不能超过 13 位") - private String plateNo; - - - @Schema(description = "包裹状态") - private Boolean packStatus; - - - @Schema(description = "包裹编号") - @Pattern(regexp = "^[0-9]*$",message = "包裹编号必须为数字") - @Length(max = 13,message = "包裹编号长度不能超过 13 位") - private String packageNo; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackingReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackingReqVO.java deleted file mode 100644 index 8e7308fc8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackingReqVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 拆包") -@Data -@ToString(callSuper = true) -public class PackingReqVO { - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包裹异常，请查看是否封包") - private Long packageId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateAndPartIdList.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateAndPartIdList.java deleted file mode 100644 index 625a2d50a..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateAndPartIdList.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - - -@Schema(description = "板材和配件ID") -@Data -@ToString(callSuper = true) -public class PlateAndPartIdList { - - - @Schema(description = "板材ID") - private Long plateId; - - - @Schema(description = "配件ID") - private Long partsId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java deleted file mode 100644 index 52f654ee3..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - - -@Schema(description = "管理后台 - 板材详情(导出板材表) Response VO") -@Data -@ExcelIgnoreUnannotated -public class PlateDetailsRespVO { - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long packageId; - - @Schema(description = "包裹号", requiredMode = Schema.RequiredMode.REQUIRED) - private String packageNo; - - @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("房间名称") - private String roomName; - - @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("柜体名称") - private String cabinetName; - - @Schema(description = "房间ID", requiredMode = Schema.RequiredMode.REQUIRED) - private String roomId; - - @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED) - private String bodyId; - - @Schema(description = "生产单ID", requiredMode = Schema.RequiredMode.REQUIRED) - private String orderId; - - @Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED) - private String plateId; - - @Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String customPlateNo; - - @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("板编号") - private String plateNo; - - @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("板名称") - private String plateName; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("材料") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("颜色") - private String color; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("宽度") - private Double width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("长度") - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("厚度") - private Double thickness; - - @Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("面积") - private Double area; - - @Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("纹路") - private Integer texture; - - @Schema(description = "异形", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("异形") - private Boolean specialShaped; - - @Schema(description = "造型", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("造型") - private Boolean profiling; - - @Schema(description = "排孔", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("排孔") - private Boolean rowHole; - - @Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("加工组") - private String processGroup; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("备注") - private String remark; - - - @Schema(description = "加工组名称集合") - private List processGroupNameList; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackReqVO.java deleted file mode 100644 index 3da0c33b8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 打印生产单的包裹 Request VO") -@Data -@ToString(callSuper = true) -public class PrintOrderPackReqVO { - - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private Long orderId; - - - @Schema(description = "包裹id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private Long packageNo; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java deleted file mode 100644 index 2a5e95d33..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.pack.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -@Schema(description = "管理后台 - 包裹打印显示 Response VO") -@Data -public class PrintOrderPackRespVO { - - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED) - private String customOrderNo; - - - @Schema(description = "经销商", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String dealer; - - - @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") - private Long orderId; - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") - private Long packNo; - - - @Schema(description = "包裹序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") - private Long packNum; - - - - @Schema(description = "客户地址", requiredMode = Schema.RequiredMode.REQUIRED,example = "AABB") - private String address; - - - - @Schema(description = "板材列表", requiredMode = Schema.RequiredMode.REQUIRED,example = "AABB") - private List plateList; - - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java deleted file mode 100644 index 876836443..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.parts; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.excel.core.util.ExcelUtils; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.manage.controller.admin.parts.vo.*; -import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO; -import com.cf.imes.module.manage.service.parts.PartsExcelListener; -import com.cf.imes.module.manage.service.parts.PartsService; -import com.cf.imes.module.manage.util.file.ExcelReadUtil; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import java.io.IOException; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT; - - -@Tag(name = "管理后台 - 配件管理") -@RestController -@RequestMapping("/manage/parts/") -@Validated -public class PartsController { - - @Resource - private PartsService partsService; - - final String IMPORT_TEMPLATE = "配件导入模板.xlsx"; - - @PostMapping("/create") - @Operation(summary = "创建配件") - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:create','base:accessory:create')") - public CommonResult create(@Valid @RequestBody PartsSaveReqVO createReqVO) { - return success(partsService.create(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新配件") - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:update','base:accessory:update')") - public CommonResult update(@Valid @RequestBody PartsSaveReqVO updateReqVO) { - partsService.update(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除配件") - @Parameters({ - @Parameter(name = "id", description = "编号", required = true, example = "1024"), - @Parameter(name = "organId", description = "板材所属组织ID", example = "1024") - }) - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:delete','base:accessory:delete')") - public CommonResult delete(@RequestParam("id") Long id, - @RequestParam(value = "organId",required = false, defaultValue = "0") Long organId) { - partsService.delete(id, organId); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得配件") - @Parameters({ - @Parameter(name = "id", description = "编号", required = true, example = "1024"), - @Parameter(name = "organId", description = "板材所属组织ID", example = "1024") - }) - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:update','base:accessory:update')") - public CommonResult get(@RequestParam("id") Long id, - @RequestParam(value = "organId", required = false, defaultValue = "0") Long organId) { - PartsDO partsDO = partsService.get(id, organId); - return success(BeanUtils.toBean(partsDO, PartsRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得配件分页") - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:query','base:accessory:query')") - public CommonResult> getPage(@Valid PartsPageReqVO pageReqVO) { - PageResult pageResult = partsService.getPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); - } - - @GetMapping("/webcad/page") - @Operation(summary = "获得配件分页") - public CommonResult> webCadGetPage(@Valid PartsPageReqVO pageReqVO) { - PageResult pageResult = partsService.webCadGetPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出配件文件") - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:export','base:accessory:export')") - @OperateLog(type = EXPORT) - public void exportExcel(@Valid PartsPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = partsService.getPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "配件表.xls", "数据", PartsRespVO.class, - BeanUtils.toBean(list, PartsRespVO.class)); - } - - @GetMapping("/get-import-template") - @Operation(summary = "获得导入配件模板") - @Parameter(name = "value", description = "文件类型", required = true, example = "0") - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:export-template','base:accessory:export-template')") - public void importTemplate(HttpServletResponse response, @RequestParam("value") @NotEmpty(message = "文件路径不能为空") String value) { - partsService.exportTemplate(response, value); - } - - @PostMapping("/import") - @Operation(summary = "导入配件") - @Parameters({ - @Parameter(name = "file", description = "Excel 文件", required = true), - @Parameter(name = "updateSupport", description = "是否支持更新", example = "true"), - @Parameter(name = "organId", description = "配件所属组织ID") - }) - @OperateLog(type = IMPORT) - @PreAuthorize("@ss.hasAnyPermissions('system:accessory:import','base:accessory:import')") - public void importExcel(@RequestParam("file") MultipartFile file, - @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport, - @RequestParam(value = "organId", required = false, defaultValue = "0") Long organId, - HttpServletResponse response) throws Exception { - - ExcelReadUtil excelReadUtil = new ExcelReadUtil(); - PartsExcelListener listener = new PartsExcelListener(); - List list = excelReadUtil.read(file, PartsImportExcelVO.class, listener); - - if (!excelReadUtil.getFlag()) - ExcelUtils.write(response, IMPORT_TEMPLATE, "配件列表", PartsImportExcelVO.class, list); - else { - if (list.isEmpty()){ - PartsImportExcelVO partsImportExcelVO = PartsImportExcelVO.builder().result("导入失败，请保证导入文件中包含配件数据").build(); - list.add(partsImportExcelVO); - ExcelUtils.write(response, IMPORT_TEMPLATE, "配件列表", PartsImportExcelVO.class, list); - } else { - partsService.importPartsList(list, updateSupport, organId);// 成功，批量导入 - } - } - } - - @GetMapping("/cad/page") - @Operation(summary = "cad获得配件分页") -// @PreAuthorize("@ss.hasAnyPermissions('system:accessory:query','base:accessory:query')") - public CommonResult> getCadPage(@Valid PartsCadPageReqVO pageReqVO) { - PageResult pageResult = partsService.getCadPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); - } - - @GetMapping("/webcad/all") - @Operation(summary = "获取全部配件信息") - public CommonResult> getPlateAll(@RequestParam("category") String category) { - List list = partsService.getPartAll(category); - return success(BeanUtils.toBean(list, PartsRespVO.class)); - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java deleted file mode 100644 index 0daa19fc2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.parts.vo; - -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.manage.validation.parts.PartsNumberValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.Size; - -/** - * cad 传参 - */ -@Schema(description = "管理后台 - 配件分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PartsCadPageReqVO extends PageParam { - - @Schema(description = "商品名称", example = "张三") - @Size(max = 64, message = "配件名称长度不能超过64个字符") - private String name; - - @Schema(description = "颜色") - @Size(max = 32, message = "颜色长度不能超过32个字符") - private String color; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板") - @Size(max = 64, message = "材质长度不能超过64个字符") - private String material; - - @Schema(description = "配件类型", example = "2") - @Size(max = 32, message = "配件类型长度不能超过323个字符") - private String category; - - @Schema(description = "配件子类", example = "2") - @Size(max = 64, message = "配件子类长度不能超过64个字符") - private String type; - - @Schema(description = "型号") - @Size(max = 64, message = "配件型号长度不能超过64个字符") - private String model; - - @Schema(description = "规格") - @Size(max = 64, message = "配件规格不能超过64个字符") - private String spec; - - @Schema(description = "宽度") - @PartsNumberValid(name = "宽度") - private Double width; - - @Schema(description = "长度") - @PartsNumberValid(name = "长度") - private Double length; - - @Schema(description = "厚度") - @PartsNumberValid(name = "厚度") - private Double thickness; - - @Schema(description = "品牌") - @Size(max = 64, message = "配件品牌不能超过64个字符") - private String brand; - - @Schema(description = "厂家") - @Size(max = 128, message = "厂家长度不能超过64个字符") - private String factory; - - @Schema(description = "单位") - @Size(max = 32, message = "单位长度不能超过64个字符") - private String unit; - - @Schema(description = "是否复合部件：0 否 1 是") - private Boolean isComposite; - - @Schema(description = "备注", example = "你说的对") - @Size(max = 255, message = "备注长度不能超过255个字符") - private String remark; - - private Long organId; - - @Schema(description = "排序", example = "ascend") - private String order; - - @Schema(description = "排序字段", example = "id") - private String field; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsImportExcelVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsImportExcelVO.java deleted file mode 100644 index d39f5dc0e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsImportExcelVO.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.parts.vo; - -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * 配件导入模板 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 -public class PartsImportExcelVO { - - @ExcelProperty("物料编号") - private String goodsId; - - @ExcelProperty("分类") - private String category; - - @ExcelProperty("复合") - private String isComposite; - - @ExcelProperty("子类") - private String type; - - @ExcelProperty("物料名称") - private String name; - - @ExcelProperty("型号") - private String model; - - @ExcelProperty("规格") - private String spec; - - @ExcelProperty("材质") - private String material; - - @ExcelProperty("颜色") - private String color; - - @ExcelProperty("品牌") - private String brand; - - @ExcelProperty("厂家") - private String factor; - - @ExcelProperty("长度")// float(8,3) - private String length; - - @ExcelProperty("宽度")// float(8,3) - private String width; - - @ExcelProperty("厚度") - private String thickness; - - @ExcelProperty("备注") - private String remark; - - @ExcelProperty("价格")// float(8,3) - private String price; - - @ExcelProperty("单位") - private String unit; - - @ExcelProperty("上传结果") - private String result; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsPageReqVO.java deleted file mode 100644 index 9f359135f..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsPageReqVO.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.parts.vo; - -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.manage.validation.parts.PartsNumberValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.Size; -import java.time.LocalDateTime; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -/** - * 查询 - */ -@Schema(description = "管理后台 - 配件分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PartsPageReqVO extends PageParam { - - @Schema(description = "设计端商品ID", example = "26589") - @Size(max = 32, message = "配件编号长度不能超过32个字符") - private String goodsId; - - @Schema(description = "配件名称", example = "张三") - @Size(max = 64, message = "配件名称长度不能超过64个字符") - private String name; - - @Schema(description = "颜色") - @Size(max = 32, message = "颜色长度不能超过32个字符") - private String color; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板") - @Size(max = 64, message = "材质长度不能超过64个字符") - private String material; - - @Schema(description = "配件类型", example = "2") - @Size(max = 32, message = "配件类型长度不能超过323个字符") - private String category; - - @Schema(description = "配件子类", example = "2") - @Size(max = 64, message = "配件子类长度不能超过64个字符") - private String type; - - @Schema(description = "型号") - @Size(max = 64, message = "配件型号长度不能超过64个字符") - private String model; - - @Schema(description = "规格") - @Size(max = 64, message = "配件规格不能超过64个字符") - private String spec; - - @Schema(description = "价格") - @PartsNumberValid(name = "价格") - private Double[] price; - - @Schema(description = "宽度") - @PartsNumberValid(name = "宽度") - private Double[] width; - - @Schema(description = "长度") - @PartsNumberValid(name = "长度") - private Double[] length; - - @Schema(description = "厚度") - @PartsNumberValid(name = "厚度") - private Double[] thickness; - - @Schema(description = "品牌") - @Size(max = 64, message = "配件品牌不能超过64个字符") - private String brand; - - @Schema(description = "厂家") - @Size(max = 128, message = "厂家长度不能超过64个字符") - private String factory; - - @Schema(description = "单位") - @Size(max = 32, message = "单位长度不能超过64个字符") - private String unit; - - @Schema(description = "是否复合部件：0 否 1 是") - private Boolean isComposite; - - @Schema(description = "子配件ID列表,复合部件时记录子配件ID,半角逗号分隔", example = "你说的对") - @Size(max = 255, message = "子配件列表长度不能超过255个字符") - private String subparts; - - @Schema(description = "备注", example = "你说的对") - @Size(max = 255, message = "备注长度不能超过255个字符") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - private Long organId; - - @Schema(description = "排序", example = "ascend") - private String order; - - @Schema(description = "排序字段", example = "id") - private String field; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsRespVO.java deleted file mode 100644 index 5c71cc601..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsRespVO.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.parts.vo; - -import com.cf.imes.framework.common.validation.NumberValid; -import com.cf.imes.framework.excel.core.annotations.DictFormat; -import com.cf.imes.framework.excel.core.convert.DictConvert; -import com.cf.imes.module.manage.enums.DictTypeConstants; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - -@Schema(description = "管理后台 - 配件 Response VO") -@Data -@ExcelIgnoreUnannotated -public class PartsRespVO { - - @Schema(description = "配件 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11238") - @ExcelProperty("配件ID") - @ExcelIgnore - private Long id; - - @Schema(description = "设计端商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26589") - @ExcelProperty("配件编号") - private String goodsId; - - @Schema(description = "是否复合部件：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty(value = "是否复合部件", converter = DictConvert.class) - @DictFormat(DictTypeConstants.BOOLEAN_STRING) - private Boolean isComposite; - - @Schema(description = "子配件ID列表,复合部件时记录子配件ID,半角逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") -// @ExcelProperty("子配件ID列表") - @ExcelIgnore - private String subparts; - - @Schema(description = "配件类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("配件类型") - @DictFormat(DictTypeConstants.PART_CATEGORY) - private String category; - - @Schema(description = "配件子类", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("配件子类") - private String type; - - @Schema(description = "配件名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") - @ExcelProperty("配件名称") - private String name; - - @Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("型号") - private String model; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("材质") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @Size(max = 32, message = "颜色长度不能超过32个字符") - @ExcelProperty("颜色") - private String color; - - @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("单位") - private String unit; - - @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("规格") - private String spec; - - @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("品牌") - private String brand; - - @Schema(description = "厂家", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("厂家") - private String factory; - - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "宽度") - @ExcelProperty("宽度") - private Double width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "长度") - @ExcelProperty("长度") - private Double length; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "厚度") - @ExcelProperty("厚度") - private Double thickness; - - @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "价格") - @ExcelProperty("价格") - private Double price; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsSaveReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsSaveReqVO.java deleted file mode 100644 index 68f049098..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsSaveReqVO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.parts.vo; - -import com.cf.imes.framework.common.validation.NumberValid; -import com.cf.imes.module.manage.validation.parts.PartsCategoryValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import javax.validation.constraints.*; - -@Schema(description = "管理后台 - 配件 新增/修改 Request VO") -@Data -public class PartsSaveReqVO { - - @Schema(description = "配件 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11238") - private Long id; - - @Schema(description = "设计端商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26589") - @NotEmpty(message = "设计端商品ID不能为空") - @Size(max = 32, message = "设计端商品ID长度不能超过32个字符") - private String goodsId; - - @Schema(description = "配件名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") - @NotEmpty(message = "配件名称不能为空") - @Size(max = 64, message = "配件名称长度不能超过64个字符") - private String name; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @Size(max = 32, message = "颜色长度不能超过32个字符") -// @NotEmpty(message = "颜色不能为空") - private String color; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotEmpty(message = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板不能为空") - @Size(max = 64, message = "材质长度不能超过64个字符") - private String material; - - @Schema(description = "配件类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "配件类型不能为空") - @Size(max = 32, message = "配件类型长度不能超过32个字符") - @PartsCategoryValid - private String category; - - @Schema(description = "配件子类", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @Size(max = 64, message = "配件子类长度不能超过64个字符") - private String type; - - @Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotEmpty(message = "型号不能为空") - @Size(max = 64, message = "型号长度不能超过64个字符") - private String model; - - @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "价格") - private Double price; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "宽度") - private Double width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "长度") - private Double length; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @NumberValid(name = "厚度") - private Double thickness; - - @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED) - @Size(max = 64, message = "规格长度不能超过64个字符") - private String spec; - - @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) - @Size(max = 64, message = "品牌长度不能超过64个字符") - private String brand; - - @Schema(description = "厂家", requiredMode = Schema.RequiredMode.REQUIRED) - @Size(max = 128, message = "厂家长度不能超过128个字符") - private String factory; - - @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotEmpty(message = "单位不能为空") - @Size(max = 32, message = "单位长度不能超过32个字符") - private String unit; - - @Schema(description = "是否复合部件：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotNull(message = "是否复合部件不能为空") - private Boolean isComposite; - - @Schema(description = "子配件ID列表,复合部件时记录子配件ID,半角逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") - @Size(max = 255, message = "子配件列表长度不能超过255个字符") - private String subparts; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") - @Size(max = 255, message = "备注长度不能超过255个字符") - private String remark; - - private Long organId; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/PatchingPlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/PatchingPlateController.java deleted file mode 100644 index 49d177836..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/PatchingPlateController.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.patching.vo.*; -import com.cf.imes.module.manage.service.patching.PatchingPlateService; -import com.cf.imes.module.manage.dal.dataobject.patching.MachineDO; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - - -@Tag(name = "管理后台 - 补板") -@RestController -@RequestMapping("/manage/patching") -@Validated -public class PatchingPlateController { - - - @Resource - private PatchingPlateService patchingPlateService; - - - - @GetMapping("/searchPage") - @Operation(summary = "批量加入补板查询") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult> patchingSearchPlate(@Valid PatchingPlatePageReqVO pageReqVO){ - - PageResult patchingPlateRespVOPageResult = patchingPlateService.patchingSearchPlate(pageReqVO); - - return success(patchingPlateRespVOPageResult); - - } - - - - - - @GetMapping("/searchPlate") - @Operation(summary = "查询详细的板件") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult> searchPlateDetail(@Valid PatchingPlatePageReqVO pageReqVO){ - - PageResult plateDetailsRespVOPageResult = patchingPlateService.searchPlateDetail(pageReqVO); - - return success(plateDetailsRespVOPageResult); - - } - - - - - - - @GetMapping("/searchPatchingList") - @Operation(summary = "加入的板件信息") - @Parameter(name = "plateId", description = "板件ID", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult searchPatchingList(@Valid @RequestParam("plateId") Long plateId){ - - return success(patchingPlateService.searchPatchingList(plateId)); - - - } - - - - - - - @GetMapping("/optimizeLayout") - @Operation(summary = "优化排版") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult> optimizeLayout(@Valid PatchingDetailReqVO reqVO){ - - List patchingDetailRespVOS = patchingPlateService.optimizeLayout(reqVO); - - return success(patchingDetailRespVOS); - - - } - - - - - - - - @PostMapping("/insertPatching") - @Operation(summary = "新增补板详情表") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult insertPatching(@Valid @RequestBody PatchingReqVO reqVO){ - - patchingPlateService.insertPatching(reqVO); - - return success(true); - - - } - - - - - - - - @GetMapping("/search") - @Operation(summary = "查询所有的机台") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult> searchMachine(){ - - return success(patchingPlateService.searchMachine()); - - } - - - - - - - @GetMapping("/searchPatchNC") - @Operation(summary = "导出 NC 所需要的数据") - @PreAuthorize("@ss.hasPermission('manage:patching:query')") - public CommonResult> searchPatchNC(@Valid PatchingDetailReqVO reqVO){ - - List patchingDetailRespVOS = patchingPlateService.optimizeLayout(reqVO); - - return success(patchingDetailRespVOS); - - } - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/DataRangeList.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/DataRangeList.java deleted file mode 100644 index 9eadde4e0..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/DataRangeList.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; - - -@Data -@ToString(callSuper = true) -public class DataRangeList implements Serializable { - - private static final long serialVersionUID = -5467901878313885959L; - - // 最大值 - private Long maxaa; - - // 最小值 - private Long minbb; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/MachineRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/MachineRespVO.java deleted file mode 100644 index 592996a3f..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/MachineRespVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - Response VO") -@Data -public class MachineRespVO { - - - @Schema(description = "机台主键ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; - - - @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; - - @Schema(description = "机台类型", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean machineType; - - @Schema(description = "标签id", requiredMode = Schema.RequiredMode.REQUIRED) - private Long labelId; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - - - @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED) - private String creator; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailReqVO.java deleted file mode 100644 index bf6acfb78..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import java.util.List; - -@Schema(description = "管理后台 - 优化排版 Request VO") -@Data -@ToString(callSuper = true) -public class PatchingDetailReqVO { - - - @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) - private List plateIdList; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailRespVO.java deleted file mode 100644 index e26fc290e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailRespVO.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 补板详情 Response VO") -@Data -public class PatchingDetailRespVO { - - - @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String roomName; - - @Schema(description = "房间ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long roomId; - - @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String cabinetName; - - @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long bodyId; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String color; - - - - // 需要添加的额外字段 - @Schema(description = "板件组合名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String plateCombinationName; - - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long customOrderId; - - @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED) - private String customer; - - @Schema(description = "地址", requiredMode = Schema.RequiredMode.REQUIRED) - private String address; - - - - // 用于进行判断是否为异形等 - @Schema(description = "异形数量", requiredMode = Schema.RequiredMode.REQUIRED) - private String specialShaped; - - @Schema(description = "造型数量", requiredMode = Schema.RequiredMode.REQUIRED) - private String profiling; - - @Schema(description = "排孔数量", requiredMode = Schema.RequiredMode.REQUIRED) - private String rowHole; - - - - - - @Schema(description = "主键-板件ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderId; - - @Schema(description = "组织 ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long organId; - - @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; - - @Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String plateNo; - - @Schema(description = "板类型，0 层板 1 立板 2 背板", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer type; - - @Schema(description = "商品 ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long goodsId; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double width; - - @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double thickness; - - @Schema(description = "拆单宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double splitWidth; - - @Schema(description = "拆单高度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double splitHeight; - - @Schema(description = "拆单厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double splitThickness; - - @Schema(description = "左封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double sealLeft; - - @Schema(description = "右封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double sealRight; - - @Schema(description = "上封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double sealUp; - - @Schema(description = "下封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double sealDown; - - @Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED) - private Double area; - - @Schema(description = "纹路类型，0 正纹 1 可翻转 2 反纹", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer texture; - - @Schema(description = "孔面类型，0 正面 1 反面 2 侧面", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer holeFace; - - @Schema(description = "排孔类型，0 正纹 1 反面 2 随意面", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer holeArrange; - - @Schema(description = "异型孔数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer unregularPointCount; - - @Schema(description = "正面孔数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer frontHoleCount; - - @Schema(description = "背面孔数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer backHoleCount; - - @Schema(description = "侧面孔数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer sideHoleCount; - - @Schema(description = "正面造型量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer frontModelCount; - - @Schema(description = "背面造型量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer backModelCount; - - @Schema(description = "是否门板", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean isDoor; - - @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer openDoorType; - - @Schema(description = "异型偏移 x", requiredMode = Schema.RequiredMode.REQUIRED) - private Float offsetX; - - @Schema(description = "异型偏移 y", requiredMode = Schema.RequiredMode.REQUIRED) - private Float offsetY; - - @Schema(description = "是否孤形对角", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean isArcAcross; - - @Schema(description = "模块类型 ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long moduleTypeId; - - @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", requiredMode = Schema.RequiredMode.REQUIRED) - private String filterType; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) - private String remark; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingPlatePageReqVO.java deleted file mode 100644 index a9aba49b0..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingPlatePageReqVO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.core.util.Json; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.apache.ibatis.type.TypeHandler; - -import java.util.HashMap; -import java.util.List; - -@Schema(description = "管理后台 - 补板 分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PatchingPlatePageReqVO extends PageParam { - - - - @Schema(description = "订单号") - private Long orderNo; - - - - - @Schema(description = "自定义单号") - private String customOrderNo; - - - - - @Schema(description = "状态-生产中，加工完成，打包完成", requiredMode = Schema.RequiredMode.REQUIRED,example = "3,4,5") - private List statusList; - - - - - @Schema(description = "客户") - private String customer; - - - - - @Schema(description = "收货地址") - private String address; - - - - @Schema(description = "开始时间"/*, requiredMode = Schema.RequiredMode.REQUIRED*/) - private String startTime; - - - - @Schema(description = "结束时间"/*, requiredMode = Schema.RequiredMode.REQUIRED*/) - private String endTime; - - - - - @Schema(description = "矩形") - private Boolean isRectangle; - - - - - @Schema(description = "异形") - private Boolean isSpecialShaped; - - - - - @Schema(description = "造型") - private Boolean isProfiling; - - - - - @Schema(description = "有挖穿造型") - private Boolean isDigThrough; - - - - - @Schema(description = "有挖穿孔") - private Boolean isDiggingHoles; - - - - - @Schema(description = "有二维刀路") - private Boolean is2DCuttingPath; - - - - - @Schema(description = "门板") - private Boolean isDoor; - - - - - @Schema(description = "长范围") - @TableField(typeHandler = JacksonTypeHandler.class) - private List longRangeList; - - - - - @Schema(description = "宽范围") - private List WidthRangeList; - - - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingPlateRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingPlateRespVO.java deleted file mode 100644 index 6a66690f8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingPlateRespVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 补板 Response VO") -@Data -public class PatchingPlateRespVO { - - @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderId; - - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long customOrderId; - - @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED) - private String customer; - - @Schema(description = "地址", requiredMode = Schema.RequiredMode.REQUIRED) - private String address; - - @Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderStatus; - - @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long groupId; - - @Schema(description = "板件显示名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String plateName; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String color; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double thickness; - - @Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED) - private Double area; - - @Schema(description = "板件数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long plateNum; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingReqVO.java deleted file mode 100644 index f0c567702..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingReqVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.patching.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import java.util.List; - - -@Schema(description = "管理后台 - 新增补板详情 Request VO") -@Data -@ToString(callSuper = true) -public class PatchingReqVO { - - - @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) - private List idList; - - @Schema(description = "计划ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long planId; - - - @Schema(description = "机台", requiredMode = Schema.RequiredMode.REQUIRED) - private Long machineId; - - -/* @Schema(description = "板材详情", requiredMode = Schema.RequiredMode.REQUIRED) - private String detail;*/ - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.http b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.http deleted file mode 100644 index 0fe7c6dd8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.http +++ /dev/null @@ -1,4 +0,0 @@ -### 请求 /manage/plate 接口 => 没有权限 -GET {{baseUrl}}/system/plate -Authorization: Bearer {{token}} -organ-id: {{adminTenentId}} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java deleted file mode 100644 index 7220214c8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.excel.core.util.ExcelUtils; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateRespVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateSaveReqVO; -import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; -import com.cf.imes.module.manage.service.plate.PlateExcelListener; -import com.cf.imes.module.manage.service.plate.PlateService; -import com.cf.imes.module.manage.util.file.ExcelReadUtil; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT; - -@Tag(name = "管理后台 - 板材库管理") -@RestController -@RequestMapping("/manage/plate") -@Validated -public class PlateController { - - @Resource - private PlateService plateService; - - final String IMPORT_TEMPLATE = "板材导入模板.xlsx"; - - @PostMapping("/create") - @Operation(summary = "创建板材信息") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:create','base:plate:create')") - public CommonResult createPlate(@Valid @RequestBody PlateSaveReqVO createReqVO) { - return success(plateService.createPlate(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新板材信息") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:update','base:plate:update')") - public CommonResult updatePlate(@Valid @RequestBody PlateSaveReqVO updateReqVO) { - plateService.updatePlate(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除板材信息") - @Parameters({ - @Parameter(name = "id", description = "编号", required = true, example = "1024"), - @Parameter(name = "organId", description = "板材所属组织ID", example = "1024") - }) - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:delete','base:plate:delete')") - public CommonResult deletePlate(@RequestParam("id") Long id, - @RequestParam(value = "organId",required = false, defaultValue = "0") Long organId) { - plateService.deletePlate(id,organId); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得板材信息") - @Parameters({ - @Parameter(name = "id", description = "编号", required = true, example = "1024"), - @Parameter(name = "organId", description = "板材所属组织ID", required = true, example = "1024") - }) - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:update','base:plate:update')") - public CommonResult getPlate(@RequestParam("id") Long id, - @RequestParam("organId") Long organId) { - PlateDO plate = plateService.getPlate(id, organId); - return success(BeanUtils.toBean(plate, PlateRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得板材信息分页") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") - public CommonResult> getPlatePage(@Valid PlatePageReqVO pageReqVO) { - PageResult pageResult = plateService.getPlatePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PlateRespVO.class)); - } - - @GetMapping("/webcad/page") - @Operation(summary = "webcad获得板材信息分页") - public CommonResult> webCadGetPlatePage(@Valid PlatePageReqVO pageReqVO) { - PageResult pageResult = plateService.webCadGetPlatePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PlateRespVO.class)); - } - - @GetMapping("/export") - @Operation(summary = "导出板材信息") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')") - @OperateLog(type = EXPORT) - public void exportPlateExcel(@Valid PlatePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = plateService.getPlatePage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "板材信息表.xls", "数据", PlateRespVO.class, - BeanUtils.toBean(list, PlateRespVO.class)); - } - - @GetMapping("/get-import-template") - @Operation(summary = "获得导入用户模板") - @PreAuthorize("@ss.hasAnyPermissions('system:plate:export-template','base:plate:export-template')") - public void importTemplate(HttpServletResponse response) throws IOException { -// // 手动创建导出 demo -// List list = Arrays.asList( -// PlateImportExcelVO.builder().goodsId("BD10010001").goodsName("18mm-多层板-暖白").material("多层板").width(String.valueOf(1220)).height(String.valueOf(2440)) -// .thickness(String.valueOf(18)).brand("AAA").spec("2440*1220*18").color("暖白").price("120").texture("无").build(), -// PlateImportExcelVO.builder().goodsId("BD10010002").goodsName("18mm-颗粒板-高级灰").material("多层板").width(String.valueOf(1220)).height(String.valueOf(2750)) -// .thickness(String.valueOf(18)).brand("鸿达树").spec("2750*1220*18").color("高级灰").price("120").texture("无").build() -// ); -// // 输出 -// ExcelUtils.write(response, IMPORT_TEMPLATE, "板材列表", PlateImportExcelVO.class, list); - - plateService.exportTemplate(response, "excel_plate_add.xlsx"); - } - -// @GetMapping("/get-import-template") -// @Operation(summary = "获得导入板材模板") -// @Parameter(name = "value", description = "文件类型", required = true, example = "0") -// public void importTemplate(HttpServletResponse response, @RequestParam("value") @NotEmpty(message = "文件路径不能为空") String value) { -// plateService.exportTemplate(response, value); -// } - - @PostMapping("/import") - @Operation(summary = "导入板材") - @Parameters({ - @Parameter(name = "file", description = "Excel 文件", required = true), - @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true"), - @Parameter(name = "organId", description = "板材所属组织ID") - }) - @OperateLog(type = IMPORT) -// @PreAuthorize("@ss.hasPermission('manage:plate:import')") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:import','base:plate:import')") - public void importExcel(@RequestParam("file") MultipartFile file, - @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport, - @RequestParam(value = "organId") Long organId, - HttpServletResponse response) throws Exception { - ExcelReadUtil excelReadUtil = new ExcelReadUtil(); - PlateExcelListener listener = new PlateExcelListener(); - List list = excelReadUtil.read(file, PlateImportExcelVO.class, listener); - -// 判断文件是否导入成功 - if (!excelReadUtil.getFlag()) - ExcelUtils.write(response, IMPORT_TEMPLATE, "板材列表", PlateImportExcelVO.class, list); - else { - if (list.isEmpty()){ - PlateImportExcelVO plateImportExcelVO = PlateImportExcelVO.builder().result("导入失败，请保证导入文件中包含板材数据").build(); - list.add(plateImportExcelVO); - ExcelUtils.write(response, IMPORT_TEMPLATE, "板材列表", PlateImportExcelVO.class, list); - }else { - plateService.importPlateList(list, updateSupport, organId);// 成功，批量导入 - } - } - -// plateExcelUtil.clear(); - } - - - @GetMapping("/webcad/all") - @Operation(summary = "获取全部板材信息") - public CommonResult> webCadGetPlateAll() { - List list = plateService.getPlateAll(); - return success(BeanUtils.toBean(list, PlateRespVO.class)); - } - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java deleted file mode 100644 index 07d167d75..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.excel.core.util.ExcelUtils; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateRespVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateSaveReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateUptReqVO; -import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO; -import com.cf.imes.module.manage.service.remainplaten.RemainPlateService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import java.util.Set; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; - -@Tag(name = "管理后台 - 余料管理") -@RestController -@RequestMapping("/manage/remain-plate") -@Validated -public class RemainPlateController { - - @Resource - private RemainPlateService remainPlateService; - - @PostMapping("/create") - @Operation(summary = "添加余料（单个）") - @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:create','placeorder:optimize')") - public CommonResult createRemainPlate(@Valid @RequestBody RemainPlateSaveReqVO createReqVO) { - return success(remainPlateService.createRemainPlate(createReqVO)); - } - - @PostMapping("/createMultiple") - @Operation(summary = "创建生产单余料板表(多个)") - @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:create','placeorder:optimize')") - public CommonResult createRemainPlateMultiple(@Valid @RequestBody Set createReqVOS) { - return success(remainPlateService.createRemainPlateMultiple(createReqVOS)); - } - - @PutMapping("/update") - @Operation(summary = "余料修改") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:update')") - public CommonResult updateRemainPlate(@Valid @RequestBody RemainPlateSaveReqVO updateReqVO) { - remainPlateService.updateRemainPlate(updateReqVO); - return success(true); - } - - @PutMapping("/updateStatus") - @Operation(summary = "余料板批量核销") - @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:update','manage:remain-plate:write-off')") - public CommonResult updateRemainPlate(@RequestBody RemainPlateUptReqVO updateReqVO) { - remainPlateService.updateRemainPlateStatus(updateReqVO.getIds(), - updateReqVO.getStatus(), - updateReqVO.getUseType(), - updateReqVO.getPlanId()); - return success(true); - } - - @PutMapping("/revertUpdate") - @Operation(summary = "余料板批量释放") - @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:update','manage:remain-plate:release')") - public CommonResult revertRemainPlate(@RequestBody RemainPlateUptReqVO updateReqVO) { - remainPlateService.revertRemainPlateStatus(updateReqVO.getIds(),updateReqVO.getStatus()); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除余料") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('manage:remain-plate:delete')") - public CommonResult deleteRemainPlate(@RequestParam("id") Set ids) { - remainPlateService.deleteRemainPlate(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得生产单余料板表") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:query')") - public CommonResult getRemainPlate(@RequestParam("id") Long id) { - RemainPlateDO remainPlate = remainPlateService.getRemainPlate(id); - return success(BeanUtils.toBean(remainPlate, RemainPlateRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得生产单余料板表分页") - @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:query','placeorder:optimize','placeorder:remain-insert','production:manager-list:calculate')") - public CommonResult> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) { - PageResult pageResult = remainPlateService.getRemainPlatePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class)); - } - - @GetMapping("/pageAdd") - @Operation(summary = "获得生产单余料板可添加分页") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:query')") - public CommonResult> getRemainPlatePageToAdd(@Valid RemainPlatePageReqVO pageReqVO) { - PageResult pageResult = remainPlateService.getRemainPlatePageToAdd(pageReqVO); - return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出生产单余料板表Excel") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:export')") - @OperateLog(type = EXPORT) - public void exportRemainPlateExcel(@Valid RemainPlatePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = remainPlateService.getRemainPlatePage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "生产单余料板表 order_remain_plate_{N}.xls", "数据", RemainPlateRespVO.class, - BeanUtils.toBean(list, RemainPlateRespVO.class)); - } - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java deleted file mode 100644 index 04813b5da..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.plate; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.cf.imes.framework.excel.core.annotations.DictFormat; -import com.cf.imes.framework.excel.core.convert.DictConvert; -import com.cf.imes.module.manage.enums.DictTypeConstants; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; - -/** - * 用户 Excel 导入 VO - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 -public class PlateImportExcelVO { - - @ExcelProperty("*物料编号") - @NotEmpty(message = "物料编号不能为空") - private String goodsId; - - @ExcelProperty("*物料名称") - @NotEmpty(message = "物料名称不能为空") - private String goodsName; - - @ExcelProperty("*材质") - @NotEmpty(message = "材质不能为空") - private String material; - - @ExcelProperty("*颜色") - @NotEmpty(message = "颜色不能为空") - private String color; - - @ExcelProperty(value = "纹理") - @ColumnWidth(10) - private String texture; - - @ExcelProperty("宽度") - @ColumnWidth(10) - @NotEmpty(message = "宽度不能为空") - private String width; - - @ExcelProperty("高度")// float(8,3) - @ColumnWidth(10) - @NotEmpty(message = "高度不能为空") - private String height; - - @ExcelProperty("*厚度") - @ColumnWidth(10) - @NotEmpty(message = "厚度不能为空") - private String thickness; - - @ExcelProperty("规格") - @NotEmpty(message = "规格不能为空") - private String spec; - - @ExcelProperty("备注") - private String remark; - - @ExcelProperty("品牌") - @NotEmpty(message = "品牌不能为空") - private String brand; - - @ExcelProperty("价格") - @NotEmpty(message = "价格不能为空") - private String price; - - @ExcelProperty("上传结果") - private String result; - - public boolean isValidGoods() { - return !(goodsId == null || goodsId.isEmpty() || goodsName == null || goodsName.isEmpty() || material == null || - material.isEmpty() || color == null || color.isEmpty() ||thickness.isEmpty() ); - } - -// 数据长度判断 - public boolean checkPrecision(Double number) { - if (number == null) { - return false; - } - // 将浮点数转换成字符串 - String numberStr = Double.toString(number); - - // 分割整数部分和小数部分 - String[] parts = numberStr.split("\\."); - String integerPart = parts[0]; - String decimalPart = parts.length > 1 ? parts[1] : ""; - - // 检查整数部分位数 - if (integerPart.length() > 5) { - return false; - } - - // 检查小数部分位数 - if (decimalPart.length() > 3) { - return false; - } - - return true; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportRespVO.java deleted file mode 100644 index f7339328d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportRespVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.plate; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @projectName: cf_imes_back - * @author: 晨丰科技 - * @date: 2024/2/27 16:36 - */ - -@Schema(description = "管理后台 - 板材信息表 plate_{N}导入 Response VO") -@Data -@Builder -public class PlateImportRespVO { - @Schema(description = "创建成功的板材数组", requiredMode = Schema.RequiredMode.REQUIRED) - private List createPlateNames; - - @Schema(description = "更新成功的板材数组", requiredMode = Schema.RequiredMode.REQUIRED) - private List updatePlateNames; - - @Schema(description = "导入失败的板材集合，key 为板材名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED) - private Map failurePlateNames; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java deleted file mode 100644 index d208b4923..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.plate; - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.Size; -import java.time.LocalDateTime; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 板材信息表 plate_{N}分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PlatePageReqVO extends PageParam { - - @Schema(description = "客户的商品编号", example = "1") - @Size(max = 32, message = "商品编号长度不能超过32个字符") - private String goodsId; - - @Schema(description = "商品名称", example = "赵六") - @Size(max = 64, message = "商品名称长度不能超过64个字符") - private String goodsName; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板") - @Size(max = 64, message = "材质长度不能超过64个字符") - private String material; - - @Schema(description = "颜色") - @Size(max = 32, message = "颜色长度不能超过32个字符") - private String color; - - @Schema(description = "纹理") - private Boolean texture; - - @Schema(description = "宽度") - private Double width; - - @Schema(description = "高度") - private Double height; - - @Schema(description = "厚度") - private Double thickness; - - @Schema(description = "价格", example = "3380") - private Double price; - - @Schema(description = "品牌") - @Size(max = 64, message = "品牌长度不能超过64个字符") - private String brand; - - @Schema(description = "规格") - @Size(max = 64, message = "规格长度不能超过64个字符") - private String spec; - - @Schema(description = "备注", example = "随便") - @Size(max = 255, message = "备注长度不能超过255个字符") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - private Long organId; - - @Schema(description = "排序", example = "ascend") - private String order; - - @Schema(description = "排序字段", example = "id") - private String field; -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateRespVO.java deleted file mode 100644 index f68651ee4..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateRespVO.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.plate; - -import com.cf.imes.framework.excel.core.annotations.DictFormat; -import com.cf.imes.framework.excel.core.convert.DictConvert; -import com.cf.imes.module.manage.enums.DictTypeConstants; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 板材信息表 plate_{N} Response VO") -@Data -@ExcelIgnoreUnannotated -public class PlateRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelIgnore - private Long id; - - @Schema(description = "客户的商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("商品编号") - private String goodsId; - - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") - @ExcelProperty("商品名称") - private String goodsName; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("材质") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("颜色") - private String color; - - @Schema(description = "纹理", example = "有") - @ExcelProperty(value = "纹理", converter = DictConvert.class) - @DictFormat(DictTypeConstants.PLATE_TEXTURE) - private Boolean texture; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("宽度") - private Double width; - - @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("高度") - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("厚度") - private Double thickness; - - @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "3380") - @ExcelProperty("价格") - private Double price; - - @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("品牌") - private String brand; - - @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("规格") - private String spec; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelIgnore - private LocalDateTime createTime; - - private Long organId; -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java deleted file mode 100644 index cb40dd654..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.plate; - -import com.cf.imes.framework.common.validation.NumberValid; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -@Schema(description = "管理后台 - 板材信息表 plate_{N}新增/修改 Request VO") -@Data -public class PlateSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long id; - - @Schema(description = "客户的商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotEmpty(message = "客户的商品编号不能为空") - @Size(max = 32, message = "商品编号长度不能超过32个字符") - private String goodsId; - - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") - @NotEmpty(message = "商品名称不能为空") - @Size(max = 64, message = "商品名称长度不能超过64个字符") - private String goodsName; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板不能为空") - @Size(max = 64, message = "材质长度不能超过64个字符") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "颜色不能为空") - @Size(max = 32, message = "颜色长度不能超过32个字符") - private String color; - - @Schema(description = "纹理", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotNull(message = "纹理不能为空") - private Boolean texture; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotNull(message = "宽度不能为空") - @NumberValid(name = "宽度") - private Double width; - - @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotNull(message = "高度不能为空") - @NumberValid(name = "高度") - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "厚度不能为空") - @NumberValid(name = "厚度") - private Double thickness; - - @Schema(description = "价格", example = "3380") - @NumberValid(name = "价格") - private Double price; - - @Schema(description = "品牌") - @Size(max = 64, message = "品牌长度不能超过64个字符") - private String brand; - - @Schema(description = "规格") - @Size(max = 64, message = "规格长度不能超过64个字符") - private String spec; - - @Schema(description = "备注", example = "随便") - @Size(max = 255, message = "备注长度不能超过255个字符") - private String remark; - - private Long organId; -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java deleted file mode 100644 index aade9354d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.remain; - -import com.cf.imes.framework.common.validation.NumberValid; -import com.cf.imes.module.manage.validation.common.ValidCommonStatus; -import com.cf.imes.module.manage.validation.placeStyle.ValidPlaceStyle; -import com.cf.imes.module.manage.validation.type.ValidTypeField; -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.cf.imes.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N}分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class RemainPlatePageReqVO extends PageParam { - - @Schema(description = "ID", example = "16628") - @Pattern(regexp = "^[0-9]*$",message = "余料号应为数字") - private String id; - - @Schema(description = "排单 ID", example = "16628") - @Pattern(regexp = "^[0-9]*$",message = "使用排单号应为数字") - private String planId; - - @Schema(description = "组织id", example = "1") - private Long organId; - - @Schema(description = "初始排单 ID", example = "6628") - @Pattern(regexp = "^[0-9]*$",message = "排单号应为数字") - private String initPlanId; - - @Schema(description = "余料板状态，0未使用，1使用中", example = "0") - @ValidCommonStatus - private Integer status; - - @Schema(description = "是否为开料添加，0否，1是", example = "0") - private Boolean isCutting; - - @Schema(description = "使用类型，0核销，1排单，2补板", example = "0") - @ValidTypeField - private Integer useType; - - @Schema(description = "商品 ID", example = "7425") - @Size(max = 32, message = "商品ID长度不能超过32个字符") - private String goodsId; - - @Schema(description = "商品名", example = "晨丰") - @Size(max = 255, message = "商品名长度不能超过255个字符") - private String name; - - @Schema(description = "材料") - @Size(max = 50, message = "材料长度不能超过50个字符") - private String material; - - @Schema(description = "颜色") - @Size(max = 50, message = "颜色长度不能超过50个字符") - private String color; - - @Schema(description = "纹理") - private Boolean texture; - - @Schema(description = "宽度") - private BigDecimal[] width; - - @Schema(description = "长度") - private BigDecimal[] length; - - @Schema(description = "厚度") - @NumberValid(name = "厚度") - private BigDecimal thickness; - - @Schema(description = "品牌") - @Size(max = 50, message = "品牌长度不能超过50个字符") - private String brand; - - @Schema(description = "放置样式，0正面，1正面右转，2正面后转，3正面左转，4反面，5反面右转，6反面后转，7反面左转") - @ValidPlaceStyle - private Integer placeStyle; - - @Schema(description = "仓库名") - @Size(max = 64, message = "品牌长度不能超过64个字符") - private String store; - - @Schema(description = "数量", example = "18318") - private Integer count; - - @Schema(description = "备注", example = "随便") - @Size(max = 255, message = "品牌长度不能超过255个字符") - private String remark; - - @Schema(description = "轮廊数据，Json 串") - private String outLineJson; - - @Schema(description = "创建日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @Schema(description = "排序", example = "ascend") - private String order; - - @Schema(description = "排序字段", example = "id") - private String field; -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java deleted file mode 100644 index a5c0c1b90..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.remain; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -import javax.validation.constraints.NotEmpty; - -@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N} Response VO") -@Data -@ExcelIgnoreUnannotated -public class RemainPlateRespVO { - - @Schema(description = "余料板 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16470") - @ExcelProperty("余料板 ID") - private Long id; - - @Schema(description = "组织id", example = "1") - @ExcelIgnore - private Long organId; - - @Schema(description = "排单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16628") - @ExcelProperty("排单 ID") - private Long planId; - - @Schema(description = "初始排单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6628") - @ExcelProperty("初始排单 ID") - private Long initPlanId; - - @Schema(description = "余料板状态，0未使用，1使用中", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("余料板状态，0未使用，1使用中") - private Integer status; - - @Schema(description = "是否为开料添加，0否，1是", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("是否为开料添加，0否，1是") - private Boolean isCutting; - - @Schema(description = "使用类型，0核销，1排单，2补板", example = "0") - @ExcelProperty("使用类型，0核销，1排单，2补板") - private Integer useType; - - @Schema(description = "商品 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7425") - @ExcelProperty("商品 ID") - private String goodsId; - - @Schema(description = "商品名", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰") - @ExcelProperty("商品名") - private String name; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("材料") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("颜色") - private String color; - - @Schema(description = "纹理 有 无", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("纹理 有 无") - private Boolean texture; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("宽度") - private BigDecimal width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("长度") - private BigDecimal length; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("厚度") - private BigDecimal thickness; - - @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("品牌") - private String brand; - - @Schema(description = "放置样式，0正面，1正面右转，2正面后转，3正面左转，4反面，5反面右转，6反面后转，7反面左转", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("放置样式，0正面，1正面右转，2正面后转，3正面左转，4反面，5反面右转，6反面后转，7反面左转") - private Integer placeStyle; - - @Schema(description = "仓库名", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("仓库名") - private String store; - - @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318") - @ExcelProperty("数量") - private Integer count; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "轮廊数据，Json 串", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("轮廊数据，Json 串") - private String outLineJson; - - @Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建日期") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java deleted file mode 100644 index 7804eb064..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.remain; - -import com.cf.imes.framework.common.validation.NumberValid; -import com.cf.imes.module.manage.validation.common.ValidCommonStatus; -import com.cf.imes.module.manage.validation.placeStyle.ValidPlaceStyle; -import com.cf.imes.module.manage.validation.type.ValidTypeField; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.math.BigDecimal; - -@Schema(description = "管理后台 - 生产单余料板表 Request VO") -@Data -public class RemainPlateSaveReqVO { - - @Schema(description = "余料板 ID") - private Long id; - - @Schema(description = "组织id", example = "1") - private Long organId; - - @Schema(description = "排单 ID") - private Long planId; - - @Schema(description = "初始排单 ID") - private Long initPlanId; - - @Schema(description = "余料板状态，0未使用，1已使用", example = "1") - @ValidCommonStatus - private Integer status; - - @Schema(description = "是否为开料添加，0否，1是", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "是否为开料添加，0否，1是") - private Boolean isCutting; - - @Schema(description = "使用类型，0核销，1排单，2补板", example = "1") - @ValidTypeField - private Integer useType; - - @Schema(description = "商品 ID", example = "7425") - @Size(max = 32, message = "商品ID长度不能超过32个字符") - private String goodsId; - - @Schema(description = "商品名", example = "晨丰") - @Size(max = 255, message = "商品名长度不能超过255个字符") - private String name; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "材料不能为空") - @Size(max = 50, message = "材料长度不能超过50个字符") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "颜色不能为空") - @Size(max = 50, message = "颜色长度不能超过50个字符") - private String color; - - @Schema(description = "纹理 有 无", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean texture; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "宽度不能为空") - @NumberValid(name = "宽度") - private BigDecimal width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "长度不能为空") - @NumberValid(name = "长度") - private BigDecimal length; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "厚度不能为空") - @NumberValid(name = "厚度") - private BigDecimal thickness; - - @Schema(description = "品牌") - @Size(max = 50, message = "品牌长度不能超过50个字符") - private String brand; - - @Schema(description = "放置样式，0正面，1正面右转，2正面后转，3正面左转，4反面，5反面右转，6反面后转，7反面左转", example = "0") - @ValidPlaceStyle - private Integer placeStyle; - - @Schema(description = "仓库名") - @Size(max = 64, message = "仓库名长度不能超过64个字符") - private String store; - - @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318") - @NotNull(message = "数量不能为空") - private Integer count; - - @Schema(description = "备注", example = "随便") - @Size(max = 255, message = "备注长度不能超过255个字符") - private String remark; - - @Schema(description = "轮廊数据，Json 串", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318") - private String outLineJson; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateUpSaveVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateUpSaveVO.java deleted file mode 100644 index 6fd113cdd..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateUpSaveVO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.remain; - -import com.cf.imes.framework.common.validation.NumberValid; -import com.cf.imes.module.manage.validation.placeStyle.ValidPlaceStyle; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.math.BigDecimal; - -/** - * 余料修改字段 - */ -@Schema(description = "管理后台 - 余料修改字段 VO") -@Data -public class RemainPlateUpSaveVO { - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "宽度不能为空") - @NumberValid(name = "宽度") - private BigDecimal width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "长度不能为空") - @NumberValid(name = "长度") - private BigDecimal length; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "厚度不能为空") - @NumberValid(name = "厚度") - private BigDecimal thickness; - - @Schema(description = "纹理 有 无", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean texture; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "材料不能为空") - @Size(max = 50, message = "材料长度不能超过50个字符") - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "颜色不能为空") - @Size(max = 50, message = "颜色长度不能超过50个字符") - private String color; - - @Schema(description = "品牌") - @Size(max = 50, message = "品牌长度不能超过50个字符") - private String brand; - - @Schema(description = "仓库名") - @Size(max = 64, message = "品牌长度不能超过64个字符") - private String store; - - @Schema(description = "备注", example = "随便") - @Size(max = 255, message = "品牌长度不能超过255个字符") - private String remark; - - @Schema(description = "放置样式", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "余料放置样式不可为空") - @ValidPlaceStyle - private Integer placeStyle; - - @Schema(description = "轮廊数据，Json 串", requiredMode = Schema.RequiredMode.REQUIRED) - private String outLineJson; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateUptReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateUptReqVO.java deleted file mode 100644 index 9574722aa..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateUptReqVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.plate.vo.remain; - -import com.cf.imes.module.manage.validation.common.ValidCommonStatus; -import com.cf.imes.module.manage.validation.type.ValidTypeField; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Set; - -@Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N} Response VO") -@Data -public class RemainPlateUptReqVO { - - @Schema(description = "余料板集", example = "16470") - private Set ids; - - @Schema(description = "余料板状态，0未使用，1使用中", example = "1") - @ValidCommonStatus - private Integer status; - - @Schema(description = "使用类型，1核销，2排单，3补板", example = "0") - @ValidTypeField - private Integer useType; - - @Schema(description = "排单 ID", example = "6628") - private Long planId; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java deleted file mode 100644 index 6a23b5932..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.process.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderPlateRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.PlatePageVO; -import com.cf.imes.module.manage.service.process.ProductionProcessService; -import com.cf.imes.module.manage.service.query.ProductionStatusService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 生产单工序") -@RestController -@RequestMapping("/manage/process") -@Validated -public class ProductionProcessController { - - - @Resource - private ProductionProcessService productionProcessService; - - @Resource - private ProductionStatusService productionStatusService; - - - - - - @GetMapping("/page") - @Operation(summary = "查看生产工序分页") - @PreAuthorize("@ss.hasPermission('product:process:query')") - public CommonResult> getUserPage(@Valid ProcessPageReqVO pageReqVO) { - - return success(productionProcessService.getProcessPage(pageReqVO)); - - - } - - - - - @PutMapping("/update") - @Operation(summary = "修改生产工序明细和步骤表的状态") - @PreAuthorize("@ss.hasPermission('product:process:work')") - public CommonResult updateProcessStatus(@Valid @RequestBody OrderProcessStepItemVO reqVo){ - productionProcessService.updateProcessStatus(reqVo); - return success(true); - - } - - - - @GetMapping("/selectPlate") - @Operation(summary = "查看当前生产单的工序对应的板件信息") - @PreAuthorize("@ss.hasPermission('product:process:view')") - public CommonResult selectPlate(@Valid ProcessPlateReqVO reqVO){ - return success(productionProcessService.selectPlate(reqVO)); - } - - - - -// @GetMapping("/selectBodyName") -// @Operation(summary = "查询生产单对应的柜体名称") - public CommonResult> selectBodyName(@Valid OrderBodyReqVO reqVO){ - return success(productionProcessService.selectBodyName(reqVO)); - - } - - - - - -// @GetMapping("/selectPlateName") -// @Operation(summary = "查看板材信息的组合名称") -// @Parameter(name = "stepItemId", description = "工序明细ID", required = true, example = "1") -// @PreAuthorize("@ss.hasPermission('manage:process:query')") - public CommonResult> selectPlateName(@Valid @RequestParam("stepItemId") Long stepItemId){ - - - return success(productionProcessService.selectPlateName(stepItemId)); - - } - - - -// -// @GetMapping("/pagePlate") -// @Operation(summary = "查看板材信息分页") -// @PreAuthorize("@ss.hasPermission('manage:process:query')") - public CommonResult> queryPlate(@Valid PlatePageVO pageReqVO){ - return success(productionStatusService.getOrderPlatePage(pageReqVO)); - } - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java deleted file mode 100644 index 7829e71f1..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - - -@Schema(description = "管理后台 - 查询柜体信息") -@Data -@ToString(callSuper = true) -public class OrderBodyReqVO { - - - @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long processType; - - - @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long orderId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyRespVo.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyRespVo.java deleted file mode 100644 index 716583bb1..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyRespVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 查看订单柜体信息 Response VO") -@Data -public class OrderBodyRespVo { - - - @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long id; - - @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private String name; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java deleted file mode 100644 index f6372a5d4..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPlateReqVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - - -@Schema(description = "管理后台 - 查询生产单对应的板件信息 Response VO") -@Data -@NoArgsConstructor -@AllArgsConstructor -public class OrderPlateReqVO { - - -// @Schema(description = "柜体名称") -// private List bodyName; -// -// -// @Schema(description = "柜体ID") -// private List bodyIds; - - - @Schema(description = "柜体ID和名称") - List orderBodyRespVoList; - - - @Schema(description = "板件信息") - List plateDetails; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java deleted file mode 100644 index f360e4614..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 修改生产步骤表 ") -@Data -@ToString(callSuper = true) -public class OrderProStepReqVO { - - - @Schema(description = "工序步骤id", requiredMode = Schema.RequiredMode.REQUIRED) - private Long processStepId; - - - @Schema(description = "生产单工序ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderProcessId; - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderId; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java deleted file mode 100644 index f47489d82..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 生产单工序明细表 Request VO") -@Data -@ToString(callSuper = true) -public class OrderProcessReqVO { - - - @Schema(description = "工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "12") - private Long processStepId; - - @Schema(description = "工序状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") - private Boolean status; - - @Schema(description = "生产单工序ID",requiredMode = Schema.RequiredMode.REQUIRED, example = "1234") - private Long orderProcessId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java deleted file mode 100644 index f85fc0f03..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Schema(description = "管理后台 Response VO") -@Data -@NoArgsConstructor -@AllArgsConstructor -public class OrderProcessStepItemVO { - - -// @Schema(description = "生产单工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") -// private Long processStepItemId; - - - @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") - private Long processStepId; - - - @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private Long goodsId; - - - @Schema(description = "加工项名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String name; - - - -} - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java deleted file mode 100644 index d7da4fbd6..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/PlateDetails.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class PlateDetails { - - - - @Schema(description = "板编号") - private Long plateId; - - @Schema(description = "自定义板编号-板号") - private Long plateNo; - - @Schema(description = "长") - private Long length; - - @Schema(description = "宽") - private Long width; - - @Schema(description = "厚") - private Long thickness; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java deleted file mode 100644 index 358ba6d03..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 生产单表 分页 Request VO ") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class ProcessPageReqVO extends PageParam { - - - @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") - private Long processID; - - @Schema(description = "加工状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") - private Boolean processStatus; - -// @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") -// private Long type; - - @Schema(description = "生产单号") - private Long orderId; - - @Schema(description = "自定义单号") - private String customOrderNo; - - @Schema(description = "客户") - private String customer; - - @Schema(description = "地址") - private String address; - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java deleted file mode 100644 index 27e78bc91..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 查询板件") -@Data -@ToString(callSuper = true) -public class ProcessPlateReqVO { - - - @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED) - private Long processType; - - - @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderId; - - -// @Schema(description = "工序明细ID",requiredMode = Schema.RequiredMode.REQUIRED) -// private Long stepItemId; - - - @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") - private Long processStepId; - - - @Schema(description = "加工项名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String name; - - - @Schema(description = "柜体ID") - private Long bodyId; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java deleted file mode 100644 index d0f61d9f8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - - -@Schema(description = "管理后台 - 生产单表 order_{N} Response VO") -@Data -public class ProcessRespVO { - - @Schema(description = "主键-生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Long orderId; - - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String customOrderNo; - - - @Schema(description = "经销商", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String dealer; - - - @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private LocalDateTime deliveryDate; - - - @Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "0") - private Long status; - - - @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED,example = "张三") - private String customer; - - - @Schema(description = "客户地址", requiredMode = Schema.RequiredMode.REQUIRED,example = "AABB") - private String address; - - - @Schema(description = "客户电话", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String phoneNumber; - - - @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private Long goodsId; - - @Schema(description = "工序ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private Long processID; - - - @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123") - private Long processStepId; - - -// @Schema(description = "生产单工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123") -// private Long processStepItemId; - - @Schema(description = "工序类型", requiredMode = Schema.RequiredMode.REQUIRED,example = "123") - private Long processType; - - @Schema(description = "加工项名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String name; - - @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String stepName; - - @Schema(description = "加工人", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String manager; - - @Schema(description = "加工状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private Boolean processStatus; - - @Schema(description = "业务员", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String salesman; - - - @Schema(description = "拆单员", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") - private String splitter; - - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - - - - @Schema(description = "已打包数", requiredMode = Schema.RequiredMode.REQUIRED) - private Long packCount; - - - @Schema(description = "已打包片数", requiredMode = Schema.RequiredMode.REQUIRED) - private Long packPieceCount; - - - @Schema(description = "总片数", requiredMode = Schema.RequiredMode.REQUIRED) - private Long totalPieceCount; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java deleted file mode 100644 index 0ac22ef12..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import lombok.Data; - -import java.util.List; - -@Data -public class ProcessStepStatus { - - - // 生产单号 - private Long orderId; - - // 工序步骤表的状态 - private Boolean processStepStatus; - - // 工序明细表的状态 - private Boolean processStepItemStatus; - - // 工序ID - private Long processId; - - // 工序步骤表的类型 - private Integer type; - - // 柜体id - private List bodyId; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepVo.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepVo.java deleted file mode 100644 index f1793614e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "更改状态") -@Data -@ToString(callSuper = true) -public class ProcessStepVo { - - - @Schema(description = "步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "3344") - private Long id; - - @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean Status; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/UserProcessRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/UserProcessRespVO.java deleted file mode 100644 index 6030052a0..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/UserProcessRespVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.process.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 工序信息表 Response VO") -@Data -public class UserProcessRespVO { - - @Schema(description = "主键-工序ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Long id; - - @Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Long organId; - - @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private String name; - - @Schema(description = "计件工资", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Double pieceRate; - - @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Long pieceType; - - @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Long type; - - - @Schema(description = "是否推送终端客户：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Boolean isCustom; - - - @Schema(description = "是否推送经销商：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Boolean isDealer; - - - @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Long sort; - - - @Schema(description = "小时产量", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Double hourCapacity; - - - @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private String unit; - - - @Schema(description = "是否启用：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private Boolean isEnabled; - - - @Schema(description = "准备时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private String prepareTime; - - - @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") - private String description; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java deleted file mode 100644 index 53cbe601d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PrintOrderRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.*; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRatePageReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.service.query.ProductionStatusService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 生产查询") -@RestController -@RequestMapping("/manage/query") -@Validated -public class ProductionStatusController { - - - @Resource - private ProductionStatusService productionStatusService; - - - -// @GetMapping("/page") -// @Operation(summary = "生产状态查询分页") -// @PreAuthorize("@ss.hasPermission('manage:query:query')") - public CommonResult> pageProductionStatus(@Valid OrderPlatePageReqVO pageReqVO){ - PageResult pageResult = productionStatusService.getProductionPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ProcessRespVO.class)); - } - - - - - @GetMapping("/select") - @Operation(summary = "查看生产单下的工序组工序") - @Parameter(name = "orderNo", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasPermission('production:manager-list:processStatus')") - public CommonResult> selectProduction(@Valid @RequestParam("orderNo") Long orderNo){ - - List orderProcessById = productionStatusService.selectProduction(orderNo); - - return CommonResult.success(orderProcessById); - - } - - - - - -// @GetMapping("/selectPlateName") -// @Operation(summary = "查看板材信息的组合名称") -// @PreAuthorize("@ss.hasPermission('manage:query:query')") - public CommonResult> selectPlateName(@Valid OrderModuleReqVO reqVO){ - - return success(productionStatusService.selectPlateName(reqVO)); - - } - - - - - -// @GetMapping("/pagePlate") -// @Operation(summary = "查看板材信息分页") -// @PreAuthorize("@ss.hasPermission('manage:query:query')") - public CommonResult> queryPlate(@Valid PlatePageVO pageReqVO){ - return success(productionStatusService.getOrderPlatePage(pageReqVO)); - } - - - - - - @GetMapping("/pageSalary") - @Operation(summary = "计件工资分页查询") - @PreAuthorize("@ss.hasPermission('manage:query:pageSalary')") - public CommonResult> StepSalary(@Valid PriceRatePageReqVO pageReqVO){ - - PageResult salaryPage = productionStatusService.getSalaryPage(pageReqVO); - - return CommonResult.success(salaryPage); - - } - - - - - -// @GetMapping("/pagePackage") -// @Operation(summary = "打包查询分页") -// @PreAuthorize("@ss.hasPermission('manage:query:query')") - public CommonResult> queryPackage(@Valid OrderPlatePageReqVO pageReqVO){ - - PageResult pageResult = productionStatusService.queryPackage(pageReqVO); - - return success(BeanUtils.toBean(pageResult, ProcessRespVO.class)); - - } - - - - - -// @GetMapping("/queryPackageList") -// @Operation(summary = "生产单打包完成包裹查看") -// @Parameter(name = "orderNo", description = "生产单Id", required = true) -// @PreAuthorize("@ss.hasPermission('manage:query:queryPackageList')") - public CommonResult> queryPackageList(@Valid @RequestParam("orderNo") Long orderNo){ - - List orderProcessById = productionStatusService.getPackageList(orderNo); - - return CommonResult.success(orderProcessById); - - } - - - - - - - - - @GetMapping("/printOrder") - @Operation(summary = "打印订单") - @Parameter(name = "orderNo", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasPermission('manage:query:export')") - public CommonResult printOrder(@Valid @RequestParam("orderNo") Long orderNo){ - - return CommonResult.success(productionStatusService.printOrder(orderNo)); - - } - - - - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java deleted file mode 100644 index 3d92652ec..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.pack; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 查看包裹详情分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class OrderPackagePageReqVO extends PageParam { - - @Schema(description = "包裹Id") - private Long packageNo; - -/* @Schema(description = "包裹类型") - private Integer type;*/ - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java deleted file mode 100644 index 535bcbed0..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.pack; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 生产单包裹表 Response VO") -@Data -public class OrderPackageVO { - - - - @Schema(description = "主键-包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderId; - - @Schema(description = "自定义单号") - private String customOrderNo; - - @Schema(description = "客户") - private String customer; - - @Schema(description = "客户地址") - private String address; - - @Schema(description = "经销商") - private String dealer; - - @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String packageNo; - - @Schema(description = "包裹类型", requiredMode = Schema.RequiredMode.REQUIRED) - private Long type; - - @Schema(description = "包裹状态", requiredMode = Schema.RequiredMode.REQUIRED) - private Long status; - - @Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long organId; - - @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) - private String creator; - - @Schema(description = "包裹备注", requiredMode = Schema.RequiredMode.REQUIRED) - private String packRemark; - - @Schema(description = "生产单备注", requiredMode = Schema.RequiredMode.REQUIRED) - private String orderRemark; - - @Schema(description = "出库人", requiredMode = Schema.RequiredMode.REQUIRED) - private String updater; - - @Schema(description = "出库时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime updateTime; - - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java deleted file mode 100644 index d62bf6436..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.pack; - - -import com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -@Schema(description = "管理后台 - 包裹详情 Response VO") -@Data -public class PackageDetailsRespVO { - - - @Schema(description = "生产单ID", requiredMode = Schema.RequiredMode.REQUIRED) - private String orderId; - - @Schema(description = "房间名称-板材类型显示", requiredMode = Schema.RequiredMode.REQUIRED) - private String roomName; - - @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String cabinetName; - - - @Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long plateId; - - @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String plateNo; - - @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String plateName; - - @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) - private String material; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String color; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double width; - - @Schema(description = "长度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double thickness; - - @Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED) - private Double area; - - @Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED) - private String texture; - - @Schema(description = "是否异型", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean specialShaped; - - @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean profiling; - - @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean rowHole; - - @Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED) - private String processGroup; - - - @Schema(description = "备注(板材和配件都要传递)", requiredMode = Schema.RequiredMode.REQUIRED) - private String remark; - - - @Schema(description = "加工组名称集合") - private List processGroupNameList; - - - - @Schema(description = "配件名称-配件类型显示", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; - - @Schema(description = "配件ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long partsId; - - @Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED) - private String model; - - @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED) - private String spec; - - @Schema(description = "明细配件类型， 2 五金/配件 3 其他 4 报价配件", requiredMode = Schema.RequiredMode.REQUIRED) - private String type; - - @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long num; - - @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) - private String unit; - - @Schema(description = "是否复合部件：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean isComposite; - - @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED) - private String brand; - - @Schema(description = "厂家", requiredMode = Schema.RequiredMode.REQUIRED) - private String factory; - - - @Schema(description = "配件颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String partsColor; - - @Schema(description = "配件宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double partsWidth; - - @Schema(description = "配件长度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double partsLength; - - @Schema(description = "配件厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double partsThickness; - - @Schema(description = "配件主类：1封边2五金3组件", requiredMode = Schema.RequiredMode.REQUIRED) - private String category; - - @Schema(description = "子配件ID列表,复合部件时记录子配件ID,半角逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED) - private String subparts; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PrintOrderRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PrintOrderRespVO.java deleted file mode 100644 index 550439e74..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PrintOrderRespVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.pack; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 打印订单 Response VO") -@Data -public class PrintOrderRespVO { - - - @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) - private Long orderNo; - - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED) - private String customOrderNo; - - @Schema(description = "经销商", requiredMode = Schema.RequiredMode.REQUIRED) - private String dealer; - - @Schema(description = "收货地址", requiredMode = Schema.RequiredMode.REQUIRED) - private String address; - - @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED) - private String customer; - - @Schema(description = "客户手机号", requiredMode = Schema.RequiredMode.REQUIRED) - private String customerPhone; - - - @Schema(description = "包裹数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer packageQuantity; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderModuleReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderModuleReqVO.java deleted file mode 100644 index 65f7aacfe..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderModuleReqVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - - -@Schema(description = "管理后台 - 生产单模块表 Request VO") -@Data -@ToString(callSuper = true) -public class OrderModuleReqVO extends PageParam { - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private Long orderNo; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderModuleVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderModuleVO.java deleted file mode 100644 index 1a2ccc5c2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderModuleVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - - - -@Schema(description = "管理后台 - 生产单模块表 order_module_{N} Response VO") -@Data -public class OrderModuleVO { - - @Schema(description = "柜体 id", requiredMode = Schema.RequiredMode.REQUIRED, example = "嘿嘿") - private Long bodyId; - - - @Schema(description = "加工组 id", example = "嘿嘿") - private Long groupId; - - - @Schema(description = "组合名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "嘿嘿") - private String name; - - - @Schema(description = "加工组名称", example = "嘿嘿") - private String groupName; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlatePageReqVO.java deleted file mode 100644 index ea2218d11..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlatePageReqVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.List; - - -@Schema(description = "管理后台 - 生产单表 order_{N} 分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class OrderPlatePageReqVO extends PageParam { - - - - @Schema(description = "生产状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2,3") - private List statusList; - - - @Schema(description = "订单号") - private Long orderNo; - - - @Schema(description = "自定义单号") - private String customOrderNo; - - - @Schema(description = "客户") - private String customer; - - - @Schema(description = "地址") - private String address; - - - @Schema(description = "经销商") - private String dealer; - - -} - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlateRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlateRespVO.java deleted file mode 100644 index 4ea76478e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlateRespVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; - - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 板材信息表 Response VO") -@Data -public class OrderPlateRespVO { - - @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private Long id; - - @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String name; - - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String color; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double width; - - @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double thickness; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板", requiredMode = Schema.RequiredMode.REQUIRED) - private String material; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java deleted file mode 100644 index 421624354..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/PlatePageVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 板材信息表分页") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PlatePageVO extends PageParam { - - @Schema(description = "柜体 id",requiredMode = Schema.RequiredMode.REQUIRED) - private Long bodyId ; - - - @Schema(description = "加工组 id") - private Long groupId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java deleted file mode 100644 index 92a9ca415..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 生产单工序步骤表 order_process_step_{N} Response VO") -@Data -public class ProductionGroupVO { - - - @Schema(description = "工序组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "嘿嘿") - private String groupName; - - @Schema(description = "工序名", requiredMode = Schema.RequiredMode.REQUIRED, example = "嘿嘿") - private String name; - - @Schema(description = "加工状态", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean status; - - @Schema(description = "工序负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "cfy_cf") - private String manager; - -// @Schema(description = "排单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "cfy_cf") -// private String planNo; - - @Schema(description = "加工时间", requiredMode = Schema.RequiredMode.REQUIRED) - private String processDate; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java deleted file mode 100644 index a07ed6d6b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.salary; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; -import java.util.Date; - -import static com.cf.imes.framework.common.util.date.DateUtils.*; - -@Schema(description = "管理后台 - 计件工资查询分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class PriceRatePageReqVO extends PageParam { - - - @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED) - private String startTime; - - - @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED) - private String endTime; - - - @Schema(description = "加工人") - private String manager; - - - @Schema(description = "工序名称") - private String name; - - - @Schema(description = "显示零单价(默认不显示-false)", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean noShowZero; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRateReqVO.java deleted file mode 100644 index 712ec0eb0..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRateReqVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.query.vo.salary; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "管理后台 - 计件工资查询 Response VO") -@Data -public class PriceRateReqVO { - - - @Schema(description = "工序ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long processId; - - @Schema(description = "工序名", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; - - @Schema(description = "单价", requiredMode = Schema.RequiredMode.REQUIRED) - private Long priceRate; - - @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long num; - - @Schema(description = "计件类型", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer priceType; - - @Schema(description = "金额", requiredMode = Schema.RequiredMode.REQUIRED) - private Double amount; - - - @Schema(description = "加工人", requiredMode = Schema.RequiredMode.REQUIRED) - private String manager; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/JsonUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/JsonUtil.java deleted file mode 100644 index 0258371e9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/JsonUtil.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.test; - -import java.util.Base64; -import java.io.ByteArrayOutputStream; -import java.util.zip.DataFormatException; -import java.util.zip.Deflater; -import java.util.zip.Inflater; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -public class JsonUtil { - - - public static void main(String[] args) throws IOException { - - String jsonData = "{\n" + - " \"code\": 0,\n" + - " \"data\": [\n" + - " {\n" + - " \"createTime\": 1717053232000,\n" + - " \"updateTime\": 1717053232000,\n" + - " \"creator\": \"晨丰科技\",\n" + - " \"updater\": \"晨丰科技\",\n" + - " \"deleted\": false,\n" + - " \"id\": 358,\n" + - " \"name\": \"2024年5月30日2\",\n" + - " \"pieceRate\": 0.001,\n" + - " \"pieceType\": 3,\n" + - " \"type\": 1,\n" + - " \"isCustom\": true,\n" + - " \"isDealer\": false,\n" + - " \"sort\": 1000,\n" + - " \"hourCapacity\": 0.001,\n" + - " \"unit\": \"件\",\n" + - " \"isEnabled\": true,\n" + - " \"prepareTime\": 0,\n" + - " \"description\": \"2024年5月30日2\",\n" + - " \"organId\": 1\n" + - " },\n" + - " {\n" + - " \"createTime\": 1717053193000,\n" + - " \"updateTime\": 1717053193000,\n" + - " \"creator\": \"晨丰科技\",\n" + - " \"updater\": \"晨丰科技\",\n" + - " \"deleted\": false,\n" + - " \"id\": 357,\n" + - " \"name\": \"2024年5月30日\",\n" + - " \"pieceRate\": 0.001,\n" + - " \"pieceType\": 2,\n" + - " \"type\": 7,\n" + - " \"isCustom\": true,\n" + - " \"isDealer\": false,\n" + - " \"sort\": 1000,\n" + - " \"hourCapacity\": 0.001,\n" + - " \"unit\": \"件\",\n" + - " \"isEnabled\": true,\n" + - " \"prepareTime\": 0,\n" + - " \"description\": \"2024年5月30日\",\n" + - " \"organId\": 1\n" + - " }\n" + - " ],\n" + - " \"msg\": \"\"\n" + - "}"; - - String s = zipString(jsonData); - System.out.println(s.getBytes()); - System.out.println(s.length()); - System.out.println(jsonData.length()); - - - String compress = compress(jsonData); - System.out.println(compress); - System.out.println(compress.length()); - - - } - - /** - * 压缩 - */ - public static String zipString(String unzipString) { - /** - * https://www.yiibai.com/javazip/javazip_deflater.html#article-start - * 0 ~ 9 压缩等级 低到高 - * public static final int BEST_COMPRESSION = 9; 最佳压缩的压缩级别。 - * public static final int BEST_SPEED = 1; 压缩级别最快的压缩。 - * public static final int DEFAULT_COMPRESSION = -1; 默认压缩级别。 - * public static final int DEFAULT_STRATEGY = 0; 默认压缩策略。 - * public static final int DEFLATED = 8; 压缩算法的压缩方法(目前唯一支持的压缩方法)。 - * public static final int FILTERED = 1; 压缩策略最适用于大部分数值较小且数据分布随机分布的数据。 - * public static final int FULL_FLUSH = 3; 压缩刷新模式，用于清除所有待处理的输出并重置拆卸器。 - * public static final int HUFFMAN_ONLY = 2; 仅用于霍夫曼编码的压缩策略。 - * public static final int NO_COMPRESSION = 0; 不压缩的压缩级别。 - * public static final int NO_FLUSH = 0; 用于实现最佳压缩结果的压缩刷新模式。 - * public static final int SYNC_FLUSH = 2; 用于清除所有未决输出的压缩刷新模式; 可能会降低某些压缩算法的压缩率。 - */ - - //使用指定的压缩级别创建一个新的压缩器。 - Deflater deflater = new Deflater(Deflater.BEST_COMPRESSION); - //设置压缩输入数据。 - deflater.setInput(unzipString.getBytes()); - //当被调用时，表示压缩应该以输入缓冲区的当前内容结束。 - deflater.finish(); - - final byte[] bytes = new byte[256]; - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256); - - while (!deflater.finished()) { - //压缩输入数据并用压缩数据填充指定的缓冲区。 - int length = deflater.deflate(bytes); - outputStream.write(bytes, 0, length); - } - //关闭压缩器并丢弃任何未处理的输入。 - deflater.end(); - return Base64.getEncoder().encodeToString(outputStream.toByteArray()); - } - - /** - * 解压缩 - */ - public static String unzipString(String zipString) { - byte[] decode = Base64.getDecoder().decode(zipString); - - //创建一个新的解压缩器 https://www.yiibai.com/javazip/javazip_inflater.html - - Inflater inflater = new Inflater(); - //设置解压缩的输入数据。 - inflater.setInput(decode); - final byte[] bytes = new byte[256]; - try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256)) { - //finished() 如果已到达压缩数据流的末尾，则返回true。 - while (!inflater.finished()) { - //将字节解压缩到指定的缓冲区中。 - int length = inflater.inflate(bytes); - outputStream.write(bytes, 0, length); - } - return outputStream.toString(); - } catch (DataFormatException e) { - e.printStackTrace(); - return null; - } catch (IOException e) { - e.printStackTrace(); - return null; - } finally { - //关闭解压缩器并丢弃任何未处理的输入。 - inflater.end(); - } - } - - - // 使用 GZIP 进行压缩 - public static String compress(String str) throws IOException { - if (null == str || str.length() <= 0) { - return str; - } - // 创建一个新的输出流 - ByteArrayOutputStream out = new ByteArrayOutputStream(); - // 使用默认缓冲区大小创建新的输出流 - GZIPOutputStream gzip = new GZIPOutputStream(out); - // 将字节写入此输出流 - gzip.write(str.getBytes("utf-8")); // 因为后台默认字符集有可能是GBK字符集，所以此处需指定一个字符集 - gzip.close(); - // 使用指定的 charsetName，通过解码字节将缓冲区内容转换为字符串 - return out.toString("ISO-8859-1"); - } - - - // 解压缩 - public static String unCompress(String str) throws IOException { - if (null == str || str.length() <= 0) { - return str; - } - // 创建一个新的输出流 - ByteArrayOutputStream out = new ByteArrayOutputStream(); - // 创建一个 ByteArrayInputStream，使用 buf 作为其缓冲 区数组 - ByteArrayInputStream in = new ByteArrayInputStream(str.getBytes("ISO-8859-1")); - // 使用默认缓冲区大小创建新的输入流 - GZIPInputStream gzip = new GZIPInputStream(in); - byte[] buffer = new byte[256]; - int n = 0; - - // 将未压缩数据读入字节数组 - while ((n = gzip.read(buffer)) >= 0) { - out.write(buffer, 0, n); - } - // 使用指定的 charsetName，通过解码字节将缓冲区内容转换为字符串 - return out.toString("utf-8"); - } - - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/TestController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/TestController.java deleted file mode 100644 index 78197cb0d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/TestController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.test; - -import com.cf.imes.module.manage.dal.mysql.test.TestMapper; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; - -import org.jetbrains.annotations.TestOnly; - -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import javax.sound.sampled.AudioInputStream; - -import com.jacob.activeX.ActiveXComponent; -import com.jacob.com.Dispatch; -import com.jacob.com.Variant; - -import java.io.*; -import java.util.List; -import java.util.Random; - - -/** - * @author there - * 测试 controller - */ -@RestController -@RequestMapping("/manage/test") -@Tag(name = "测试") -public class TestController { - - @Resource - private TestMapper testMapper; - - - @GetMapping("/get") - @PermitAll - @Operation(summary = "测试") - public Object get() { - return testMapper.selectList(); - } - - - public class JacobTestController { - /* * - * 语音转文字并播放 - * - * @param text - */ - private static void convertTextToSpeech(String text) { - - - try { - - //jacob.dll没成功安装，执行这一步会出错 - //构建音频格式 调用注册表应用 - Dispatch spAudioFormat = new ActiveXComponent("Sapi.SpAudioFormat").getObject(); - //音频文件输出流 - Dispatch spFileStream = new ActiveXComponent("Sapi.SpFileStream").getObject(); - //构建音频对象 - Dispatch spVoice = new ActiveXComponent("Sapi.SpVoice").getObject(); - - //设置spAudioFormat音频流格式类型22 - Dispatch.put(spAudioFormat, "Type", new Variant(22)); - //设置spFileStream文件输出流的音频格式 - Dispatch.putRef(spFileStream, "Format", spAudioFormat); - - //设置spFileStream文件输出流参数地址等 - Dispatch.call(spFileStream, "Open", new Variant("E:AAAAA\48641486.wav"), new Variant(3), new Variant(true)); - //设置spVoice声音对象的音频输出流为输出文件对象 - Dispatch.putRef(spVoice, "AudioOutputStream", spFileStream); - //设置spVoice声音对象的音量大小100 - Dispatch.put(spVoice, "Volume", new Variant(100)); - //设置spVoice声音对象的速度 0为正常速度，范围【..-2 -1 0 1 2..】 - Dispatch.put(spVoice, "Rate", new Variant(0)); - //设置spVoice声音对象中的文本内容 - Dispatch.call(spVoice, "Speak", new Variant(text)); - //关闭spFileStream输出文件 - Dispatch.call(spFileStream, "Close"); - - //释放资源 - spVoice.safeRelease(); - spAudioFormat.safeRelease(); - spFileStream.safeRelease(); - - } catch (Exception e) { - System.out.println(e.getMessage()); - - } - } - - /* private static XxlJobProperties aabb(){ - - XxlJobParameter xxlJobParameter = new XxlJobParameter(); - - xxlJobParameter.setEnabled(false); - xxlJobParameter.setAccessToken("1122"); - xxlJobParameter.setAddresses("五阿里乌"); - xxlJobParameter.setAppName("aaappn"); - XxlJobProperties bean = BeanUtils.toBean(xxlJobParameter, XxlJobProperties.class); - return bean; - - }*/ - - } - - - public static void deleteFiles(List filePaths) { - // 检查文件路径集合是否为空 - if (filePaths == null || filePaths.isEmpty()) { - System.out.println("文件路径集合为空"); - return; - } - - for (String filePath : filePaths) { - // 检查文件路径是否为空 - if (filePath == null || filePath.isEmpty()) { - System.out.println("文件路径为空"); - continue; - } - - File file = new File(filePath); - - // 检查文件是否存在 - if (!file.exists()) { - System.out.println("文件不存在：" + filePath); - continue; - } - - // 检查是否是文件 - if (!file.isFile()) { - System.out.println("路径指向的不是文件：" + filePath); - continue; - } - - // 尝试删除文件 - if (file.delete()) { - System.out.println("文件删除成功：" + filePath); - } else { - System.out.println("文件删除失败：" + filePath); - } - } - } - - - public static Integer aacc() { - - RedisTemplate re = new RedisTemplate<>(); - - int randomInt = new Random(System.currentTimeMillis()).nextInt(900) + 100;// 生成100到999之间的随机数 - - - return randomInt; - - } - - - @TestOnly - public static void main(String[] args) { - // test main - } - - -} - - - - - - - - - - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/voice/VoiceController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/voice/VoiceController.java deleted file mode 100644 index af78ae521..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/voice/VoiceController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.voice; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.manage.controller.admin.voice.vo.VoiceReqVO; -import com.cf.imes.module.manage.service.voice.VoiceService; -import com.jacob.com.Dispatch; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import org.springframework.web.bind.annotation.RestController; - -import java.io.ByteArrayInputStream; -import java.sql.Blob; - - -@Tag(name = "管理后台 - 语音播报") -@RestController -@RequestMapping("/manage/voice") -@Validated -public class VoiceController { - - - @Resource - private VoiceService voiceService; - - - @PostMapping() - @Operation(summary = "语音播报") - @PreAuthorize("@ss.hasPermission('manage:voice:insert')") - public CommonResult> voiceAnnouncements(@Valid @RequestBody VoiceReqVO reqVO ) throws Exception { - - - String sourceFile = voiceService.voiceAnnouncements(reqVO.getData()); - - - ResponseEntity voice = voiceService.getVoice(sourceFile); - - - // 删除生成的 mp3 文件 - voiceService.deleteFiles(sourceFile); - - - return CommonResult.success(voice); - -// String gzipFile = sourceFile+".zip"; -// -// // 压缩语音文件 -// voiceService.zipFiles(sourceFile, gzipFile); -// - - - - - } - - -} - - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/voice/vo/VoiceReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/voice/vo/VoiceReqVO.java deleted file mode 100644 index 2585b0391..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/voice/vo/VoiceReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.voice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.List; - -@Schema(description = "管理后台 - 语音播报 Request VO") -@Data -@ToString(callSuper = true) -public class VoiceReqVO { - - - @Schema(description = "语音数据", requiredMode = Schema.RequiredMode.REQUIRED) - private String data; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/package-info.java deleted file mode 100644 index c37032223..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 RESTful API 给前端： - * 1. admin 包：提供给管理后台 cf-ui-admin 前端项目 - * 2. app 包：提供给用户 APP cf-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 - */ -package com.cf.imes.module.manage.controller; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/pack/OrderBodyDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/pack/OrderBodyDO.java deleted file mode 100644 index bb3d5f7bf..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/pack/OrderBodyDO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.pack; - - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -@TableName("order_body") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderBodyDO extends BaseDO { - - @TableId - // 主键 - private Long id; - - // 生产单号 - private Long orderId; - - // 组织 ID，默认为1 - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 房间ID - private Long roomId; - - // 房间名称 - private String roomName; - - // 模块名称 - private String name; - - // 模块宽度 - private Float width; - - // 模块高度 - private Float height; - - // 模块深度 - private Float depth; - - // 模块复制数量 - private Integer multiNum; - - // 板材数量 - private Integer plateNum; - - // 异型数量 - private Integer unregularNum; - - // 文件名 - private String filename; - - // 备注 - private String remark; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/pack/OrderPrepackagedDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/pack/OrderPrepackagedDO.java deleted file mode 100644 index dfddd51d8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/pack/OrderPrepackagedDO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.pack; - - -import com.baomidou.mybatisplus.annotation.*; -import lombok.*; - - -@TableName("order_prepackaged") -@Data -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderPrepackagedDO { - - - @TableId - // 生产单号-主键 - private Long orderId; - - - // 预打包优化信息 - private String result; - - - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/package-info.java deleted file mode 100644 index f15b46d1c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject; \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/parts/PartsDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/parts/PartsDO.java deleted file mode 100644 index cd7305015..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/parts/PartsDO.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.parts; - -import lombok.*; -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; - -/** - * 配件表 parts_{N} DO - * - * @author 晨丰科技 - */ -@TableName("parts") -@KeySequence("parts_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PartsDO extends BaseDO { - - /** - * 配件 ID - */ - @TableId - private Long id; - /** - * 组织id - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - /** - * 设计端商品ID - */ - private String goodsId; - /** - * 配件名称 - */ - private String name; - /** - * 材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板 - */ - private String material; - /** - * 颜色 - */ - private String color; - /** - * 价格 - */ - private Double price; - /** - * 配件类型 - */ - private String type; - /** - * 配件主类 - */ - private String category; - /** - * 型号 - */ - private String model; - /** - * 宽度 - */ - private Double width; - /** - * 长度 - */ - private Double length; - /** - * 厚度 - */ - private Double thickness; - /** - * 规格 - */ - private String spec; - /** - * 品牌 - */ - private String brand; - /** - * 厂家 - */ - private String factory; - /** - * 单位 - */ - private String unit; - /** - * 是否复合部件：0 否 1 是 - */ - private Boolean isComposite; - /** - * 子配件ID列表,复合部件时记录子配件ID,半角逗号分隔 - */ - private String subparts; - /** - * 备注 - */ - private String remark; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/patching/MachineDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/patching/MachineDO.java deleted file mode 100644 index f5915329d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/patching/MachineDO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.patching; - - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; - -@TableName("imes_base.system_machine") -@KeySequence("machine_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MachineDO extends OrganBaseDO { - - - /** - * 主键 - */ - @TableId - private Long id; - /** - * 名称 - */ - private String name; - /** - * 1机台设备 2CNC设备 - */ - private Boolean machineType; - /** - * 标签id - */ - private Long labelId; - - - // 配置 - private String setting; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/patching/PatchDetailDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/patching/PatchDetailDO.java deleted file mode 100644 index f766f49d7..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/patching/PatchDetailDO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.patching; - - -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; - -@TableName("order_patch_detail") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PatchDetailDO extends BaseDO { - - - // 补板ID - @TableId - private Long id; - - // 生产单号 - private Long orderId; - - // 组织 ID，默认为1 - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 总面积 - private Double area; - - // 计划 ID - private Long planId; - - // 机台 ID - private Long machineId; - - // 板材详情 - private String detail; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java deleted file mode 100644 index ea0ca0e98..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.plate; - - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -@TableName("order_plate") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderPlateDO extends BaseDO { - - - // 板件 ID - @TableId - private Long id; - - // 生产单号 - private Long orderId; - - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 板名称 - private String name; - - // 自定义板编号 - private String plateNo; - - // 板类型，0 层板 1 立板 2 背板 - private Integer type; - - // 商品 ID - private String goodsId; - - // 宽度 - private Double width; - - // 高度 - private Double height; - - // 厚度 - private Double thickness; - - // 拆单宽度 - private Double splitWidth; - - // 拆单高度 - private Double splitHeight; - - // 拆单厚度 - private Double splitThickness; - - // 左封边厚度 - private Double sealLeft; - - // 右封边厚度 - private Double sealRight; - - // 上封边厚度 - private Double sealUp; - - // 下封边厚度 - private Double sealDown; - - // 面积 - private Double area; - - // 纹路类型，0 正纹 1 可翻转 2 反纹 - private Integer texture; - - // 孔面类型，0 正面 1 反面 2 侧面 - private Integer holeFace; - - // 排孔类型，0 正纹 1 反面 2 随意面 - private Integer holeArrange; - - // 异型孔数量 - private Integer unregularPointCount; - - // 正面孔数量 - private Integer frontHoleCount; - - // 背面孔数量 - private Integer backHoleCount; - - // 侧面孔数量 - private Integer sideHoleCount; - - // 正面造型量 - private Integer frontModelCount; - - // 背面造型量 - private Integer backModelCount; - - // 是否门板 - private Boolean isDoor; - - // 开门类型，0 无 1 左 2 右 3 上 4 下 - private Integer openDoorType; - - // 异型偏移 x - private Float offsetX; - - // 异型偏移 y - private Float offsetY; - - // 是否孤形对角 - private Boolean isArcAcross; - - // 是否排孔 - private Boolean isRowHole; - - // 模块类型 ID - private Long moduleTypeId; - - // 排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠 - private String filterType; - - // 备注 - private String remark; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java deleted file mode 100644 index 4efc33ef8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.plate; - -import lombok.*; - -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; - -/** - * 板材信息表 plate_N DO - * - * @author 晨丰科技 - */ -@TableName("plate") -@KeySequence("plate_n_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PlateDO extends BaseDO { - - /** - * 主键 - */ - @TableId - private Long id; - /** - * 客户的商品编号 - */ - private String goodsId; - /** - * 商品名称 - */ - private String goodsName; - /** - * 材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板 - */ - private String material; - /** - * 颜色 - */ - private String color; -// /** -// * 背面颜色 -// */ -// private String colorBlack; - /** - * 纹理 - */ - private Boolean texture; - /** - * 宽度 - */ - private Double width; - /** - * 高度 - */ - private Double height; - /** - * 厚度 - */ - private Double thickness; - /** - * 价格 - */ - private Double price; - /** - * 品牌 - */ - private String brand; - /** - * 规格 - */ - private String spec; - /** - * 备注 - */ - private String remark; - - /** - * 组织id - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java deleted file mode 100644 index 6c56bb7ea..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.process; - - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -import java.time.LocalDateTime; - -@TableName(value = "`orders`") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderDO extends BaseDO { - - @TableId - // 生产单号 - private Long id; - - // 订单状态 - private Integer status; - - // 打包状态 - private Integer packaged; - - // 自定义单号 - private String customOrderNo; - - // 客户 - private String customer; - - // 客户地址 - private String address; - - // 生产单日期 - private LocalDateTime orderDate; - - - // 客户电话 - private String phoneNumber; - - // 组织 id - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 经销商 - private String dealer; - - // 经销商电话 - private String dealerPhoneNumber; - - // 业务员 - private String salesman; - - // 拆单员 - private String splitter; - - // 备注 - private String remark; - - // 生产单的完成时间 - private LocalDateTime finishTime; - - - - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java deleted file mode 100644 index 3f5ea8010..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.process; - - -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; - -@TableName(value = "order_process_step_item", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users -@Data -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderProcessStepItemNDO { - - - @TableId - private Long id; - - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 工序项目名 - private String name; - - // 生产单工序 id - private Long orderProcessId; - - // 工序状态 - private Boolean status; - - // 工序步骤 id - private Long processStepId; - - // 工序组名 - private String groupName; - - - // 柜体 ID - private Long bodyId; - - - // 加工组 ID - private Long groupId; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java deleted file mode 100644 index 82ca0d268..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.process; - - -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; - -@TableName(value = "order_process_step") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderProcessStepNDO extends BaseDO { - - @TableId - private Long id; - - // 生产单号 - private Long orderId; - - //组织ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 完成时间 - private LocalDateTime finishTime; - - //工序状态 - private Boolean status; - - // 加工类型 - private Integer type; - - // 计件工资 - private Float pieceRate; - - - // 工资金额 - private Double salaryAmount; - - - // 计件工资类型 - private Integer pieceType; - - // 排序优先级 - private Integer sort; - - // 工序名称 - private String name; - - // 工序ID - private Long processinfoId; - - // 生产单工序ID - private Long orderProcessId; - - // 计划日期 - private Date scheduleDate; - - // 工序处理时长 - private Float duration; - - // 工序负责人 - private String manager; - - // 工序处理日期 - private Date processDate; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderItemDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderItemDO.java deleted file mode 100644 index e648c4e45..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderItemDO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.query; - - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -@TableName("order_item") -@Data -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderItemDO { - - // 明细编号 - @TableId - private Long id; - - // 生产单号 - private Long orderId; - - // 明细类型，1 板材 2 五金/配件 3 其他 4 报价配件 - private Integer type; - - // 房间 ID - private Long roomId; - - // 柜体 ID - private Long bodyId; - - // 板件 id - private Long plateId; - - // 配件 id - private Long partsId; - - // 加工组 id - private Long groupId; - - // 排单 ID - private Long planId; - - // 包裹 ID - private Long packageId; - - // 部件数量 - private Double num; - - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java deleted file mode 100644 index 8b88e5318..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPackageDO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.query; - - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; - -@TableName("order_package") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderPackageDO extends BaseDO { - - - // 包裹ID - @TableId - private Long id; - - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 生产单号 - private Long orderId; - - // 包裹编号 - private String packageNo; - - // 包裹类型，-1未定义，0板材，1配件，2其他配件 - private Integer type; - - // 包裹名 - private String name; - - // 包裹状态，0未封包，1已封包，2已入库，3已出库 - private Integer status; - - - // 备注 - private String remark; - - - -} - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPartsNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPartsNDO.java deleted file mode 100644 index 4a66855c4..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/query/OrderPartsNDO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.query; - - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -@TableName("order_parts") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OrderPartsNDO extends BaseDO { - - @TableId - // 配件 ID - private Long id; - - // 生产单号 - private Long orderId; - - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - - // 商品ID - private Long goodsId; - - // 配件名称 - private String name; - - // 材质 - private String material; - - // 配件类型 - private String type; - - // 型号 - private String model; - - // 规格 - private String spec; - - // 品牌 - private String brand; - - // 厂家 - private String factory; - - // 单位 - private String unit; - - // 价格 - private Float price; - - // 是否复合部件：0 否 1 是 - private Boolean isComposite; - - // 备注 - private String remark; - - -} - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/register/RegisterDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/register/RegisterDO.java deleted file mode 100644 index f12e3382a..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/register/RegisterDO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.register; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @author there - */ -@Data -@TableName("system_db_register") -public class RegisterDO { - @TableId - private Integer id; - - private String code; - - private String dbUrl; - - private String dbUsername; - - private String dbPassword; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/register/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/register/package-info.java deleted file mode 100644 index 3847d4f97..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/register/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.register; \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java deleted file mode 100644 index eb3dd0bd9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.remainplaten; - -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -import java.math.BigDecimal; - -/** - * 生产单余料板表 order_remain_plate_{N} DO - * - * @author 晨丰科技 - */ -@TableName("order_remain_plate") -@KeySequence("order_remain_plate_n_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class RemainPlateDO extends BaseDO { - - /** - * 余料板 ID - */ - @TableId - private Long id; - // 组织 ID - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long organId; - /** - * 排单 ID - */ - private Long planId; - /** - * 初始排单 ID - */ - private Long initPlanId; - /** - * 余料板状态，0未使用，1使用中，2已使用 - */ - private Integer status; - /** - * 是否为开料添加，0否，1是 - */ - private Boolean isCutting; - /** - * 使用类型，0核销，1排单，2补板 - */ - private Integer useType; - /** - * 商品 ID - */ - private String goodsId; - /** - * 商品名 - */ - private String name; - /** - * 材料 - */ - private String material; - /** - * 颜色 - */ - private String color; - /** - * 背面颜色 - */ - private String colorBlack; - /** - * 纹理 - */ - private Boolean texture; - /** - * 宽度 - */ - private BigDecimal width; - /** - * 长度 - */ - private BigDecimal length; - /** - * 厚度 - */ - private BigDecimal thickness; - /** - * 品牌 - */ - private String brand; - /** - * 放置样式，0正面，1正面右转，2正面后转，3正面左转，4反面，5反面右转，6反面后转，7反面左转 - */ - private Integer placeStyle; - /** - * 仓库名 - */ - private String store; - /** - * 数量 - */ - private Integer count; - /** - * 备注 - */ - private String remark; - /** - * 轮廊数据，Json 串 - */ - private String outLineJson; - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/test/TestDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/test/TestDO.java deleted file mode 100644 index a8840294c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/test/TestDO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cf.imes.module.manage.dal.dataobject.test; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @author there - */ -@Data -@TableName("test") -public class TestDO { - private Integer id; - private String name; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderBodyMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderBodyMapper.java deleted file mode 100644 index 8b344e69b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderBodyMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.pack; - - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderBodyRespVo; -import com.cf.imes.module.manage.dal.dataobject.pack.OrderBodyDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OrderBodyMapper extends BaseMapperX { - - - - - default List selectListByOrderId(Long orderId,Long organId,Long bodyId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderBodyDO::getOrganId,organId) - .eqIfPresent(OrderBodyDO::getId,bodyId) - .eqIfPresent(OrderBodyDO::getOrderId, orderId)); - } - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java deleted file mode 100644 index 688174273..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.pack; - - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.cf.imes.framework.common.enums.OrderPackageStatusEnum; -import com.cf.imes.framework.common.enums.OrderPackageTypeEnum; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.pack.vo.PackRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; -import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OrderPackageMapper extends BaseMapperX { - - - - -// IPage selectByOrderNo(@Param("page") IPage page, @Param("reqVO") PackageDetailsReqVO reqVO,@Param("packId") List packId, @Param("organId") Long organId); - - IPage selectByOrderNo(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - default OrderPackageDO selectByPackNo(String packNo,Long organId) { - return selectOne(new LambdaQueryWrapperX() - .eq(OrderPackageDO::getOrganId, organId) - .eqIfPresent(OrderPackageDO::getPackageNo, packNo)); - } - - - - List selectPackPage(@Param("orderIds") List orderIds,@Param("organId") Long organId); - - - - default OrderPackageDO selectByPackId(Long packId,Long orderId,Long organId) { - return selectOne(new LambdaQueryWrapperX() - .eq(OrderPackageDO::getOrganId, organId) - .eq(OrderPackageDO::getDeleted,false) - .eqIfPresent(OrderPackageDO::getOrderId,orderId) - .eqIfPresent(OrderPackageDO::getId, packId)); - } - - - - void updateParts(@Param("packageId") Long packageId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - - default List selectPackStatus(Long orderId,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderPackageDO::getOrganId,organId) - .eq(OrderPackageDO::getDeleted,false) - .eqIfPresent(OrderPackageDO::getOrderId, orderId)); - } - - - default List selectPackList(Long orderId,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderPackageDO::getOrganId,organId) - .eq(OrderPackageDO::getDeleted,false) - .eqIfPresent(OrderPackageDO::getOrderId, orderId) - .eqIfPresent(OrderPackageDO::getStatus, OrderPackageStatusEnum.UNPACKED.getStatus())); - } - - - List selectPackPieceCount(@Param("orderIds") List orderIds, @Param("organId") Long organId); - - - // 删除当前生产单下所有的包裹 - default void updateDelete(Long orderId,Long organId) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() - .set(OrderPackageDO::getDeleted, true) - .eq(OrderPackageDO::getOrganId,organId) - .eq(OrderPackageDO::getOrderId, orderId) - .eq(OrderPackageDO::getType, OrderPackageTypeEnum.PLATE.getType()); - update(wrapper); - } - - - List selectPackListByOrderId(@Param("orderId") Long orderId,@Param("organId") Long organId); - - - default List selectPackStatusList(Long orderId,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderPackageDO::getOrganId,organId) - .eq(OrderPackageDO::getDeleted,false) - .eqIfPresent(OrderPackageDO::getOrderId, orderId) - .eq(OrderPackageDO::getStatus,OrderPackageStatusEnum.PACKAGED.getStatus())); - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPrepackagedMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPrepackagedMapper.java deleted file mode 100644 index d2ef5d0df..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPrepackagedMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.pack; - - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.dal.dataobject.pack.OrderPrepackagedDO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OrderPrepackagedMapper extends BaseMapperX { - - - - - default OrderPrepackagedDO selectOrder(Long orderId, Long organId) { - return selectOne(new LambdaQueryWrapperX() - .eq(OrderPrepackagedDO::getOrganId, organId) - .eqIfPresent(OrderPrepackagedDO::getOrderId, orderId)); - } - - - default int deletePacked(Long orderId, Long organId) { - return delete(new LambdaQueryWrapperX() - .eq(OrderPrepackagedDO::getOrganId, organId) - .eqIfPresent(OrderPrepackagedDO::getOrderId, orderId)); - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/package-info.java deleted file mode 100644 index d1ef95582..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql; \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java deleted file mode 100644 index fa7235858..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.parts; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsCadPageReqVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsPageReqVO; -import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO; - -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 配件表 parts_{N} Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface PartsMapper extends BaseMapperX { - - default PageResult selectPage(PartsPageReqVO reqVO) { - LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX() - .eqIfPresent(PartsDO::getOrganId, reqVO.getOrganId()) - .eqIfPresent(PartsDO::getCategory, reqVO.getCategory()) - .likeIfPresent(PartsDO::getGoodsId, reqVO.getGoodsId()) - .likeIfPresent(PartsDO::getColor, reqVO.getColor()) - .likeIfPresent(PartsDO::getType, reqVO.getType()) - .likeIfPresent(PartsDO::getName, reqVO.getName()) - .likeIfPresent(PartsDO::getMaterial, reqVO.getMaterial()) - .likeIfPresent(PartsDO::getModel, reqVO.getModel()) - .likeIfPresent(PartsDO::getSpec, reqVO.getSpec()) - .likeIfPresent(PartsDO::getBrand, reqVO.getBrand()) - .likeIfPresent(PartsDO::getFactory, reqVO.getFactory()) - .likeIfPresent(PartsDO::getUnit, reqVO.getUnit()) - .eqIfPresent(PartsDO::getIsComposite, reqVO.getIsComposite()) - .betweenIfPresent(PartsDO::getWidth, reqVO.getWidth()) - .betweenIfPresent(PartsDO::getLength, reqVO.getLength()) - .betweenIfPresent(PartsDO::getThickness, reqVO.getThickness()) - .likeIfPresent(PartsDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(PartsDO::getCreateTime, reqVO.getCreateTime()); - - if (reqVO.getOrder() == null) { - queryWrapper.orderByDesc(PartsDO::getId); - }else { - if (reqVO.getOrder().equals("ascend")) { - switch (reqVO.getField()) { - case "goodsId" -> queryWrapper.orderByAsc(PartsDO::getGoodsId); - case "isComposite" -> queryWrapper.orderByAsc(PartsDO::getIsComposite); - case "category" -> queryWrapper.orderByAsc(PartsDO::getCategory); - case "type" -> queryWrapper.orderByAsc(PartsDO::getType); - case "name" -> queryWrapper.orderByAsc(PartsDO::getName); - case "model" -> queryWrapper.orderByAsc(PartsDO::getModel); - case "material" -> queryWrapper.orderByAsc(PartsDO::getMaterial); - case "color" -> queryWrapper.orderByAsc(PartsDO::getColor); - case "unit" -> queryWrapper.orderByAsc(PartsDO::getUnit); - case "spec" -> queryWrapper.orderByAsc(PartsDO::getSpec); - case "brand" -> queryWrapper.orderByAsc(PartsDO::getBrand); - case "factory" -> queryWrapper.orderByAsc(PartsDO::getFactory); - case "width" -> queryWrapper.orderByAsc(PartsDO::getWidth); - case "length" -> queryWrapper.orderByAsc(PartsDO::getLength); - case "thickness" -> queryWrapper.orderByAsc(PartsDO::getThickness); - default -> { - // default不排序 - } - } - }else if (reqVO.getOrder().equals("descend")) { - switch (reqVO.getField()) { - case "goodsId" -> queryWrapper.orderByDesc(PartsDO::getGoodsId); - case "isComposite" -> queryWrapper.orderByDesc(PartsDO::getIsComposite); - case "category" -> queryWrapper.orderByDesc(PartsDO::getCategory); - case "type" -> queryWrapper.orderByDesc(PartsDO::getType); - case "name" -> queryWrapper.orderByDesc(PartsDO::getName); - case "model" -> queryWrapper.orderByDesc(PartsDO::getModel); - case "material" -> queryWrapper.orderByDesc(PartsDO::getMaterial); - case "color" -> queryWrapper.orderByDesc(PartsDO::getColor); - case "unit" -> queryWrapper.orderByDesc(PartsDO::getUnit); - case "spec" -> queryWrapper.orderByDesc(PartsDO::getSpec); - case "brand" -> queryWrapper.orderByDesc(PartsDO::getBrand); - case "factory" -> queryWrapper.orderByDesc(PartsDO::getFactory); - case "width" -> queryWrapper.orderByDesc(PartsDO::getWidth); - case "length" -> queryWrapper.orderByDesc(PartsDO::getLength); - case "thickness" -> queryWrapper.orderByDesc(PartsDO::getThickness); - default -> { - // default不排序 - } - } - } - } - - return selectPage(reqVO, queryWrapper); - } - - default PartsDO selectById(Long id , Long organId) { - return selectOne(PartsDO::getId, id, PartsDO::getOrganId, organId); - } - - default PartsDO selectByGoodID(String goodId , Long organId) { - return selectOne(PartsDO::getGoodsId, goodId, PartsDO::getOrganId, organId); - } - - default PartsDO selectExceptGoodID(Long id, String goodId , Long organId) { - return selectOne(new LambdaQueryWrapperX() - .ne(PartsDO::getId, id) - .eq(PartsDO::getGoodsId, goodId) - .eq(PartsDO::getOrganId, organId)); - } - - default PageResult selectCadPage(PartsCadPageReqVO reqVO) { - LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX() - .eqIfPresent(PartsDO::getOrganId, reqVO.getOrganId()) - .eqIfPresent(PartsDO::getCategory, reqVO.getCategory()) - .likeIfPresent(PartsDO::getColor, reqVO.getColor()) - .likeIfPresent(PartsDO::getType, reqVO.getType()) - .likeIfPresent(PartsDO::getName, reqVO.getName()) - .likeIfPresent(PartsDO::getMaterial, reqVO.getMaterial()) - .likeIfPresent(PartsDO::getModel, reqVO.getModel()) - .likeIfPresent(PartsDO::getSpec, reqVO.getSpec()) - .likeIfPresent(PartsDO::getBrand, reqVO.getBrand()) - .likeIfPresent(PartsDO::getFactory, reqVO.getFactory()) - .likeIfPresent(PartsDO::getUnit, reqVO.getUnit()) - .eqIfPresent(PartsDO::getIsComposite, reqVO.getIsComposite()) - .eqIfPresent(PartsDO::getWidth, reqVO.getWidth()) - .eqIfPresent(PartsDO::getLength, reqVO.getLength()) - .eqIfPresent(PartsDO::getThickness, reqVO.getThickness()) - .likeIfPresent(PartsDO::getRemark, reqVO.getRemark()); - - if (reqVO.getOrder() == null) { - queryWrapper.orderByDesc(PartsDO::getId); - }else { - if (reqVO.getOrder().equals("ascend")) { - switch (reqVO.getField()) { - case "isComposite" -> queryWrapper.orderByAsc(PartsDO::getIsComposite); - case "category" -> queryWrapper.orderByAsc(PartsDO::getCategory); - case "type" -> queryWrapper.orderByAsc(PartsDO::getType); - case "name" -> queryWrapper.orderByAsc(PartsDO::getName); - case "model" -> queryWrapper.orderByAsc(PartsDO::getModel); - case "material" -> queryWrapper.orderByAsc(PartsDO::getMaterial); - case "color" -> queryWrapper.orderByAsc(PartsDO::getColor); - case "unit" -> queryWrapper.orderByAsc(PartsDO::getUnit); - case "spec" -> queryWrapper.orderByAsc(PartsDO::getSpec); - case "brand" -> queryWrapper.orderByAsc(PartsDO::getBrand); - case "factory" -> queryWrapper.orderByAsc(PartsDO::getFactory); - case "width" -> queryWrapper.orderByAsc(PartsDO::getWidth); - case "length" -> queryWrapper.orderByAsc(PartsDO::getLength); - case "thickness" -> queryWrapper.orderByAsc(PartsDO::getThickness); - default -> { - // default不排序 - } - } - }else if (reqVO.getOrder().equals("descend")) { - switch (reqVO.getField()) { - case "isComposite" -> queryWrapper.orderByDesc(PartsDO::getIsComposite); - case "category" -> queryWrapper.orderByDesc(PartsDO::getCategory); - case "type" -> queryWrapper.orderByDesc(PartsDO::getType); - case "name" -> queryWrapper.orderByDesc(PartsDO::getName); - case "model" -> queryWrapper.orderByDesc(PartsDO::getModel); - case "material" -> queryWrapper.orderByDesc(PartsDO::getMaterial); - case "color" -> queryWrapper.orderByDesc(PartsDO::getColor); - case "unit" -> queryWrapper.orderByDesc(PartsDO::getUnit); - case "spec" -> queryWrapper.orderByDesc(PartsDO::getSpec); - case "brand" -> queryWrapper.orderByDesc(PartsDO::getBrand); - case "factory" -> queryWrapper.orderByDesc(PartsDO::getFactory); - case "width" -> queryWrapper.orderByDesc(PartsDO::getWidth); - case "length" -> queryWrapper.orderByDesc(PartsDO::getLength); - case "thickness" -> queryWrapper.orderByDesc(PartsDO::getThickness); - default -> { - // default不排序 - } - } - } - } - - return selectPage(reqVO, queryWrapper); - } - - default List getAllByOrganId(Long organId, String category) { - return selectList(new LambdaQueryWrapperX() - .eq(PartsDO::getOrganId, organId) - .eq(PartsDO::getCategory, category) - .eq(PartsDO::getDeleted, 0)); - } -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/patching/MachineMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/patching/MachineMapper.java deleted file mode 100644 index d420727ef..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/patching/MachineMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.patching; - - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.dal.dataobject.patching.MachineDO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface MachineMapper extends BaseMapperX { - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/patching/PatchDetailMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/patching/PatchDetailMapper.java deleted file mode 100644 index f72c3d188..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/patching/PatchDetailMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.patching; - - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.dal.dataobject.patching.PatchDetailDO; -import org.apache.ibatis.annotations.Mapper; - - -@Mapper -public interface PatchDetailMapper extends BaseMapperX { - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java deleted file mode 100644 index 16eead43c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.plate; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.pack.vo.PackRespVO; -import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingDetailRespVO; -import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingPlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.process.vo.PlateDetails; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; -import com.cf.imes.module.manage.dal.dataobject.plate.OrderPlateDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OrderPlateMapper extends BaseMapperX { - - - - List selectPlateDetail(PatchingPlatePageReqVO pageReqVO); - - - - PatchingDetailRespVO selectPlate(@Param("plateId") Long plateId); - - - - List selectOtherPlateList(@Param("plateIdList") List plateIdList); - - List selectListByOrderId( @Param("orderId") Long orderId, @Param("organId") Long organId); - - - default List selectPlateList(List plateNo, Long organId) { - return selectList( new LambdaQueryWrapperX() - .eq(OrderPlateDO::getOrganId, organId) - .in(OrderPlateDO::getPlateNo, plateNo)); - - } - - - default List selectplateByPlateNo(String plateNo, Long orderId, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderPlateDO::getOrganId, organId) - .eq(OrderPlateDO::getDeleted,false) - .eq(OrderPlateDO::getOrderId, orderId) - .likeIfPresent(OrderPlateDO::getPlateNo, plateNo) - .select(OrderPlateDO::getId)); - } - - List selectPlateNum(@Param("orderIds") List orderIds,@Param("organId") Long organId); - - List selectOrderNoPackPlateList(@Param("orderId") Long orderId,@Param("organId") Long organId); - - List selectOrderPlateList(@Param("orderIds") List orderIds, @Param("organId") Long organId); - - IPage selectPackPlateList(@Param("page") IPage page, @Param("packageId") Long packageId, @Param("organId") Long organId); -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java deleted file mode 100644 index 08205cbd8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.plate; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlatePageReqVO; -import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 板材信息表 plate_{N} Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface PlateMapper extends BaseMapperX { - - default PlateDO selectByGoodID(String goodId , Long organId) { - return selectOne(PlateDO::getGoodsId, goodId, PlateDO::getOrganId, organId); - } - - default PageResult selectPage(PlatePageReqVO reqVO) { - LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX() - .eqIfPresent(PlateDO::getOrganId, reqVO.getOrganId()) - .likeIfPresent(PlateDO::getGoodsId, reqVO.getGoodsId()) - .likeIfPresent(PlateDO::getGoodsName, reqVO.getGoodsName()) - .likeIfPresent(PlateDO::getMaterial, reqVO.getMaterial()) - .likeIfPresent(PlateDO::getColor, reqVO.getColor()) - .eqIfPresent(PlateDO::getWidth, reqVO.getWidth()) - .eqIfPresent(PlateDO::getHeight, reqVO.getHeight()) - .eqIfPresent(PlateDO::getThickness, reqVO.getThickness()) - .likeIfPresent(PlateDO::getBrand, reqVO.getBrand()) - .likeIfPresent(PlateDO::getSpec, reqVO.getSpec()) - .likeIfPresent(PlateDO::getRemark, reqVO.getRemark()) - .eqIfPresent(PlateDO::getPrice, reqVO.getPrice()) - .eqIfPresent(PlateDO::getTexture, reqVO.getTexture()) - .betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime()); - - if (reqVO.getOrder() == null) { - queryWrapper.orderByDesc(PlateDO::getId); - }else { - if (reqVO.getOrder().equals("ascend")) { - switch (reqVO.getField()) { - case "goodsId" -> queryWrapper.orderByAsc(PlateDO::getGoodsId); - case "goodsName" -> queryWrapper.orderByAsc(PlateDO::getGoodsName); - case "material" -> queryWrapper.orderByAsc(PlateDO::getMaterial); - case "color" -> queryWrapper.orderByAsc(PlateDO::getColor); - case "texture" -> queryWrapper.orderByAsc(PlateDO::getTexture); - case "width" -> queryWrapper.orderByAsc(PlateDO::getWidth); - case "height" -> queryWrapper.orderByAsc(PlateDO::getHeight); - case "thickness" -> queryWrapper.orderByAsc(PlateDO::getThickness); - case "brand" -> queryWrapper.orderByAsc(PlateDO::getBrand); - case "price" -> queryWrapper.orderByAsc(PlateDO::getPrice); - default -> { - // default不排序 - } - } - }else if (reqVO.getOrder().equals("descend")) { - switch (reqVO.getField()) { - case "goodsId" -> queryWrapper.orderByDesc(PlateDO::getGoodsId); - case "goodsName" -> queryWrapper.orderByDesc(PlateDO::getGoodsName); - case "material" -> queryWrapper.orderByDesc(PlateDO::getMaterial); - case "color" -> queryWrapper.orderByDesc(PlateDO::getColor); - case "texture" -> queryWrapper.orderByDesc(PlateDO::getTexture); - case "width" -> queryWrapper.orderByDesc(PlateDO::getWidth); - case "height" -> queryWrapper.orderByDesc(PlateDO::getHeight); - case "thickness" -> queryWrapper.orderByDesc(PlateDO::getThickness); - case "brand" -> queryWrapper.orderByDesc(PlateDO::getBrand); - case "price" -> queryWrapper.orderByDesc(PlateDO::getPrice); - default -> { - // default不排序 - } - } - } - } - - return selectPage(reqVO, queryWrapper); - } - - PlateDO selectOneById(@Param("id") Long id, @Param("organId") Long organId); - - default Boolean isByGoodID(String goodId , Long organId) { - return selectList(PlateDO::getGoodsId, goodId, PlateDO::getOrganId, organId).size() > 0; - } - - default Boolean isByGoodIDAndId(String goodId , Long organId , Long id) { - return selectCount(new LambdaQueryWrapper() - .ne(PlateDO::getId, id) - .eq(PlateDO::getGoodsId, goodId) - .eq(PlateDO::getOrganId, organId)) > 0; - } - - default List getAllByOrganId(Long organId) { - return selectList(new LambdaQueryWrapper() - .eq(PlateDO::getOrganId, organId) - .eq(PlateDO::getDeleted, 0)); - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.java deleted file mode 100644 index 5b0082bcd..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.process; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.pack.vo.PackPageReqVO; -import com.cf.imes.module.manage.controller.admin.pack.vo.PackRespVO; -import com.cf.imes.module.manage.controller.admin.pack.vo.PrintOrderPackRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderPlatePageReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OrdersMapper extends BaseMapperX { - - - - default PageResult selectProductionPage(OrderPlatePageReqVO pageReqVO) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eqIfPresent(OrderDO::getId, pageReqVO.getOrderNo()) - .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo()) - .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer()) - .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress()) - .and(wrapper -> { - for (Long status : pageReqVO.getStatusList()) { - wrapper.or().eq(OrderDO::getStatus, status); - } - }) - .orderByDesc(OrderDO::getCreateTime)); - } - - - - List selectOrderIds( @Param("createTime") String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId); - - - - List selectOrderIdsFalse(@Param("createTime") String createTime,@Param("organId") Long organId, @Param("orderId") Long orderId); - - - - - PrintOrderPackRespVO selectOrderPack(@Param("orderNo")Long orderNo, @Param("packageNo") Long packageNo, @Param("organId") Long organId); - - - - IPage selectOrderIdList(@Param("page") IPage page, @Param("pageReqVO") PackPageReqVO pageReqVO, @Param("organId") Long organId); - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java deleted file mode 100644 index 17d2109fa..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.process; - - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.process.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 生产单工序明细表 order_process_step_item_{N} Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface ProcessStepItemMapper extends BaseMapperX { - - - List selectPlateName(Long processStepId); - - - void updateStatus(@Param("id") Long id); - - - ProcessStepStatus selectStatusById(@Param("id") Long id,@Param("name") String name, @Param("organId") Long organId, @Param("goodsId")Long goodsId); - - - void updateStemStatus(@Param("processStepId") Long processStepId,@Param("name") String name); - - - - default List selectStemById(Long stepId,Boolean status,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderProcessStepItemNDO::getOrganId,organId) - .eqIfPresent(OrderProcessStepItemNDO::getStatus,status) - .eqIfPresent(OrderProcessStepItemNDO::getProcessStepId,stepId)); - - } - - - - List selectBodyIds(@Param("processStepId") Long processStepId,@Param("name") String name, @Param("organId") Long organId); - - BigDecimal selectAreaByProcessStepId(@Param("processStepId") Long processStepId,@Param("organId") Long organId); - - void updateStatusByBodyId(@Param("goodsId") Long goodsId); - - - BigDecimal selectAreaByProcessId( @Param("processStepId")Long processStepId,@Param("orderId") Long orderId,@Param("organId") Long organId); -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java deleted file mode 100644 index b24379016..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.process; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPageReqVO; -import com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.ProductionGroupVO; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRatePageReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 生产单工序步骤表 order_process_step_{N} Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface ProcessStepMapper extends BaseMapperX { - - - - IPage selectOrder( @Param("page") IPage page, @Param("pageReqVO") ProcessPageReqVO pageReqVO,@Param("organId") Long organId ); - - - - void updateStatusById(@Param("id") Long id, @Param("salary")BigDecimal salary); - - - List selectProducitonList(@Param("orderNo") Long orderNo,@Param("organId") Long organId); - - - - IPage selectSalaryList( @Param("page") IPage page, @Param("pageReqVO") PriceRatePageReqVO pageReqVO,@Param("organId") Long organId); - - - BigDecimal calculateSalary( @Param("processStepId") Long processStepId,@Param("area") BigDecimal area, @Param("pieceRate")BigDecimal pieceRate,@Param("organId") Long organId); - - void updateStatus(@Param("id") Long id, @Param("nickname") String nickname, @Param("salary")BigDecimal salary); - - void updateStatusByName(@Param("id") Long processStepId,@Param("nickname") String nickname); - - List selectProcessList(@Param("organId") Long organId); - - - default List selectOrderStatus(Long orderId, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getOrganId, organId) - .eqIfPresent(OrderProcessStepNDO::getOrderId, orderId) - .eqIfPresent(OrderProcessStepNDO::getStatus,false)); - - } - - - default OrderProcessStepNDO selectOrderProcess(Long orderId, Long organId, Integer type) { - return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getOrganId, organId) - .eqIfPresent(OrderProcessStepNDO::getOrderId, orderId) - .eqIfPresent(OrderProcessStepNDO::getType,type)); - - } - - - default List selectByOrderIds(List orderIds, Long organId, Integer number) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getOrganId, organId) - .inIfPresent(OrderProcessStepNDO::getOrderId, orderIds) - .eqIfPresent(OrderProcessStepNDO::getType,number)); - - } - - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java deleted file mode 100644 index 87384bb37..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.query; - - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.pack.vo.PlateAndPartIdList; -import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.process.vo.PlateDetails; -import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPlateReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderPlateRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.PlatePageVO; -import com.cf.imes.module.manage.dal.dataobject.query.OrderItemDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OrderItemMapper extends BaseMapperX { - - - - List selectCombinationName(Long orderNo); - - - List selectPlateList(PlatePageVO pageReqVO); - - - - List selectPrintPlateList(@Param("orderNo")Long orderNo,@Param("packageNo") Long packageNo, @Param("organId") Long organId); - - - - void deleteOrderPack(@Param("packId") Long packId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - - void deleteOtherParts(@Param("partsId") Long partsId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - - void insertPackId(@Param("plateIdList") List plateIdList, @Param("packId") Long packId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - void deletePackId(@Param("deletePlateIdList") List deletePlateIdList,@Param("packId") Long packId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - void insertPartsId(@Param("packId") Long packId, @Param("addPartsIdList") List addPartsIdList,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - - List selectByOrderId(@Param("reqVO") ProcessPlateReqVO reqVO, @Param("organId") Long organId ); - - - void insertParts(@Param("addPartsList") List addPartsList, @Param("packId")Long packId, @Param("orderId") Long orderId,@Param("organId") Long organId); - - void deletePartsList(@Param("deletePartsList")List deletePartsList,@Param("packId") Long packId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - List selectPlateListByBodyIds( @Param("collect") List collect,@Param("orderId") Long orderId,@Param("userOrganId") Long userOrganId); - - - - default List selectPackList(Long packId,Long orderId ,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderItemDO::getOrganId, organId) - .eqIfPresent(OrderItemDO::getOrderId,orderId) - .eqIfPresent(OrderItemDO::getPackageId, packId)); - } - - - void deleteParts(@Param("packageId") Long packageId,@Param("orderId") Long orderId ,@Param("partsIds") List partsIds,@Param("organId") Long organId); - - void updateParts(@Param("partsId") Long partsId,@Param("packageId") Long packageId,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - default List selectPackPlateList(Long orderId, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderItemDO::getOrganId, organId) - .eqIfPresent(OrderItemDO::getOrderId, orderId)); - } - - - default List selectPackByPlateId(List plateId,Long orderId ,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderItemDO::getOrganId, organId) - .eqIfPresent(OrderItemDO::getOrderId,orderId) - .inIfPresent(OrderItemDO::getPlateId, plateId) - .select(OrderItemDO::getPackageId)); - } - - - List selectOrderPackPartsIds(@Param("orderId") Long orderId, @Param("organId") Long organId); - - List selectOrderPackPlateIds(@Param("orderId") Long orderId,@Param("organId") Long organId); - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java deleted file mode 100644 index f8db63205..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.query; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.controller.admin.pack.vo.OrderPartsRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; -import com.cf.imes.module.manage.dal.dataobject.query.OrderPartsNDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OrderPartsMapper extends BaseMapperX { - - - IPage selectParts(@Param("page") IPage page, @Param("packageId") Long packageId, @Param("organId") Long organId); - - - List selectPartsList( @Param("orderId") Long orderId , @Param("organId") Long organId); - - - - void deleteOrderParts(@Param("partsIds") List partsIds,@Param("orderId") Long orderId,@Param("organId") Long organId); - - - void updateParts(@Param("partsId") Long partsId,@Param("orderId") Long orderId,@Param("organId") Long organId); - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/register/RegisterMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/register/RegisterMapper.java deleted file mode 100644 index b6529b6bd..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/register/RegisterMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.register; - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.dal.dataobject.register.RegisterDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * @author there - */ -@Mapper -public interface RegisterMapper extends BaseMapperX { - - @Select("select * from system_db_register") - List findAll(); -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java deleted file mode 100644 index 412d099eb..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.remainplaten; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePageReqVO; -import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Set; - -/** - * 生产单余料板表 order_remain_plate_{N} Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface RemainPlateMapper extends BaseMapperX { - - default PageResult selectPage(RemainPlatePageReqVO reqVO) { - LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX() - .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId() : null) - .likeIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId() : null) - .likeIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId() : null) - .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus()) - .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId()) - .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting()) - .likeIfPresent(RemainPlateDO::getName, reqVO.getName()) - .likeIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial()) - .likeIfPresent(RemainPlateDO::getColor, reqVO.getColor()) - .eqIfPresent(RemainPlateDO::getThickness, reqVO.getThickness()) - .eqIfPresent(RemainPlateDO::getBrand, reqVO.getBrand()) - .eqIfPresent(RemainPlateDO::getPlaceStyle, reqVO.getPlaceStyle()) - .likeIfPresent(RemainPlateDO::getStore, reqVO.getStore()) - .eqIfPresent(RemainPlateDO::getCount, reqVO.getCount()) - .eqIfPresent(RemainPlateDO::getTexture, reqVO.getTexture()) - .likeIfPresent(RemainPlateDO::getRemark, reqVO.getRemark()) - .eqIfPresent(RemainPlateDO::getUseType, reqVO.getUseType()) - .eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId()) - .eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson()) - .betweenIfPresent(RemainPlateDO::getWidth, reqVO.getWidth()) - .betweenIfPresent(RemainPlateDO::getLength, reqVO.getLength()) - .betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime()); - - if (reqVO.getOrder() == null) { - wrapper.orderByDesc(RemainPlateDO::getId); - }else { - if (reqVO.getOrder().equals("ascend")) { - switch (reqVO.getField()) { - case "id" -> wrapper.orderByAsc(RemainPlateDO::getId); - case "length" -> wrapper.orderByAsc(RemainPlateDO::getLength); - case "width" -> wrapper.orderByAsc(RemainPlateDO::getWidth); - case "thickness" -> wrapper.orderByAsc(RemainPlateDO::getThickness); - case "material" -> wrapper.orderByAsc(RemainPlateDO::getMaterial); - case "color" -> wrapper.orderByAsc(RemainPlateDO::getColor); - case "texture" -> wrapper.orderByAsc(RemainPlateDO::getTexture); - case "brand" -> wrapper.orderByAsc(RemainPlateDO::getBrand); - case "store" -> wrapper.orderByAsc(RemainPlateDO::getStore); - case "initPlanId" -> wrapper.orderByAsc(RemainPlateDO::getInitPlanId); - case "planId" -> wrapper.orderByAsc(RemainPlateDO::getPlanId); - case "status" -> wrapper.orderByAsc(RemainPlateDO::getStatus); - default -> { - // default不排序 - } - } - }else if (reqVO.getOrder().equals("descend")) { - switch (reqVO.getField()) { - case "id" -> wrapper.orderByDesc(RemainPlateDO::getId); - case "length" -> wrapper.orderByDesc(RemainPlateDO::getLength); - case "width" -> wrapper.orderByDesc(RemainPlateDO::getWidth); - case "thickness" -> wrapper.orderByDesc(RemainPlateDO::getThickness); - case "material" -> wrapper.orderByDesc(RemainPlateDO::getMaterial); - case "color" -> wrapper.orderByDesc(RemainPlateDO::getColor); - case "texture" -> wrapper.orderByDesc(RemainPlateDO::getTexture); - case "brand" -> wrapper.orderByDesc(RemainPlateDO::getBrand); - case "store" -> wrapper.orderByDesc(RemainPlateDO::getStore); - case "initPlanId" -> wrapper.orderByDesc(RemainPlateDO::getInitPlanId); - case "planId" -> wrapper.orderByDesc(RemainPlateDO::getPlanId); - case "status" -> wrapper.orderByDesc(RemainPlateDO::getStatus); - default -> { - // default不排序 - } - } - } - } - - return selectPage(reqVO, wrapper); - } - - default PageResult selectPageToAdd(RemainPlatePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .neIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId()) - .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus()) - .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId()) - .likeIfPresent(RemainPlateDO::getName, reqVO.getName()) - .likeIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial()) - .likeIfPresent(RemainPlateDO::getColor, reqVO.getColor()) - .eqIfPresent(RemainPlateDO::getThickness, reqVO.getThickness()) - .eqIfPresent(RemainPlateDO::getBrand, reqVO.getBrand()) - .likeIfPresent(RemainPlateDO::getStore, reqVO.getStore()) - .eqIfPresent(RemainPlateDO::getCount, reqVO.getCount()) - .eqIfPresent(RemainPlateDO::getTexture, reqVO.getTexture()) - .likeIfPresent(RemainPlateDO::getRemark, reqVO.getRemark()) - .eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId()) - .eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson()) - .betweenIfPresent(RemainPlateDO::getWidth, reqVO.getWidth()) - .betweenIfPresent(RemainPlateDO::getLength, reqVO.getLength()) - .betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(RemainPlateDO::getId)); - } - // 批量修改状态 - default void updateRemainPlateStatus(Set ids, Integer status, Integer useType,Long organId,Long planId) { - update(new UpdateWrapper() - .set("status", status) - .set("use_type", useType) - .set("plan_id",planId) - .eq("organ_id",organId) - .in("id", ids)); - } - - // 查询该排单是否已经添加余料 - default List selectRemainPlatesByInitPlanId(Long initPlanId, Integer deleted, Long organId) { - return selectList(new LambdaUpdateWrapper() - .eq(RemainPlateDO::getInitPlanId, initPlanId) - .eq(RemainPlateDO::getDeleted, deleted) - .eq(RemainPlateDO::getOrganId, organId)); - } - - // 判断该排单是否存在以使用的余料 - default List selectRemainPlatesByPlanId(Long planId, Integer status, Integer deleted, Long organId) { - return selectList(new LambdaUpdateWrapper() - .eq(RemainPlateDO::getPlanId, planId) - .eq(RemainPlateDO::getStatus, status) - .eq(RemainPlateDO::getDeleted, deleted) - .eq(RemainPlateDO::getOrganId, organId)); - } - - // 通过排单id批量余料板 -// default void deleteRemainPlate(Long initPlanId, Long organId) { -// update(new UpdateWrapper() -// .set("deleted", 1) -// .eq("init_plan_id", initPlanId) -// .eq("organ_id", organId)); -// } - void deleteRemainPlate(@Param("initPlanId") Long initPlanId, @Param("organId") Long organId); - - // 根据使用排单id批量还原状态 - default void updateRemainPlateStatusByPlanId(Integer status, Integer useType,Long organId,Long planId) { - update(new UpdateWrapper() - .set("status", status) - .set("use_type", useType) - .set("plan_id","") - .eq("organ_id",organId) - .eq("plan_id", planId)); - } -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/test/TestMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/test/TestMapper.java deleted file mode 100644 index 7c5b0f818..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/test/TestMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cf.imes.module.manage.dal.mysql.test; - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.manage.dal.dataobject.test.TestDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author there - */ -@Mapper -public interface TestMapper extends BaseMapperX { -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/enums/OrderPackStatusEnums.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/enums/OrderPackStatusEnums.java deleted file mode 100644 index 2087ee2a6..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/enums/OrderPackStatusEnums.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cf.imes.module.manage.enums; - - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@AllArgsConstructor -@Getter -public enum OrderPackStatusEnums { - - - UNPACKAGED(0,"未打包"), - INPACKAGING(1, "打包中"), - PACKAGED(1, "打包完成"); - private Integer status; - private String description; - - - public boolean equals(Integer status) { - return this.status .equals(status) ; - } - - public boolean equals(OrderPackStatusEnums enableStatusEnum) { - return enableStatusEnum != null && enableStatusEnum.status .equals(this.getStatus()) ; - } - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/rpc/config/RpcConfiguration.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/rpc/config/RpcConfiguration.java deleted file mode 100644 index 43498de56..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/rpc/config/RpcConfiguration.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cf.imes.module.manage.framework.rpc.config; - -import com.cf.imes.module.executor.api.plan.OrderPlanApi; -import com.cf.imes.module.system.api.organ.OrganApi; -import com.cf.imes.module.system.api.permission.PermissionApi; -import com.cf.imes.module.system.api.process.ProcessApi; -import com.cf.imes.module.system.api.setting.SettingApi; -import com.cf.imes.module.system.api.user.AdminUserApi; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Configuration; - -@Configuration(proxyBeanMethods = false) -@EnableFeignClients(clients = {AdminUserApi.class, OrganApi.class, ProcessApi.class, SettingApi.class,PermissionApi.class, OrderPlanApi.class}) -public class RpcConfiguration { -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/rpc/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/rpc/package-info.java deleted file mode 100644 index edd18b8bb..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/rpc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package com.cf.imes.module.manage.framework.rpc; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/security/config/SecurityConfiguration.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/security/config/SecurityConfiguration.java deleted file mode 100644 index 4592877b3..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/security/config/SecurityConfiguration.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cf.imes.module.manage.framework.security.config; - -import com.cf.imes.framework.security.config.AuthorizeRequestsCustomizer; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; - -/** - * manage 模块的 Security 配置 - * @author there - */ -@Configuration(proxyBeanMethods = false, value = "manageSecurityConfiguration") -public class SecurityConfiguration { - - @Bean("manageAuthorizeRequestsCustomizer") - public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { - return new AuthorizeRequestsCustomizer() { - - @Override - public void customize(ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry) { - // Swagger 接口文档 - registry.antMatchers("/v3/api-docs/**").permitAll() // 元数据 - .antMatchers("/swagger-ui.html").permitAll(); // Swagger UI - // Spring Boot Actuator 的安全配置 - registry.antMatchers("/actuator").anonymous() - .antMatchers("/actuator/**").anonymous(); - // Druid 监控 - registry.antMatchers("/druid/**").anonymous(); - - // RPC 服务的安全配置 - registry.antMatchers("/rpc-api/manage/**").permitAll(); - } - - }; - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/security/core/package-info.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/security/core/package-info.java deleted file mode 100644 index 9018d29e9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package com.cf.imes.module.manage.framework.security.core; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java deleted file mode 100644 index 33cccfaa8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cf.imes.module.manage.service.pack; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.pack.prePack.PrePackReqVO; -import com.cf.imes.module.manage.controller.admin.pack.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; - -import java.util.List; - -public interface PackService { - - - // 打包分页查询 - PageResult getPackPage(PackPageReqVO pageReqVO); - - - // 查看生产订单对应的包裹信息 - List getOrderPack(PackageDetailsReqVO reqVO); - - - PageResult getPageOrderPack(PackageDetailsReqVO reqVO); - - - // 查看生产订单对应的板材信息 - List getOrderPlateList(Long orderId); - - - - // 查询多个生产单对应的板材信息 - List getOrdersPlateList(List orderIds); - - - - - - - // 查看配件列表分页 - List getPartsList(OrderPartsReqVO reqVO); - - OrderPackRespVO updateParts(OrderPartsReqVO reqVO); - - - // 拆包 - OrderPackRespVO unpacking(Long packageID); - - - - // 更新包裹 - OrderPackRespVO updatePack(OrderPackReqVO packageVO); - - - // 查询包裹 - List selectPack(Long orderId); - - - // 包裹订单打印 - PrintOrderPackRespVO printOrderPack(PrintOrderPackReqVO reqVO); - - - // 删除包裹及其关联的包裹信息(删除全部) - void deleteOrderPack(PackReqVO reqVO); - - - - // 新增外部配件包裹 - OrderPackRespVO addNewOtherPack(OtherPackReqVO reqVO); - - - // 新增外部配件 - OrderPartsRespVO addNewOtherParts(OtherPackReqVO reqVO); - - - - - // 删除包裹中的外部配件 - void deleteOtherParts(DeleteOtherPartsReqVO reqVO); - - - - // 新增配件-即新增一个包裹 - OrderPackRespVO addNewPartsPack(OrderPackReqVO reqVO); - - - - // 查询预打包优化信息 - String getPrePackInfo(Long orderId); - - - // 保存优化后的预打包信息 - void saveOptimizeInfo(PrePackReqVO reqVO); - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java deleted file mode 100644 index 87fbd25f5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ /dev/null @@ -1,1044 +0,0 @@ -package com.cf.imes.module.manage.service.pack; - - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.cf.imes.framework.common.enums.*; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.Assert.AssertUtils; -import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.id.core.util.SnowflakeIdWorker3rd; -import com.cf.imes.framework.mybatis.core.query.QueryWrapperX; -import com.cf.imes.module.executor.api.plan.OrderPlanApi; -import com.cf.imes.module.manage.controller.admin.pack.prePack.PackPlateList; -import com.cf.imes.module.manage.controller.admin.pack.prePack.PrePackOptimizeInfo; -import com.cf.imes.module.manage.controller.admin.pack.prePack.PrePackReqVO; -import com.cf.imes.module.manage.controller.admin.pack.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; -import com.cf.imes.module.manage.dal.dataobject.pack.OrderPrepackagedDO; -import com.cf.imes.module.manage.dal.dataobject.plate.OrderPlateDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.dal.dataobject.query.OrderItemDO; -import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO; -import com.cf.imes.module.manage.dal.dataobject.query.OrderPartsNDO; -import com.cf.imes.module.manage.dal.mysql.pack.OrderBodyMapper; -import com.cf.imes.module.manage.dal.mysql.pack.OrderPackageMapper; -import com.cf.imes.module.manage.dal.mysql.pack.OrderPrepackagedMapper; -import com.cf.imes.module.manage.dal.mysql.plate.OrderPlateMapper; -import com.cf.imes.module.manage.dal.mysql.process.OrdersMapper; -import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; -import com.cf.imes.module.manage.dal.mysql.query.OrderPartsMapper; -import com.cf.imes.module.system.api.setting.SettingApi; -import com.cf.imes.module.system.api.setting.dto.PackageConfigDTO; -import com.cf.imes.module.system.enums.ErrorCodeConstants; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.aop.framework.AopContext; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.framework.common.util.string.SearchUtil.insertSeparator; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; - -@Service -@Validated -public class PackServiceImpl implements PackService { - - @Resource - private OrderPackageMapper orderPackageMapper; - - - @Resource - private OrderItemMapper orderItemMapper; - - @Resource - private OrderPartsMapper orderPartsMapper; - - @Resource - private OrderBodyMapper orderBodyMapper; - - @Resource - private OrderPlateMapper orderPlateMapper; - - @Resource - private OrdersMapper ordersMapper; - - @Resource - private SnowflakeIdWorker3rd idWorker; - - @Resource - private OrderPrepackagedMapper orderPrepackagedMapper; - - - @Resource - private SettingApi settingApi; - - @Resource - private OrderPlanApi orderPlanApi; - - - // 打包分页查询 - @Override - public PageResult getPackPage(PackPageReqVO pageReqVO) { - - PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - - List orderIds = new ArrayList<>(); - - - if (pageReqVO.getIsUp() != null) { - - return handleIsUpCase(pageReqVO, orderIds,pageReqVO.getIsUp()); - - } else { - - return handleNormalCase(pageReqVO, orderIds, page); - - } - - - } - - - - // 查看生产订单对应的板材信息 - @Override - public List getOrderPlateList(Long orderId) { - - // 查询订单对应的板件信息 - List plateDetailsRespVOS = orderPlateMapper.selectOrderNoPackPlateList(orderId, getUserOrganId()); - - if(plateDetailsRespVOS.isEmpty()){ - return new ArrayList<>(); - } - - for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { - StringBuilder name = new StringBuilder(); - if (!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { - for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { - // 去除最后的逗号 - name.append(groupNameList.getName()).append(","); - - } - name = new StringBuilder(name.substring(0, name.length() - 1)); - } - plateDetailsRespVO.setProcessGroup(name.toString()); - } - - return plateDetailsRespVOS; - - - } - - - // 查询多个生产单对应的板材信息 - @Override - public List getOrdersPlateList(List orderIds) { - -// List orderDOS = ordersMapper.selectBatchIds(orderIds); -// orderDOS.forEach(f->{ -// if(OrderPackageStatusEnum.PACKAGED.equals(f.getPackaged())){ -//// throw exception(ORDER_IS_PACK_ERROR,f.getId()); -// } -// }); - - List plateDetailsRespVOS = orderPlateMapper.selectOrderPlateList(orderIds,getUserOrganId()); - - if (plateDetailsRespVOS.isEmpty()) { - - return new ArrayList<>(); - } - - List packageIds = plateDetailsRespVOS.stream().map(PlateDetailsRespVO::getPackageId).distinct().toList(); - List orderPackageDOS = new ArrayList<>(); - if (!packageIds.isEmpty()) { - orderPackageDOS = orderPackageMapper.selectBatchIds(packageIds); - } - - - for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { - StringBuilder name = new StringBuilder(); - if (!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { - for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { - // 去除最后的逗号 - name.append(groupNameList.getName()).append(","); - } - name = new StringBuilder(name.substring(0, name.length() - 1)); - } - plateDetailsRespVO.setProcessGroup(name.toString()); - - plateDetailsRespVO.setPackageNo(orderPackageDOS.stream() - .filter(m -> m.getId().equals(plateDetailsRespVO.getPackageId())) - .map(OrderPackageDO::getPackageNo).findFirst().orElse("")); - - } - - return plateDetailsRespVOS; - - - } - - - // 查看生产订单对应的包裹信息 - @Override - public List getOrderPack(PackageDetailsReqVO reqVO) { - - - List orderPackageVOS = orderPackageMapper.selectPackListByOrderId(Long.valueOf(reqVO.getOrderId()), getUserOrganId()); - - if(orderPackageVOS.isEmpty()){ - return new ArrayList<>(); - } - - OrderDO orderDO = ordersMapper.selectById(reqVO.getOrderId()); - - AssertUtils.notEmpty(orderDO,ORDER_DATE_ERROR); - - orderPackageVOS.forEach(m -> { - m.setCustomOrderNo(orderDO.getCustomOrderNo()); - m.setCustomer(orderDO.getCustomer()); - m.setAddress(orderDO.getAddress()); - m.setDealer(orderDO.getDealer()); - m.setOrderRemark(orderDO.getRemark()); - } - ); - - return orderPackageVOS; - - } - - - @Override - public PageResult getPageOrderPack(PackageDetailsReqVO reqVO) { - - PageDTO page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize()); - - List packId = null; - - Long orderId = Long.valueOf(reqVO.getOrderId()); - - if (reqVO.getPlateNo() != null) { - - List plateId = orderPlateMapper.selectplateByPlateNo(reqVO.getPlateNo(), orderId, getUserOrganId()) - .stream().map(OrderPlateDO::getId).toList(); - - if (plateId.isEmpty()) { - return null; - } - - packId = orderItemMapper.selectPackByPlateId(plateId,orderId ,getUserOrganId()).stream().map(OrderItemDO::getPackageId).distinct().toList(); - - } - - - QueryWrapperX queryWrapperX = new QueryWrapperX<>(); - queryWrapperX - .eq("o.organ_id", getUserOrganId()) - .eq("o.deleted", false) - .eq("o.id", reqVO.getOrderId()) - .eq("op.deleted", false) - .likeIfPresent("op.package_no", reqVO.getPackageNo()) - .inIfPresent("op.id", packId) - .eqIfPresent("op.status", reqVO.getPackStatus()) - .orderByDesc("op.create_time"); - - - IPage orderPackageDOIPage = orderPackageMapper.selectByOrderNo(page, queryWrapperX); - - - if (CollUtil.isEmpty(orderPackageDOIPage.getRecords())) { - return new PageResult<>(); - } - - - return new PageResult<>(orderPackageDOIPage.getRecords(), orderPackageDOIPage.getTotal()); - - } - - - // 查看配件列表分页 - @Override - public List getPartsList(OrderPartsReqVO reqVO) { - - return orderPartsMapper.selectPartsList(reqVO.getOrderId(), getUserOrganId()); - - } - - - // 更新配件 - @Override - @Transactional(rollbackFor = Exception.class) - public OrderPackRespVO updateParts(OrderPartsReqVO reqVO) { - - validateOrdersExists(reqVO.getOrderId(),null); - - // 判断包裹ID是否为空，为空，走新增，不为空，走更新 - if (reqVO.getPackId() == null) { - - OrderPackageDO orderPackageDO = new OrderPackageDO(); - orderPackageDO.setOrderId(reqVO.getOrderId()); - orderPackageDO.setType(OrderPackageTypeEnum.PARTS.getType()); - orderPackageDO.setPackageNo(generatePackageNo()); - orderPackageDO.setStatus((OrderPackageStatusEnum.PACKAGED.getStatus())); - orderPackageMapper.insert(orderPackageDO); - // 生产单明细表新增包裹 ID - if (reqVO.getAddPartsIdList() != null) { - orderItemMapper.insertPartsId(orderPackageDO.getId(), reqVO.getAddPartsIdList(), reqVO.getOrderId(), getUserOrganId()); - } - - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 - if (validateOrderPack(reqVO.getOrderId())) { - - PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); - p.updateOrderStatus(reqVO.getOrderId()); - - } - - return typeConversion(orderPackageDO); - - } - - - if(reqVO.getAddPartsIdList().isEmpty() && reqVO.getAddPlateIdList().isEmpty() && reqVO.getDeletePartsIdList().isEmpty()){ - throw exception(PART_PACK_DATA_ERROR); - } - - - OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackId(reqVO.getPackId(),reqVO.getOrderId(), getUserOrganId()); - - AssertUtils.notEmpty(orderPackageDO,ORDER_PACK_DATA_ERROR); - List orderItemDOS = orderItemMapper.selectPackList(reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); - List partsList = orderItemDOS.stream().map(OrderItemDO::getPartsId).distinct().toList(); - - - // 如果此时删除的包裹配件数量等于查询出来的配件数量，且新增的板材数量不为0，更改包裹的类型 - if (reqVO.getDeletePartsIdList().size() == partsList.size() && !reqVO.getAddPlateIdList().isEmpty()) { - - - // 删除生产单明细表配件对应的包裹ID - orderItemMapper.deletePartsList(reqVO.getDeletePartsIdList(), reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); - - - // 生产单明细表板材新增对应的包裹ID - orderItemMapper.insertPackId(reqVO.getAddPlateIdList(), reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); - - - // 更新包裹类型和包裹的状态 - orderPackageDO.setType(OrderPackageTypeEnum.PLATE.getType()); - orderPackageDO.setStatus(OrderPackageStatusEnum.PACKAGED.getStatus()); - orderPackageMapper.updateById(orderPackageDO); - return typeConversion(orderPackageDO); - - } - - - // 生产明细表新增的配件ID - if (!reqVO.getAddPartsIdList().isEmpty()) { - orderItemMapper.insertParts(reqVO.getAddPartsIdList(), reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); - } - // 生产明细表删除的配件ID - if (!reqVO.getDeletePartsIdList().isEmpty()) { - orderItemMapper.deletePartsList(reqVO.getDeletePartsIdList(), reqVO.getPackId(), reqVO.getOrderId(), getUserOrganId()); - } - orderPackageDO.setStatus(OrderPackageStatusEnum.PACKAGED.getStatus()); - - orderPackageMapper.updateById(orderPackageDO); - - - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 - if (validateOrderPack(reqVO.getOrderId())) { - - PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); - p.updateOrderStatus(reqVO.getOrderId()); - - } - - return typeConversion(orderPackageDO); - } - - - // 拆包 - @Override - @Transactional(rollbackFor = Exception.class) - public OrderPackRespVO unpacking(Long packageID) { - - OrderPackageDO packageDO = orderPackageMapper.selectById(packageID); - - AssertUtils.notEmpty(packageDO,ORDER_PACK_DATA_NULL_ERROR ); - - Long orderId = packageDO.getOrderId(); - - OrderDO orderDO = ordersMapper.selectById(orderId); - - AssertUtils.notEmpty(orderDO,ORDER_NO_DATA_ERROR); - - orderDO.setPackaged(OrderPackageStatusEnum.UNPACKED.getStatus()); - - if(orderDO.getStatus().equals(OrderStatusEnum.FINISH_PRODUCTION.getStatus())){ - orderDO.setStatus(OrderStatusEnum.IN_PRODUCTION.getStatus()); - orderDO.setFinishTime(null); - } - - ordersMapper.updateById(orderDO); - - packageDO.setStatus(OrderPackageStatusEnum.UNPACKED.getStatus()); - orderPackageMapper.updateById(packageDO); - return typeConversion(packageDO); - - - } - - - // 更新包裹 - @Override - @Transactional(rollbackFor = Exception.class) - public OrderPackRespVO updatePack(OrderPackReqVO packageVO) { - - validateOrdersExists(packageVO.getOrderId(),null); - - // 判断包裹ID是否为空，为空，走新增，不为空，走更新 - if (packageVO.getPackId() == null) { - - OrderPackageDO orderPackageDO = new OrderPackageDO(); - orderPackageDO.setOrderId(packageVO.getOrderId()); - orderPackageDO.setType(OrderPackageTypeEnum.PLATE.getType()); - orderPackageDO.setPackageNo(generatePackageNo()); - orderPackageDO.setStatus((OrderPackageStatusEnum.PACKAGED.getStatus())); - orderPackageDO.setRemark(packageVO.getRemark()); - orderPackageMapper.insert(orderPackageDO); - // 生产单明细表新增包裹 ID - if (packageVO.getAddPlateIdList() != null) { - orderItemMapper.insertPackId(packageVO.getAddPlateIdList(), orderPackageDO.getId(), packageVO.getOrderId(), getUserOrganId()); - } - - if (validateOrderPack(packageVO.getOrderId())) { - - PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); - p.updateOrderStatus(packageVO.getOrderId()); - } - - return typeConversion(orderPackageDO); - } - - - if(packageVO.getAddPlateIdList().isEmpty() && packageVO.getAddPartsIdList().isEmpty() && packageVO.getDeletePlateIdList().isEmpty()){ - throw exception(PART_PACK_DATA_ERROR); - } - - - OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackId(packageVO.getPackId(),packageVO.getOrderId(), getUserOrganId()); - - AssertUtils.notEmpty(orderPackageDO,ORDER_PACK_DATA_ERROR); - - List orderItemDOS = orderItemMapper.selectPackList(packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); - List plateList = orderItemDOS.stream().map(OrderItemDO::getPlateId).distinct().toList(); - - - // 如果此时删除的包裹板材数量等于查询出来的板材数量，且新增的配件数量不为0，更改包裹的类型 - if (packageVO.getDeletePlateIdList().size() == plateList.size() && !packageVO.getAddPartsIdList().isEmpty()) { - - - // 删除生产单明细表板件对应的包裹ID - orderItemMapper.deletePackId(packageVO.getDeletePlateIdList(), packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); - - - // 生产单明细表配件新增对应的包裹ID - orderItemMapper.insertParts(packageVO.getAddPartsIdList(), packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); - - - // 更新包裹类型和包裹的状态 - orderPackageDO.setType(OrderPackageTypeEnum.PARTS.getType()); - orderPackageDO.setStatus(OrderPackageStatusEnum.PACKAGED.getStatus()); - orderPackageMapper.updateById(orderPackageDO); - return typeConversion(orderPackageDO); - - } - - - // 生产明细表新增包裹ID - if (!packageVO.getAddPlateIdList().isEmpty()) { - orderItemMapper.insertPackId(packageVO.getAddPlateIdList(), packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); - } - - // 移除生产明细表中板件对应的包裹ID - if (!packageVO.getDeletePlateIdList().isEmpty()) { - orderItemMapper.deletePackId(packageVO.getDeletePlateIdList(), packageVO.getPackId(), packageVO.getOrderId(), getUserOrganId()); - } - orderPackageDO.setStatus(OrderPackageStatusEnum.PACKAGED.getStatus()); - - orderPackageMapper.updateById(orderPackageDO); - - - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 - if (validateOrderPack(packageVO.getOrderId())) { - - // 修改生产单的打包状态 - PackServiceImpl p = (PackServiceImpl)AopContext.currentProxy(); - p.updateOrderStatus(packageVO.getOrderId()); - - } - - return typeConversion(orderPackageDO); - - } - - - // 判断当前生产单的板材和配件是否已全部打包且当前生产单的包裹已全部封包 - public Boolean validateOrderPack(Long orderId) { - - List orderPackageDOS = orderPackageMapper.selectPackList(orderId, getUserOrganId()); - - if (!orderPackageDOS.isEmpty()) { - return false; - } - - List partsIds = orderItemMapper.selectOrderPackPartsIds(orderId, getUserOrganId()); - - List plateIds = orderItemMapper.selectOrderPackPlateIds(orderId, getUserOrganId()); - - return partsIds.isEmpty() && plateIds.isEmpty(); - - } - - - // 修改当前生产单的工序状态和生产单的状态 - @Transactional(rollbackFor = Exception.class) - public void updateOrderStatus(Long orderId) { - - OrderDO orderDO = ordersMapper.selectById(orderId); - - - // 修改生产单的打包状态为已打包 - orderDO.setPackaged(OrderPackageStatusEnum.PACKAGED.getStatus()); - - - if(orderPlanApi.getOrder(orderId).getData()){ - orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); - orderDO.setFinishTime(LocalDateTime.now()); - } - - - ordersMapper.updateById(orderDO); - - - - } - - - // 查询包裹 - @Override - public List selectPack(Long orderId) { - - List orderPackageDOS = orderPackageMapper.selectPackStatus(orderId, getUserOrganId()); - - return orderPackageDOS.stream().map(this::typeConversion).toList(); - - } - - - // 包裹订单打印 - @Override - public PrintOrderPackRespVO printOrderPack(PrintOrderPackReqVO reqVO) { - - PrintOrderPackRespVO printOrderPackRespVO = ordersMapper.selectOrderPack(reqVO.getOrderId(), reqVO.getPackageNo(), getUserOrganId()); - printOrderPackRespVO.setPlateList(orderItemMapper.selectPrintPlateList(reqVO.getOrderId(), reqVO.getPackageNo(), getUserOrganId())); - return printOrderPackRespVO; - - - } - - - // 删除包裹及其关联的包裹信息(删除全部) - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteOrderPack(PackReqVO reqVO) { - - - - // 判断包裹的类型是否为其他类型，如果是，则删除其包裹信息 - if (reqVO.getIsOther()) { - - List partsIds = orderItemMapper.selectPackList(reqVO.getPackageId(), reqVO.getOrderId(), getUserOrganId()) - .stream().map(OrderItemDO::getPartsId) - .distinct() - .toList(); - if(partsIds.isEmpty()){ - return; - } - - orderPartsMapper.deleteOrderParts(partsIds, reqVO.getOrderId(), getUserOrganId()); - - orderPackageMapper.updateParts(reqVO.getPackageId(), reqVO.getOrderId(), getUserOrganId()); - - orderItemMapper.deleteParts(reqVO.getPackageId(), reqVO.getOrderId(), partsIds, getUserOrganId()); - - List orderPackageDOS = orderPackageMapper.selectPackStatusList(reqVO.getOrderId(), getUserOrganId()); - - if(orderPackageDOS.isEmpty()){ - - OrderDO orderDO = ordersMapper.selectById(reqVO.getOrderId()); - - orderDO.setPackaged(OrderPackageStatusEnum.UNPACKED.getStatus()); - - ordersMapper.updateById(orderDO); - - } - - return; - } - - - - orderPackageMapper.updateParts(reqVO.getPackageId(), reqVO.getOrderId(), getUserOrganId()); - - orderItemMapper.deleteOrderPack(reqVO.getPackageId(), reqVO.getOrderId(), getUserOrganId()); - - orderPrepackagedMapper.deletePacked(reqVO.getOrderId(),getUserOrganId()); - - - List orderPackageDOS = orderPackageMapper.selectPackStatusList(reqVO.getOrderId(), getUserOrganId()); - - if(orderPackageDOS.isEmpty()){ - - OrderDO orderDO = ordersMapper.selectById(reqVO.getOrderId()); - - orderDO.setPackaged(OrderPackageStatusEnum.UNPACKED.getStatus()); - - ordersMapper.updateById(orderDO); - - } - - } - - - // 新增外部配件包裹表 - @Override - @Transactional(rollbackFor = Exception.class) - public OrderPackRespVO addNewOtherPack(OtherPackReqVO reqVO) { - - - // 配件表新增数据 - OrderPartsNDO orderParts = BeanUtils.toBean(reqVO, OrderPartsNDO.class); - // 因为是外部配件，所以配件类型的名称固定为 “ 外部配件” - orderParts.setType("外部配件"); - orderParts.setUnit(reqVO.getUnit()); - orderPartsMapper.insert(orderParts); - - - // 在包裹表中添加包裹编号和生产单号，修改包裹类型未其他配件类型 - OrderPackageDO orderPackageDO = new OrderPackageDO(); - orderPackageDO.setPackageNo(generatePackageNo()); - orderPackageDO.setOrderId(reqVO.getOrderId()); - orderPackageDO.setType(OrderPackageTypeEnum.OTHER_ACCESSORIES.getType()); - - // 新增包裹 - orderPackageMapper.insert(orderPackageDO); - - - // 在生产单明细表中添加数据（生产单号，配件ID，包裹ID，部件数量） - OrderItemDO orderItemDO = new OrderItemDO(); - orderItemDO.setOrderId(reqVO.getOrderId()); - orderItemDO.setType(OrderItemTypeEnum.QUOTATIONACCESSORIES.getType()); - orderItemDO.setPartsId(orderParts.getId()); - orderItemDO.setPackageId(orderPackageDO.getId()); - orderItemDO.setNum(reqVO.getNum()); - - - // 在生产单明细表中新增数据 - orderItemMapper.insert(orderItemDO); - - // 查看新增的包裹信息 - return typeConversion(orderPackageDO); - - - } - - - // 新增外部配件 - @Override - @Transactional(rollbackFor = Exception.class) - public OrderPartsRespVO addNewOtherParts(OtherPackReqVO reqVO) { - - OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackNo(reqVO.getPackNo(), getUserOrganId()); - if (orderPackageDO.getType() != OrderPackageTypeEnum.OTHER_ACCESSORIES.getType().longValue()) { - throw exception(THE_CURRENT_PACKAGE_TYPE_IS_INCORRECT); - } - - - // 配件表新增数据 - OrderPartsNDO orderParts = BeanUtils.toBean(reqVO, OrderPartsNDO.class); - // 因为是外部配件，所以配件类型的名称固定为 “ 外部配件” - orderParts.setType("外部配件"); - orderParts.setUnit(reqVO.getUnit()); - orderPartsMapper.insert(orderParts); - - // 在生产单明细表中添加数据（生产单号，配件ID，包裹ID，部件数量） - OrderItemDO orderItemDO = new OrderItemDO(); - orderItemDO.setOrderId(reqVO.getOrderId()); - orderItemDO.setPartsId(orderParts.getId()); - orderItemDO.setPackageId(orderPackageDO.getId()); - orderItemDO.setNum(reqVO.getNum()); - - // 在生产单明细表中新增数据 - orderItemMapper.insert(orderItemDO); - - return BeanUtils.toBean(orderParts, OrderPartsRespVO.class); - - } - - - // 删除包裹中的外部配件 - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteOtherParts(DeleteOtherPartsReqVO reqVO) { - - - if (reqVO.getIsOtherParts()) { - // 更新配件表中配件为逻辑删除 - orderPartsMapper.updateParts(reqVO.getPartsId(), reqVO.getOrderId(), getUserOrganId()); - orderItemMapper.deleteOtherParts(reqVO.getPartsId(), reqVO.getOrderId(), getUserOrganId()); - } - - orderItemMapper.updateParts(reqVO.getPartsId(), reqVO.getPackageId(), reqVO.getOrderId(), getUserOrganId()); - - } - - - // 新增配件-即新增一个包裹 - @Override - @Transactional(rollbackFor = Exception.class) - public OrderPackRespVO addNewPartsPack(OrderPackReqVO reqVO) { - - OrderPackageDO orderPackageDO = new OrderPackageDO(); - orderPackageDO.setOrderId(reqVO.getOrderId()); - orderPackageDO.setType(reqVO.getPackageType()); - orderPackageDO.setStatus(OrderPackageStatusEnum.PACKAGED.getStatus()); - orderPackageDO.setPackageNo(generatePackageNo()); - orderPackageMapper.insert(orderPackageDO); - - orderItemMapper.insertPartsId(orderPackageDO.getId(), reqVO.getAddPartsIdList(), reqVO.getOrderId(), getUserOrganId()); - - return typeConversion(orderPackageDO); - - } - - - // 查询预打包优化信息 - @Override - public String getPrePackInfo(Long orderId) { - - - OrderPrepackagedDO orderPrepackagedDO = orderPrepackagedMapper.selectOrder(orderId, getUserOrganId()); - - - if (orderPrepackagedDO == null) { - return null; - } - - - return JsonUtils.unzipString(orderPrepackagedDO.getResult()); - - } - - - // 保存优化后的预打包信息 - @Override - @Transactional(rollbackFor = Exception.class) - public void saveOptimizeInfo(PrePackReqVO reqVO) { - - - PackageConfigDTO userSetting = settingApi.getUserSetting(UserSettingTypeEnum.PREPACKAGED.getType()); - - String setting = userSetting.getSetting(); - - if (setting == null) { - - throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE, UserSettingTypeEnum.PREPACKAGED.getName()); - } - - JsonNode settingParse = JsonUtils.parseTree(JsonUtils.unzipString(setting)); - - boolean autoPack = settingParse.get("autoPack").asBoolean(); - - - String optimizeInfo = reqVO.getOptimizeInfo(); - - // 自动打包，包裹表新增 - if (autoPack) { - - ArrayList orderPackageDOS = new ArrayList<>(); - - List packPlateNoLists = new ArrayList<>(); - - ObjectMapper objectMapper = new ObjectMapper(); - - JsonNode jsonNode = JsonUtils.parseTree(reqVO.getOptimizeInfo()); - - List asJsonObject = objectMapper.convertValue(jsonNode, new TypeReference<>() { - }); - - - asJsonObject.forEach(value -> { - - value.getList().forEach(prePackOptimizeInfo -> { - - String packageNo = generatePackageNo(); - prePackOptimizeInfo.setName(packageNo); - orderPackageDOS.add(OrderPackageDO.builder() - .packageNo(packageNo) - .type(OrderPackageTypeEnum.PLATE.getType()) - .orderId(reqVO.getOrderId()) - .status(OrderPackageStatusEnum.PACKAGED.getStatus()) - .build()); - prePackOptimizeInfo.getList().forEach(plate -> { - List list = plate.getList().stream().map(PrePackOptimizeInfo.PrerPlateData::getPlateId).toList(); - list.forEach(a -> packPlateNoLists.add(PackPlateList.builder() - .packNo(packageNo) - .plateId(Long.valueOf(a)) - .build())); - }); - - }); - - }); - - - optimizeInfo = JsonUtils.toJsonString(asJsonObject); - - List packageDOS = orderPackageMapper.selectPackStatus(reqVO.getOrderId(), getUserOrganId()); - - if (!packageDOS.isEmpty()) { - // 删除除配件和其他配件外的所有包裹 - orderPackageMapper.updateDelete(reqVO.getOrderId(), getUserOrganId()); - } - - // 包裹表新增包裹 - orderPackageMapper.insertBatch(orderPackageDOS); - - // 根据包裹编号查找包裹ID - orderPackageDOS.forEach(a -> - packPlateNoLists.stream().filter(f -> Objects.equals(f.getPackNo(), a.getPackageNo())) - .forEach(f -> f.setPackId(a.getId()))); - - List orderItemDOS = orderItemMapper.selectPackPlateList(reqVO.getOrderId(), getUserOrganId()); - - - packPlateNoLists.forEach(a -> - orderItemDOS.stream().filter(f -> Objects.equals(f.getPlateId(), a.getPlateId())) - .forEach(f -> f.setPackageId(a.getPackId()))); - - orderItemMapper.updateBatch(orderItemDOS); - - // 查询配件是否为空，为空，修改生产单的状态为已打包 - List partsIds = orderItemMapper.selectOrderPackPartsIds(reqVO.getOrderId(), getUserOrganId()); - - if (partsIds.isEmpty()) { - OrderDO orderDO = ordersMapper.selectById(reqVO.getOrderId()); - orderDO.setPackaged(OrderPackageStatusEnum.PACKAGED.getStatus()); - if(Boolean.TRUE.equals(orderPlanApi.getOrder(reqVO.getOrderId()).getData())){ - orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); - orderDO.setFinishTime(LocalDateTime.now()); - } - ordersMapper.updateById(orderDO); - } - - } - - - OrderPrepackagedDO orderPackOptimizeDO = orderPrepackagedMapper.selectOrder(reqVO.getOrderId(), getUserOrganId()); - - if (orderPackOptimizeDO == null) { - - OrderPrepackagedDO prepackagedDO = new OrderPrepackagedDO(); - prepackagedDO.setOrderId(reqVO.getOrderId()); - prepackagedDO.setResult(JsonUtils.zipString(optimizeInfo)); - orderPrepackagedMapper.insert(prepackagedDO); - return; - } - - orderPackOptimizeDO.setResult(JsonUtils.zipString(optimizeInfo)); - orderPrepackagedMapper.updateById(orderPackOptimizeDO); - - - } - - - // 日期格式转换 - public static String convertTime(String input) { - - SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - try { - Date date = inputFormat.parse(input); - date.setTime(date.getTime() + 8 * 60 * 60 * 1000); // 将时间转换为东夏令时 - return outputFormat.format(date); - } catch (ParseException e) { - e.printStackTrace(); - return null; - } - } - - - // 生成包裹编号 - private String generatePackageNo() { - - long packNo = idWorker.nextId(); - long obtainingTime = SnowflakeIdWorker3rd.obtainingTime(); - - return (obtainingTime) + Long.toString(packNo).substring(2); - - } - - - private void validateOrdersExists(Long orderId, Long packId) { - - OrderDO orderDO = ordersMapper.selectById(orderId); - AssertUtils.notEmpty(orderDO,ORDER_PACK_ERROR); - - if(packId != null){ - OrderPackageDO orderPackageDO = orderPackageMapper.selectById(packId); - AssertUtils.notEmpty(orderPackageDO,ORDER_PACK_DATA_ERROR); - } - - } - - // 类型转换 - private OrderPackRespVO typeConversion(OrderPackageDO orderPackageDO) { - return OrderPackRespVO.builder() - .id(orderPackageDO.getId()) - .orderId(orderPackageDO.getOrderId()) - .organId(orderPackageDO.getOrganId()) - .packageNo(orderPackageDO.getPackageNo()) - .packageType(orderPackageDO.getType()) - .name(orderPackageDO.getName()) - .status(orderPackageDO.getStatus()) - .remark(orderPackageDO.getRemark()) - .build(); - - } - - - - // 打包翻页查询 - private PageResult handleIsUpCase(PackPageReqVO pageReqVO, List orderIds,Boolean isUp) { - - IPage packRespVOS = new PageDTO<>(); - - OrderDO order = ordersMapper.selectById(pageReqVO.getOrderId()); - AssertUtils.notEmpty(order, ORDER_DATE_ERROR); - - List packRespVOList = Boolean.TRUE.equals(isUp) ? - ordersMapper.selectOrderIds(order.getCreateTime().toString(), getUserOrganId(), order.getId()) : - ordersMapper.selectOrderIdsFalse(order.getCreateTime().toString(), getUserOrganId(), order.getId()); - - if (packRespVOList.isEmpty()) { - throw exception(NO_PRODUCTION_ORDER_INFORMATION_AVAILABLE, Boolean.TRUE.equals(isUp) ? "第" : "最后"); - } - packRespVOS.setRecords(packRespVOList); - - packRespVOS.setTotal(1); - - orderIds.addAll(packRespVOS.getRecords().stream().map(PackRespVO::getId).toList()); - - return buildPageResult(orderIds,packRespVOS); - } - - - - // 打包分页查询 - private PageResult handleNormalCase(PackPageReqVO pageReqVO, List orderIds, PageDTO page) { - - pageReqVO.setCustomer(insertSeparator(pageReqVO.getCustomer())); - pageReqVO.setCustomOrderNo(insertSeparator(pageReqVO.getCustomOrderNo())); - pageReqVO.setAddress(insertSeparator(pageReqVO.getAddress())); - - - // 查询查询分页 - IPage packRespVOS = ordersMapper.selectOrderIdList(page, pageReqVO, getUserOrganId()); - - if (CollUtil.isEmpty(packRespVOS.getRecords())) { - return new PageResult<>(); - } - - orderIds.addAll(packRespVOS.getRecords().stream().map(PackRespVO::getId).toList()); - - return buildPageResult(orderIds, packRespVOS); - - } - - - - // 打包分页页面显示数据查询 - private PageResult buildPageResult(List orderIds,IPage packRespVOS){ - - if(orderIds.isEmpty()){ - return new PageResult<>(); - } - - - // 查询板材的总量 - List packRespVOList = orderPlateMapper.selectPlateNum(orderIds, getUserOrganId()); - - AssertUtils.notEmpty(packRespVOList, ErrorCodeConstants.ORDER_PLATE_ERROR); - - for (PackRespVO packRespVO : packRespVOList) { - packRespVO.setTotalPieceCount((long) packRespVO.getPlateIdList().size()); - packRespVO.setPlateIdList(null); - } - - - // 查询当前生产的包裹数量 - List respVOS = orderPackageMapper.selectPackPage(orderIds, getUserOrganId()); - - - for (PackRespVO packRespVO : respVOS) { - packRespVO.setPackCount((long) packRespVO.getPackIdList().size()); - packRespVO.setPackIdList(null); - } - - - // 查询当前生产单已经打包的板材数量 - List plateNum = orderPackageMapper.selectPackPieceCount(orderIds, getUserOrganId()); - - for (PackRespVO packRespVO : plateNum) { - packRespVO.setPackPieceCount((long) packRespVO.getPlateIdList().size()); - packRespVO.setPlateIdList(null); - } - - - for (PackRespVO vosRecords : packRespVOS.getRecords()) { - - // 板材总数 - vosRecords.setTotalPieceCount(packRespVOList.stream().filter(f -> Objects.equals(f.getId(), vosRecords.getId())).mapToLong(PackRespVO::getTotalPieceCount).sum()); - // 已打包数 - vosRecords.setPackCount(respVOS.stream().filter(f -> Objects.equals(f.getId(), vosRecords.getId())).mapToLong(PackRespVO::getPackCount).sum()); - // 已打包片数 - vosRecords.setPackPieceCount(plateNum.stream().filter(f -> Objects.equals(f.getId(), vosRecords.getId())).mapToLong(PackRespVO::getPackPieceCount).sum()); - // 待处理量 - vosRecords.setPendingNum(vosRecords.getTotalPieceCount() - vosRecords.getPackPieceCount()); - - } - - - return new PageResult<>(packRespVOS.getRecords(), packRespVOS.getTotal()); - - } - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsExcelListener.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsExcelListener.java deleted file mode 100644 index e29f0e07e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsExcelListener.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.cf.imes.module.manage.service.parts; - -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.nacos.common.utils.StringUtils; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; -import com.cf.imes.module.manage.enums.parts.CategoryEnum; -import com.cf.imes.module.manage.enums.parts.ObjectEnum; -import com.cf.imes.module.manage.enums.parts.WhetherEnum; -import com.cf.imes.module.manage.util.file.ExcelListener; -import lombok.extern.slf4j.Slf4j; - -import java.text.DecimalFormat; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Supplier; - -/** - * 配件 导入监听器 - */ -@Slf4j -public final class PartsExcelListener extends ExcelListener { - - private static final String ZERO = "0"; - - /** - * 自定义用于暂时存储data - * 可以通过实例获取该值 - */ - private List datas = new ArrayList<>(); - - private boolean flag = true; - - private Map valueMap = new HashMap<>(); - - // 非空判断，错误写入；不为空则判断字符串长度是否超过 - private void isEmptyAndAdd(Supplier getter, Consumer setter,String msg, int maxLength) { - String value = getter.get(); - if (StringUtils.isEmpty(value)) { - setter.accept(msg + "不可为空"); - this.flag = false; - } else { // 字符长度判断 - isLong(value, setter, maxLength, msg); - } - } - - private void isEmpty(Supplier getter, Consumer setter,String msg) { - String value = getter.get(); - if (StringUtils.isEmpty(value)) { - setter.accept(msg + "不可为空"); - this.flag = false; - } - } - - //不为空时，判断长度 - private void isNotEmptyAndAdd(Supplier getter, Consumer setter,String msg, int maxLength) { - String value = getter.get(); - if (StringUtils.isNotEmpty(value)) { - isLong(value, setter, maxLength, msg); - } - } - - // 非空判断，并判断枚举值是否正确 - private & ObjectEnum> void isEmptyAndEnumAdd(Supplier getter, Consumer setter, String msg, Class enumClass) { - String value = getter.get(); - if (StringUtils.isEmpty(value)) { - setter.accept(msg + "不可为空"); - this.flag = false; - } else { - isNotEmptyToEnum(getter, setter, msg, enumClass); - } - } - - // 不为空，判断枚举值是否正确 - private & ObjectEnum> void isNotEmptyToEnum(Supplier getter, Consumer setter, String msg, Class enumClass) { - String value = getter.get(); - if (!StringUtils.isEmpty(value)) { - boolean isValid = false; - for (T enumValue : enumClass.getEnumConstants()) { - if (Objects.equals(enumValue.getValue(), value)) { - isValid = true; - break; - } - } - if (!isValid) { - setter.accept(msg + "请使用规范标识填写表格"); - this.flag = false; - } - } - } - - // 非空时判断字符串是否可以转换为Double，并判断整数位与小数位是否符合长度要求 - private void isEmptyAndDoubleAdd(Supplier getter, Consumer setter, String msg, int integerLength, int decimalLength) { - String value = getter.get(); - if (StringUtils.isNotEmpty(value)) { - // 判断是否可以转换 - try { - Double d = Double.parseDouble(value); - if (d < Double.parseDouble(ZERO)) { - setter.accept(msg + "必须大于0"); - } else { - // 处理科学计数法,保留小数点后四位 - DecimalFormat decimalFormat = new DecimalFormat("#.####"); - String valueString = decimalFormat.format(d); - - String[] split = valueString.split("\\."); - // 获取小数点前的位数 - int integerPartLength = split[0].length(); - // 获取小数点后的位数 - int fractionalPartLength = 0; - if (split.length > 2) { - fractionalPartLength = split[1].length(); - } - - if (integerPartLength > integerLength || fractionalPartLength > decimalLength) { - setter.accept(msg + "长度不合法，总长度不超过8位，小数点后不超过3位"); - } - } - } catch (NumberFormatException e) { - setter.accept(msg + "必须为数字"); - this.flag = false; - } - - } - } - // 判断字符串长度是否过长 - private void isLong(String value, Consumer setter, int maxLength, String msg) { - if (value.length() > maxLength) { - setter.accept(msg + "长度不能超过" + maxLength + "个字符"); - this.flag = false; - } - } - // 结果数据生成 - private String setResult(String result, String value) { - if (StringUtils.isEmpty(result)) { - return value; - } else { - return result + "," + value; - } - } - - /** - * 每解析一行都会回调invoke()方法 - * - * @param data 读取后的数据对象 - * @param context 内容 - */ - @Override - public void invoke(PartsImportExcelVO data, AnalysisContext context) { - -// 一，必须存在且合理 - isEmptyAndAdd(data::getGoodsId, data::setResult, setResult(data.getResult(), "物料编号"), 32); - isEmptyAndAdd(data::getName, data::setResult, setResult(data.getResult(), "物料名称"), 64); - isEmptyAndEnumAdd(data::getCategory, data::setResult, setResult(data.getResult(), "分类"), CategoryEnum.class); - isNotEmptyAndAdd(data::getCategory, data::setResult, setResult(data.getResult(), "分类"),32); - -// 二，分类，必须存在 - if (data.getCategory() != null ) { - if (!CategoryEnum.OTHER.getValue().equals(data.getCategory())) { // 不为其他 - isEmpty(data::getUnit, data::setResult, setResult(data.getResult(), "单位")); - if (CategoryEnum.EDGING.getValue().equals(data.getCategory())) { // 为封边 - isEmpty(data::getColor, data::setResult, setResult(data.getResult(), "颜色")); - isEmpty(data::getWidth, data::setResult, setResult(data.getResult(), "宽度")); - isEmpty(data::getThickness, data::setResult, setResult(data.getResult(), "厚度")); - } - } - } - -// 三，存在则判断是否符合 - isNotEmptyToEnum(data::getIsComposite, data::setResult, setResult(data.getResult(), "是否复合部件"), WhetherEnum.class); - isNotEmptyAndAdd(data::getType, data::setResult, setResult(data.getResult(), "子类型"), 64); - isNotEmptyAndAdd(data::getModel, data::setResult, setResult(data.getResult(), "型号"), 64); - isNotEmptyAndAdd(data::getColor, data::setResult, setResult(data.getResult(), "颜色"), 64); - isNotEmptyAndAdd(data::getMaterial, data::setResult, setResult(data.getResult(), "材质"), 64); - isNotEmptyAndAdd(data::getUnit, data::setResult, setResult(data.getResult(), "单位"), 32); - isNotEmptyAndAdd(data::getSpec, data::setResult, setResult(data.getResult(), "规格"), 64); - isNotEmptyAndAdd(data::getBrand, data::setResult, setResult(data.getResult(), "品牌"), 64); - isNotEmptyAndAdd(data::getFactor, data::setResult, setResult(data.getResult(), "厂家"), 128); - isEmptyAndDoubleAdd(data::getLength, data::setResult, setResult(data.getResult(), "长度"), 5 , 3); - isEmptyAndDoubleAdd(data::getWidth, data::setResult, setResult(data.getResult(), "宽度"), 5 , 3); - isEmptyAndDoubleAdd(data::getThickness, data::setResult, setResult(data.getResult(), "厚度"), 5 , 3); - isNotEmptyAndAdd(data::getRemark, data::setResult, setResult(data.getResult(), "备注"), 255); - - // 当为封边的时候，一定需要 -// if (StringUtils.isNotEmpty(data.getCategory())) { -// if (data.getCategory().equals(CategoryEnum.EDGING.getValue())) { -// isEmpty(data::getThickness, data::setResult, setResult(data.getResult(), "厚度")); -// isEmpty(data::getWidth, data::setResult, setResult(data.getResult(), "宽度")); -// } -// } - - if (data.getResult() != null) - data.setResult(data.getResult().replace("null,", "")); - valueMap.put(context.getCurrentRowNum(), data.getResult()); - datas.add(data); - } - - /** - * 读取完后操作 - * - * @param context - */ - @Override - public void doAfterAllAnalysed(AnalysisContext context) { - if (this.flag) - log.info("PlateExcelListener 所有数据读取完成"); - } - - /** - * 返回数据 - * - * @return 返回读取的数据集合 - **/ - public List getDates() { - return datas; - } - - /** - * 返回读取结果 - * - * @return 是否读取成功 - **/ - public boolean getFlag() { - return flag; - } - - /** - * 返回错误信息 - * - * @return String - **/ - public Map getValueMap() { - return valueMap; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java deleted file mode 100644 index 5398235c8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.cf.imes.module.manage.service.parts; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.*; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsCadPageReqVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsPageReqVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsSaveReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportRespVO; -import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO; -import org.springframework.boot.system.ApplicationHome; - -import java.io.File; -import java.util.List; - -/** - * 配件表 parts_{N} Service 接口 - * - * @author 晨丰科技 - */ -public interface PartsService { - - /** - * 创建配件表 parts_{N} - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long create(@Valid PartsSaveReqVO createReqVO); - - /** - * 更新配件表 parts_{N} - * - * @param updateReqVO 更新信息 - */ - void update(@Valid PartsSaveReqVO updateReqVO); - - /** - * 删除配件表 parts_{N} - * - * @param id 编号 - */ - void delete(Long id, Long organId); - - /** - * 获得配件表 parts_{N} - * - * @param id 编号 - * @return 配件表 parts_{N} - */ - PartsDO get(Long id, Long organId); - - /** - * 获得配件表 parts_{N}分页 - * - * @param pageReqVO 分页查询 - * @return 配件表 parts_{N}分页 - */ - PageResult getPage(PartsPageReqVO pageReqVO); - - /** - * webcad获取配件表 parts_{N}分页 - * - * @param pageReqVO 分页查询 - * @return 配件表 parts_{N}分页 - */ - PageResult webCadGetPage(PartsPageReqVO pageReqVO); - - PageResult getCadPage(PartsCadPageReqVO pageReqVO); - - /** - * 生产导入文件模板下载 - */ - void exportTemplate(HttpServletResponse response, String value); - - /** - * 批量导入配件 - * - * @param importParts 导入配件列表 - * @param isUpdateSupport 是否支持更新 - */ - void importPartsList(List importParts, boolean isUpdateSupport, Long organId); - - - default String getSavePath() { - ApplicationHome applicationHome = new ApplicationHome(this.getClass()); - - // 保存目录位置根据项目需求可随意更改 - return applicationHome.getDir().getAbsolutePath() + File.separator + "type"; - - } - - List getPartAll(String category); -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java deleted file mode 100644 index 966971a49..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.cf.imes.module.manage.service.parts; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.organ.core.aop.OrganIgnore; -import com.cf.imes.framework.organ.core.context.OrganContextHolder; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsCadPageReqVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsPageReqVO; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsSaveReqVO; -import com.cf.imes.module.manage.enums.parts.CategoryEnum; -import com.cf.imes.module.manage.util.file.FileHelperUtil; -import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO; -import com.cf.imes.module.manage.dal.mysql.parts.PartsMapper; -import com.cf.imes.module.manage.util.number.NumberHelperUtil; -import com.cf.imes.module.system.api.organ.OrganApi; -import com.cf.imes.module.system.api.permission.PermissionApi; -import com.cf.imes.module.system.enums.ErrorCodeConstants; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; - - -import java.util.ArrayList; -import java.util.List; - -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; -import static com.cf.imes.module.manage.enums.ErrorCodeConstants.*; - - -/** - * 配件表 parts_{N} Service 实现类 - * - * @author 晨丰科技 - */ -@Service -@Validated -public class PartsServiceImpl implements PartsService { - - @Resource - private PartsMapper partsMapper; - - @Resource - private OrganApi organApi; - - @Resource - private PermissionApi permissionApi; - - @Resource - private NumberHelperUtil numberUtil; - - private final static String BASE_PARTS_IMPORT_PERMISSION = "base:accessory:import"; // 导入板材 - private final static String BASE_PARTS_DELETE_PERMISSION = "base:accessory:delete"; // 删除板材信息 - private final static String BASE_PARTS_CREATE_PERMISSION = "base:accessory:create"; // 创建板材信息 - private final static String BASE_PARTS_UPDATE_PERMISSION = "base:accessory:update"; // 更新板材信息 - private final static String BASE_PARTS_QUERY_PERMISSION = "base:accessory:query"; // 获得板材信息 - - - @Override - @OrganIgnore - public Long create(PartsSaveReqVO createReqVO) { - - validateFieldExists(createReqVO); - - PartsDO partsDO = BeanUtils.toBean(createReqVO, PartsDO.class); - Long organId = getOrganId(BASE_PARTS_CREATE_PERMISSION, getLoginUser().getId(), partsDO.getOrganId()); - partsDO.setOrganId(organId).setIsComposite(createReqVO.getIsComposite() != null && createReqVO.getIsComposite()); - // 判断是否存在--- goodsId - if (validateExistsByGoodsId(partsDO.getGoodsId(), organId)) { - throw exception(PARTS_GOOD_ID_EXISTS); - } - - partsMapper.insert(partsDO); - // 返回 - return partsDO.getId(); - } - - @Override - @OrganIgnore - @Transactional(rollbackFor = Exception.class) - public void update(PartsSaveReqVO updateReqVO) { - - validateFieldExists(updateReqVO); - - Long organId = getOrganId(BASE_PARTS_UPDATE_PERMISSION, getLoginUser().getId(), updateReqVO.getOrganId()); - // 校验id存在 - boolean index = validateExistsById(updateReqVO.getId(),organId); - - if (!index) { - throw exception(PARTS_NOT_EXISTS); - } - - // 校验goodsId是否存在 - if (!validateExistsExceptGoodsId(updateReqVO.getId(),updateReqVO.getGoodsId(),organId)) { - throw exception(PARTS_GOOD_ID_EXISTS); - } - // 更新 - updateReqVO.setOrganId(organId).setIsComposite(updateReqVO.getIsComposite() != null && updateReqVO.getIsComposite()); - PartsDO updateObj = BeanUtils.toBean(updateReqVO, PartsDO.class); - partsMapper.updateById(updateObj); - } - - @Override - @OrganIgnore - public void delete(Long id, Long organId) { - // 校验存在 - if (!validateExistsById(id, getOrganId(BASE_PARTS_DELETE_PERMISSION, getLoginUser().getId(), organId))) { - throw exception(PARTS_NOT_EXISTS); - } - - // 删除 - partsMapper.deleteById(id); - } - - private boolean validateExistsById(Long id, Long organId) { - if (partsMapper.selectById(id, organId) == null) { - return false; - } - return true; - } - - private boolean validateExistsByGoodsId(String goodsId, Long organId) { - if (partsMapper.selectByGoodID(goodsId, organId) == null) { - return false; - } - return true; - } - - private boolean validateExistsExceptGoodsId(Long id, String goodsId, Long organId) { - if (partsMapper.selectExceptGoodID(id, goodsId, organId) == null) { // 不存在相同的goods_id - return true; - } - return false; - } - - @Override - @OrganIgnore - public PartsDO get(Long id, Long organId) { - organId = getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), organId); - return partsMapper.selectById(id, organId); - } - - @Override - @OrganIgnore - public PageResult getPage(PartsPageReqVO pageReqVO) { - pageReqVO.setOrganId(getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId())) - .setLength(numberUtil.compareLength(pageReqVO.getLength())) - .setWidth(numberUtil.compareLength(pageReqVO.getWidth())) - .setThickness(numberUtil.compareLength(pageReqVO.getThickness())); - - return partsMapper.selectPage(pageReqVO); - } - - @Override - public PageResult webCadGetPage(PartsPageReqVO pageReqVO) { - pageReqVO.setLength(numberUtil.compareLength(pageReqVO.getLength())) - .setWidth(numberUtil.compareLength(pageReqVO.getWidth())) - .setThickness(numberUtil.compareLength(pageReqVO.getThickness())); - - return partsMapper.selectPage(pageReqVO); - } - - @Override - public PageResult getCadPage(PartsCadPageReqVO pageReqVO) { -// pageReqVO.setOrganId(getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId())); - - return partsMapper.selectCadPage(pageReqVO); - } - - @Override - @OrganIgnore - public void exportTemplate(HttpServletResponse response, String value) { - String rootPath = getSavePath(); - FileHelperUtil.getFile(rootPath, response, value); - } - - @Override - @OrganIgnore - public void importPartsList(List importParts, boolean isUpdateSupport, Long organId) { - - // 组织id - organId = getOrganId(BASE_PARTS_IMPORT_PERMISSION, getLoginUser().getId(), organId); - - // 批量插入集合 - List insertList = new ArrayList<>(); - // 批量更新集合 - List updateList = new ArrayList<>(); - - Long finalOrganId = organId; - - importParts.forEach(importPart -> { - // 判断如果不存在，在进行插入 - PartsDO existPlate = partsMapper.selectByGoodID(importPart.getGoodsId(), finalOrganId); - if (existPlate == null) { // 不存在 - insertList.add(BeanUtils.toBean(importPart, PartsDO.class).setOrganId(finalOrganId)); - return; - } - // 判断是否允许更新 - if (!isUpdateSupport) { - PartsDO partsDO = BeanUtils.toBean(importPart, PartsDO.class).setOrganId(finalOrganId).setId(existPlate.getId()); - updateList.add(partsDO); - } - }); -// 批量插入，批量更新 - if (!insertList.isEmpty()) { - partsMapper.insertBatch(insertList); - } - if (!updateList.isEmpty()) { - partsMapper.updateBatch(updateList); - } - } - - @Override - public List getPartAll(String category) { - return partsMapper.getAllByOrganId(OrganContextHolder.getOrganId(), category); - } - - private void validateOrganExists(Long organId) { - CommonResult index = organApi.validOrgan(organId); - if (!index.isSuccess()) { - throw exception(ErrorCodeConstants.ORGAN_NOT_EXISTS); - } - } - - // 组织id返回 - private Long getOrganId(String type, Long userId, Long organId) { - - boolean hasPermission = permissionApi.hasRoles(userId, type).getData(); - - Long organIdDefault = OrganContextHolder.getOrganId(); - - if (hasPermission && organId != null && organId != 0) { - - validateOrganExists(organId); - - organIdDefault = organId; - } - - return organIdDefault; - } - - // 必填字段判断 - private void validateFieldExists(PartsSaveReqVO partsSaveReqVO) { - if (!CategoryEnum.OTHER.getValue().equals(partsSaveReqVO.getCategory())) { // 不为其他 - if (partsSaveReqVO.getUnit() == null || partsSaveReqVO.getUnit().isEmpty()) { - throw exception(PARTS_UNIT_NOT_NULL); - } - if (CategoryEnum.EDGING.getValue().equals(partsSaveReqVO.getCategory())) { // 为封边 - if (partsSaveReqVO.getColor() == null || partsSaveReqVO.getWidth() == null || partsSaveReqVO.getThickness() == null) { - throw exception(PARTS_EDGE_NOT_NULL); - } - } - } - - } - - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/patching/PatchingPlateService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/patching/PatchingPlateService.java deleted file mode 100644 index cbb2a5fd3..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/patching/PatchingPlateService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cf.imes.module.manage.service.patching; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.patching.vo.*; -import com.cf.imes.module.manage.dal.dataobject.patching.MachineDO; - -import java.util.List; - -public interface PatchingPlateService { - - - // 批量加入补板查询 - PageResult patchingSearchPlate(PatchingPlatePageReqVO pageReqVO); - - - // 查询详细的板件 - PageResult searchPlateDetail(PatchingPlatePageReqVO pageReqVO); - - - // 加入的板件信息 - PatchingDetailRespVO searchPatchingList(Long plateId); - - - // 优化排版 - List optimizeLayout(PatchingDetailReqVO reqVO); - - - // 新增补板详情表 - void insertPatching(PatchingReqVO reqVO); - - - // 查询所有的机台 - List searchMachine(); - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/patching/PatchingPlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/patching/PatchingPlateServiceImpl.java deleted file mode 100644 index 5bc9afba9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/patching/PatchingPlateServiceImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.cf.imes.module.manage.service.patching; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.module.manage.controller.admin.patching.vo.*; -import com.cf.imes.module.manage.dal.dataobject.patching.MachineDO; -import com.cf.imes.module.manage.dal.dataobject.patching.PatchDetailDO; -import com.cf.imes.module.manage.dal.mysql.patching.MachineMapper; -import com.cf.imes.module.manage.dal.mysql.patching.PatchDetailMapper; -import com.cf.imes.module.manage.dal.mysql.plate.OrderPlateMapper; -import com.cf.imes.module.manage.util.page.PageHelperUtil; -import com.github.pagehelper.PageInfo; -import com.github.pagehelper.page.PageMethod; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; - -@Service -@Validated -public class PatchingPlateServiceImpl implements PatchingPlateService{ - - - - - @Resource - private OrderPlateMapper orderPlateMapper; - - @Resource - private MachineMapper machineMapper; - - @Resource - private PatchDetailMapper patchDetailMapper; - - - - // 批量加入补板查询 - @Override - public PageResult patchingSearchPlate(PatchingPlatePageReqVO pageReqVO) { - - return null; - - } - - - - - // 查询详细的板件 - @Override - public PageResult searchPlateDetail(PatchingPlatePageReqVO pageReqVO) { - - // 查询每个订单对应的板件的详细信息 - PageMethod.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - List plateDetailsRespVOS = orderPlateMapper.selectPlateDetail(pageReqVO); - - // - PageInfo pageInfo = new PageInfo<>(plateDetailsRespVOS); - return PageHelperUtil.convertToPageResult(pageInfo); - - - } - - - - - - - // 加入的板件信息 - @Override - public PatchingDetailRespVO searchPatchingList(Long plateId) { - - - return orderPlateMapper.selectPlate(plateId); - - - } - - - - - - - - // 优化排版 - @Override - public List optimizeLayout(PatchingDetailReqVO reqVO) { - - // 查询板件的的信息 - return orderPlateMapper.selectOtherPlateList(reqVO.getPlateIdList()); - - } - - - - - - - - // 新增补板详情表 - @Override - public void insertPatching(PatchingReqVO reqVO) { - - PatchDetailDO patchDetailDO = new PatchDetailDO(); - - // 循环查询板件的信息，并加入补板详情表中 - for (Long ids : reqVO.getIdList()) { - - PatchingDetailRespVO patchingDetailRespVO = orderPlateMapper.selectPlate(ids); - String jsonString = JsonUtils.toJsonString(patchingDetailRespVO); - - patchDetailDO.setId(ids); - patchDetailDO.setOrderId(patchingDetailRespVO.getOrderId()); - patchDetailDO.setArea(patchDetailDO.getArea()); - patchDetailDO.setPlanId(reqVO.getPlanId()); - patchDetailDO.setMachineId(reqVO.getMachineId()); - - patchDetailDO.setDetail(jsonString); - - patchDetailMapper.insert(patchDetailDO); - - } - - - } - - - - - - - - // 查询所有的机台 - @Override - public List searchMachine() { - - return machineMapper.selectList(); - - - } - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java deleted file mode 100644 index c2b5a2c8b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.cf.imes.module.manage.service.plate; - -import com.alibaba.excel.context.AnalysisContext; -import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; -import com.cf.imes.module.manage.util.file.ExcelListener; -import lombok.extern.slf4j.Slf4j; - -import java.util.*; - -@Slf4j -public final class PlateExcelListener extends ExcelListener { - - /** - * 自定义用于暂时存储data - * 可以通过实例获取该值 - */ - private List datas = new ArrayList<>(); - - private boolean flag = true; - - private Map valueMap = new HashMap<>(); - - /** - * 每解析一行都会回调invoke()方法 - * - * @param data 读取后的数据对象 - * @param context 内容 - */ - @Override - public void invoke(PlateImportExcelVO data, AnalysisContext context) { - if (!data.isValidGoods()) {//返回false，表示商品信息无效；否则返回true，表示商品信息有效 - data.setResult("板材【*】信息请填写完整"); - this.flag = false; - } - checkData(data.getHeight(),"高度",data); - checkData(data.getWidth(),"宽度",data); - checkData(data.getThickness(),"厚度",data); - if (data.getPrice() == null || data.getPrice().equals("")) { - data.setPrice("0"); - } - checkData(data.getPrice(),"价格",data); - checkTexture(data.getTexture(),"纹理",data); -// 字段长度判断 - checkLength(data.getGoodsId(),"物料编号",data,32); - checkLength(data.getGoodsName(),"物料名称",data,64); - checkLength(data.getMaterial(),"材质",data,64); - checkLength(data.getColor(),"颜色",data,32); - checkLength(data.getSpec(),"规格",data,64); - checkLength(data.getBrand(),"品牌",data,64); - checkLength(data.getRemark(),"备注",data,255); - - if (data.getResult() != null) - data.setResult(data.getResult().replace("null,", "")); - valueMap.put(context.getCurrentRowNum(), data.getResult()); - datas.add(data); - } - -// 错误判断 - private void checkData(String valueCheck, String head, PlateImportExcelVO data) { -// 长宽厚、价格判断非空 - if (valueCheck == null || valueCheck.equals("")) { - this.flag = false; - data.setResult(data.getResult() + "," + head + "信息缺少"); - } else { - try { - if (!data.checkPrecision(Double.valueOf(valueCheck))) { - data.setResult(data.getResult() + "," + head + "数据有误"); - this.flag = false; - } - } catch (NumberFormatException e) { - this.flag = false; - data.setResult(data.getResult() + "," + head + "需要填写数字"); - } - } - } - - private void checkTexture(String valueCheck, String head, PlateImportExcelVO data) { - - if (valueCheck != null && !valueCheck.equals("")) { - String value = valueCheck.trim(); - if (!value.equals("有") && !value.equals("无")) { - this.flag = false; - data.setResult(data.getResult() + "," + head + "信息有误"); - } else if (value.equals("有")) { - data.setTexture("有"); - } else { - data.setTexture("无"); - } - } - } - - - /** - * 字段长度判断 - */ - private void checkLength(String valueCheck, String head, PlateImportExcelVO data, int maxLength) { - if (valueCheck != null && !valueCheck.equals("")) { - if (valueCheck.length() > maxLength) { - this.flag = false; - data.setResult(data.getResult() + "," + head + "信息有误"); - } - } - } - - /** - * 读取完后操作 - * - * @param context - */ - @Override - public void doAfterAllAnalysed(AnalysisContext context) { - if (this.flag) - log.info("PlateExcelListener 所有数据读取完成"); - } - - /** - * 返回数据 - * - * @return 返回读取的数据集合 - **/ - public List getDates() { - return datas; - } - - /** - * 返回读取结果 - * - * @return 是否读取成功 - **/ - public boolean getFlag() { - return flag; - } - - /** - * 返回错误信息 - * - * @return String - **/ - public Map getValueMap() { - return valueMap; - } - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java deleted file mode 100644 index 167b1d28c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cf.imes.module.manage.service.plate; - -import java.io.File; -import java.util.*; - -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportRespVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateSaveReqVO; -import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; -import com.cf.imes.framework.common.pojo.PageResult; -import org.springframework.boot.system.ApplicationHome; - -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - -/** - * 板材信息表 plate_{N} Service 接口 - * - * @author 晨丰科技 - */ -public interface PlateService { - - /** - * 创建板材信息表 plate_{N} - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createPlate(@Valid PlateSaveReqVO createReqVO); - - /** - * 更新板材信息表 plate_{N} - * - * @param updateReqVO 更新信息 - */ - void updatePlate(@Valid PlateSaveReqVO updateReqVO); - - /** - * 删除板材信息表 plate_{N} - * - * @param id 编号 - */ - void deletePlate(Long id,Long organId); - - /** - * 获得板材信息表 plate_{N} - * - * @param id 编号 - * @return 板材信息表 plate_{N} - */ - PlateDO getPlate(Long id, Long organId); - - /** - * 获得板材信息表 plate_{N} - * - * @param id 编号 - * @return 板材信息表 plate_{N} - */ - PlateDO getPlateGoods(String id, Long organId); - - /** - * 获得板材信息表 plate_{N}分页 - * - * @param pageReqVO 分页查询 - * @return 板材信息表 plate_{N}分页 - */ - PageResult getPlatePage(PlatePageReqVO pageReqVO); - - /** - * webcad获取板材信息表 plate_{N}分页 - * - * @param pageReqVO 分页查询 - * @return 板材信息表 plate_{N}分页 - */ - PageResult webCadGetPlatePage(PlatePageReqVO pageReqVO); - - /** - * 批量导入板材 - * - * @param importUsers 导入板材列表 - * @param isUpdateSupport 是否支持更新 - * @return 导入结果 - */ - PlateImportRespVO importPlateList(List importUsers, boolean isUpdateSupport , Long organId); - - /** - * 生产导入文件模板下载 - */ - void exportTemplate(HttpServletResponse response, String value); - - default String getSavePath() { - ApplicationHome applicationHome = new ApplicationHome(this.getClass()); - - // 保存目录位置根据项目需求可随意更改 - return applicationHome.getDir().getAbsolutePath() + File.separator + "type"; - - } - - List getPlateAll(); -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java deleted file mode 100644 index b7151d488..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java +++ /dev/null @@ -1,225 +0,0 @@ -package com.cf.imes.module.manage.service.plate; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.organ.core.aop.OrganIgnore; -import com.cf.imes.framework.organ.core.context.OrganContextHolder; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportRespVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateSaveReqVO; -import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; -import com.cf.imes.module.manage.dal.mysql.plate.PlateMapper; -import com.cf.imes.module.manage.util.file.FileHelperUtil; -import com.cf.imes.module.system.api.organ.OrganApi; -import com.cf.imes.module.system.api.permission.PermissionApi; -import com.cf.imes.module.system.enums.ErrorCodeConstants; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; - -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.PLATE_GOODS_ID_NOT_SAME; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.REMAIN_PLATE_NOT_EXISTS; - -/** - * 板材信息表 plate_{N} Service 实现类 - * - * @author 晨丰科技 - */ -@Service -@Validated -public class PlateServiceImpl implements PlateService { - - @Resource - private PlateMapper plateMapper; - - @Resource - private OrganApi organApi; - - @Resource - private PermissionApi permissionApi; - - private final static String BASE_PLATE_IMPORT_PERMISSION = "base:plate:import"; // 导入板材 - private final static String BASE_PLATE_DELETE_PERMISSION = "base:plate:delete"; // 删除板材信息 - private final static String BASE_PLATE_CREATE_PERMISSION = "base:plate:create"; // 创建板材信息 - private final static String BASE_PLATE_UPDATE_PERMISSION = "base:plate:update"; // 更新板材信息 - private final static String BASE_PLATE_QUERY_PERMISSION = "base:plate:query"; // 获得板材信息 - - @Override - @OrganIgnore - public Long createPlate(PlateSaveReqVO createReqVO) { - PlateDO plate = BeanUtils.toBean(createReqVO, PlateDO.class); - -// 判断板材是否存在 - validateGoodExists(plate.getGoodsId(), - getOrganId(BASE_PLATE_CREATE_PERMISSION, getLoginUser().getId(), plate.getOrganId())); - - plateMapper.insert(plate);// 组织id未传输 - // 返回 - return plate.getId(); - } - - @Override - @OrganIgnore - @Transactional(rollbackFor = Exception.class) - public void updatePlate(PlateSaveReqVO updateReqVO) { - // 校验存在 - Long organId = getOrganId(BASE_PLATE_UPDATE_PERMISSION, getLoginUser().getId(), updateReqVO.getOrganId()); - if (updateReqVO.getId() == null) { - throw exception(ErrorCodeConstants.PLATE_NOT_EXISTS); - } - validatePlateExists(Long.valueOf(updateReqVO.getId()), organId); - PlateDO updateObj = BeanUtils.toBean(updateReqVO, PlateDO.class); - // 校验板材goods_id是否相同 - if (plateMapper.isByGoodIDAndId(updateReqVO.getGoodsId(), organId, Long.valueOf(updateReqVO.getId()))) { - throw exception(PLATE_GOODS_ID_NOT_SAME); - } - plateMapper.updateById(updateObj); - } - - @Override - @OrganIgnore - @Transactional(rollbackFor = Exception.class) - public void deletePlate(Long id, Long organId) { - // 校验存在 - validatePlateExists(id, - getOrganId(BASE_PLATE_DELETE_PERMISSION, getLoginUser().getId(), organId)); - // 删除 - plateMapper.deleteById(id); - } - - private void validatePlateExists(Long id, Long organId) { - if (plateMapper.selectOneById(id, organId) == null) { - throw exception(REMAIN_PLATE_NOT_EXISTS); - } - } - - @Override - @OrganIgnore - public PlateDO getPlate(Long id, Long organId) { - return plateMapper.selectOneById(id, organId); - } - - @Override - public PlateDO getPlateGoods(String id, Long organId) { - return plateMapper.selectByGoodID(id, organId); - } - - @Override - @OrganIgnore - public PageResult getPlatePage(PlatePageReqVO pageReqVO) { -// if (permissionApi.hasRoles(getLoginUser().getId(), BASE_PLATE_QUERY_PERMISSION).getData()) { -// if (pageReqVO.getOrganId() != null && pageReqVO.getOrganId() != 0) { -// validateOrganExists(pageReqVO.getOrganId()); -// } -// } else { -// pageReqVO.setOrganId(OrganContextHolder.getOrganId()); -// } -// if (pageReqVO.getOrganId() == null || pageReqVO.getOrganId() == 0) { - pageReqVO.setOrganId(getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId())); -// } - return plateMapper.selectPage(pageReqVO); - } - - @Override - public PageResult webCadGetPlatePage(PlatePageReqVO pageReqVO) { - return plateMapper.selectPage(pageReqVO); - } - - - @Override - @OrganIgnore - @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入 - public PlateImportRespVO importPlateList(List importPlates, boolean isUpdateSupport, Long organId) { - - organId = getOrganId(BASE_PLATE_IMPORT_PERMISSION, getLoginUser().getId(), organId); - - PlateImportRespVO respVO = PlateImportRespVO.builder().createPlateNames(new ArrayList<>()) - .updatePlateNames(new ArrayList<>()).failurePlateNames(new LinkedHashMap<>()).build(); -// 批量插入集合 - List insertList = new ArrayList<>(); -// 批量更新集合 - List updateList = new ArrayList<>(); - Long finalOrganId = organId; - importPlates.forEach(importPlate -> { - // 判断如果不存在，在进行插入 - PlateDO existPlate = plateMapper.selectByGoodID(importPlate.getGoodsId(), finalOrganId); - if (existPlate == null) { - respVO.getCreatePlateNames().add(importPlate.getGoodsName()); - insertList.add(BeanUtils.toBean(importPlate, PlateDO.class) - .setOrganId(finalOrganId)); -// .setTexture(Boolean.valueOf(importPlate.getTexture())); - return; - } - // 判断是否允许更新 - if (!isUpdateSupport) { - respVO.getFailurePlateNames().put(importPlate.getGoodsName(), ErrorCodeConstants.PLATE_EXISTS.getMsg()); - PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class) - .setOrganId(finalOrganId) - .setId(existPlate.getId()); -// .setTexture(Boolean.valueOf(importPlate.getTexture())); - updateList.add(plateDO); - } - }); -// 批量插入，批量更新 - if (insertList.size() > 0) { - plateMapper.insertBatch(insertList); - } - if (updateList.size() > 0) { - plateMapper.updateBatch(updateList); - } - return respVO; - } - - @Override - @OrganIgnore - public void exportTemplate(HttpServletResponse response, String value) { - String rootPath = getSavePath(); - FileHelperUtil.getFile(rootPath, response, value); - } - - @Override - public List getPlateAll() { - return plateMapper.getAllByOrganId(OrganContextHolder.getOrganId()); - } - - private void validateOrganExists(Long organId) { - CommonResult index = organApi.validOrgan(organId); - if (!index.isSuccess()) { - throw exception(ErrorCodeConstants.ORGAN_NOT_EXISTS); - } - } - - // 当前组织中板材是否存在 - private void validateGoodExists(String goodsId, Long organId) { - if (plateMapper.selectByGoodID(goodsId, organId) != null) { - throw exception(ErrorCodeConstants.PLATE_EXISTS); - } - } - - // 组织id返回 - private Long getOrganId(String type, Long userId, Long organId) { - - boolean hasPermission = permissionApi.hasRoles(userId, type).getData(); - - Long organIdDefault = OrganContextHolder.getOrganId(); - - if (hasPermission && organId != null && organId != 0) { - - validateOrganExists(organId); - - organIdDefault = organId; - } - - return organIdDefault; - } -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java deleted file mode 100644 index e7bc9edba..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cf.imes.module.manage.service.process; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.process.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; - -import java.util.List; - -public interface ProductionProcessService { - - - - - // 生产工序单分页查询 - PageResult getProcessPage(ProcessPageReqVO pageReqVO); - - - - // 修改工序明细表的工序状态 - void updateProcessStatus(OrderProcessStepItemVO reqVo); - - - - // 查看板材信息的组合名称 - List selectPlateName(Long stepItemId); - - - // 查询生产单对应的柜体名称 - List selectBodyName(OrderBodyReqVO reqVO); - - - OrderPlateReqVO selectPlate(ProcessPlateReqVO reqVO); - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java deleted file mode 100644 index 8d58faf78..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.cf.imes.module.manage.service.process; - - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.cf.imes.framework.common.enums.OrderStatusEnum; -import com.cf.imes.framework.common.enums.ProcessProcessingTypeEnum; -import com.cf.imes.framework.common.enums.ProcessingStatusEnum; -import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.manage.controller.admin.process.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import com.cf.imes.module.manage.dal.dataobject.pack.OrderBodyDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; -import com.cf.imes.module.manage.dal.mysql.pack.OrderBodyMapper; -import com.cf.imes.module.manage.dal.mysql.plate.OrderPlateMapper; -import com.cf.imes.module.manage.dal.mysql.process.OrdersMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProcessStepItemMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProcessStepMapper; -import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; -import com.cf.imes.module.system.api.process.ProcessApi; -import com.cf.imes.module.system.enums.ErrorCodeConstants; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - -import static com.cf.imes.framework.common.util.string.SearchUtil.insertSeparator; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; - - -/** - * 生产单工序表 order_process_{N} 实现类 - * - * @author 晨丰科技 - */ -@Service -@Validated -@Slf4j -public class ProductionProcessServiceImpl implements ProductionProcessService { - - - @Resource - private ProcessStepMapper processStepMapper; - - - @Resource - private ProcessStepItemMapper processStepItemMapper; - - - @Resource - private OrderBodyMapper orderBodyMapper; - - - @Resource - private OrderItemMapper orderItemMapper; - - @Resource - private OrderPlateMapper orderPlateMapper; - - @Resource - private OrdersMapper ordersMapper; - - - @Resource - private ProcessApi processApi; - - - - - - - // 生产工序单分页查询 - @Override - public PageResult getProcessPage(ProcessPageReqVO pageReqVO) { - - // 模糊搜索添加条件 - pageReqVO.setCustomer(insertSeparator(pageReqVO.getCustomer())); - pageReqVO.setCustomOrderNo(insertSeparator(pageReqVO.getCustomOrderNo())); - pageReqVO.setAddress(insertSeparator(pageReqVO.getAddress())); - - PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - - IPage processRespVOS = processStepMapper.selectOrder(page,pageReqVO,getUserOrganId()); - - // 判断生产步骤表在传入的状态查询后是否为空 - if(processRespVOS == null){ - - return null; - } - - if (CollUtil.isEmpty(processRespVOS.getRecords())) { - return new PageResult<>(); - } - - - return new PageResult<>(processRespVOS.getRecords(), processRespVOS.getTotal()); - - - } - - - - - - - - // 修改工序明细表的工序状态 - @Override - @Transactional(rollbackFor = Exception.class) - public void updateProcessStatus(OrderProcessStepItemVO reqVo) { - - // 工序加工添加负责人 - String nickname = getLoginUser().getNickname(); - - // 根据工序步骤 id 查询当前生产单步骤和明细的生产状态 - ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getProcessStepId(),reqVo.getName(),getUserOrganId(), - reqVo.getGoodsId() != null ? reqVo.getGoodsId():null); - - - // 判断生产明细表的状态查询后是否为空 - if(processStepStatuses.getProcessStepItemStatus().equals(ProcessingStatusEnum.PROCESSED.getStatus())){ - - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); - } - // 判断生产工序步骤表的状态是否为空 - if(processStepStatuses.getProcessStepStatus().equals(ProcessingStatusEnum.PROCESSED.getStatus())){ - - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); - } - - // 判断生产单工序的状态是否为组件加工 - if(processStepStatuses.getType().equals(ProcessProcessingTypeEnum.COMPONENTPROCESSING.getNumber())){ - - processStepMapper.updateStatusByName(reqVo.getProcessStepId(),nickname); - - processStepItemMapper.updateStemStatus(reqVo.getProcessStepId(),reqVo.getName()); - - List orderProcessStepItemNDOS = processStepItemMapper.selectStemById(reqVo.getProcessStepId(),ProcessingStatusEnum.RAW.getStatus(),getUserOrganId()); - if(orderProcessStepItemNDOS.isEmpty()){ - - // 修改生产单工序步骤表的状态 - BigDecimal salary = calculateSalary(reqVo.getProcessStepId(),processStepStatuses.getProcessId()); - - processStepMapper.updateStatusById(reqVo.getProcessStepId(),salary); - - } - // 当前工序已全部加工，修改生产单的状态为生产完成 - if(validateOrderStatus(processStepStatuses.getOrderId())){ - OrderDO orderDO = ordersMapper.selectById(processStepStatuses.getOrderId()); - orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); - orderDO.setFinishTime(LocalDateTime.now()); - ordersMapper.updateById(orderDO); - } - - return; - - } - - - // 判断生产单工序的加工类型是否为板材 - if(processStepStatuses.getType().equals(ProcessProcessingTypeEnum.PLATE.getNumber())){ - - processStepMapper.updateStatusByName(reqVo.getProcessStepId(),nickname); - - processStepItemMapper.updateStatusByBodyId(reqVo.getGoodsId()); - - List orderProcessStepItemNDOS = processStepItemMapper.selectStemById(reqVo.getProcessStepId(),ProcessingStatusEnum.RAW.getStatus(),getUserOrganId()); - if(orderProcessStepItemNDOS.isEmpty()){ - - // 修改生产单工序步骤表的状态并计算工资 - BigDecimal area = processStepItemMapper.selectAreaByProcessId(reqVo.getProcessStepId(),processStepStatuses.getOrderId(),getUserOrganId()); - - BigDecimal salary = processStepMapper.calculateSalary(reqVo.getProcessStepId(), area,null,getUserOrganId()); - - processStepMapper.updateStatusById(reqVo.getProcessStepId(),salary); - - } - // 当前工序已全部加工，修改生产单的状态为生产完成 - if(validateOrderStatus(processStepStatuses.getOrderId())){ - OrderDO orderDO = ordersMapper.selectById(processStepStatuses.getOrderId()); - orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); - orderDO.setFinishTime(LocalDateTime.now()); - ordersMapper.updateById(orderDO); - } - return; - - } - try { - - BigDecimal salary = calculateSalary(reqVo.getProcessStepId(),null); - - // 修改生产明细表和步骤表的工序状态 - processStepMapper.updateStatus(reqVo.getProcessStepId(),nickname,salary); - - processStepItemMapper.updateStatus(reqVo.getProcessStepId()); - - // 判断当前工序的状态是否为打包类型，如果是，修改生产的状态为生产完成 - if(processStepStatuses.getType().equals(ProcessProcessingTypeEnum.PACK.getNumber())){ - OrderDO orderDO = ordersMapper.selectById(processStepStatuses.getOrderId()); - orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); - orderDO.setFinishTime(LocalDateTime.now()); - ordersMapper.updateById(orderDO); - return; - } - - // 当前工序已全部加工，修改生产单的状态为生产完成 - if(validateOrderStatus(processStepStatuses.getOrderId())){ - OrderDO orderDO = ordersMapper.selectById(processStepStatuses.getOrderId()); - orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); - orderDO.setFinishTime(LocalDateTime.now()); - ordersMapper.updateById(orderDO); - } - - }catch (Exception e){ - log.error(String.valueOf(e)); - - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); - } - - - - } - - - - // 计算工资金额 - public BigDecimal calculateSalary(Long processStepId,Long processId){ - - BigDecimal pieceRate = BigDecimal.ZERO; - // 查询当前工序对应的板材的面积 - BigDecimal area = processStepItemMapper.selectAreaByProcessStepId(processStepId,getUserOrganId()); - - if(processId != null){ - // 查询组件加工的工资 - pieceRate = processApi.getProcess(processId); - } - - // 计算当前工序的工资金额 - BigDecimal salary = processStepMapper.calculateSalary(processStepId, area,pieceRate,getUserOrganId()); - - return salary; - - } - - - public Boolean validateOrderStatus(Long orderId){ - - // 查询当前生产单的工序是否已全部加工 - List orderProcessStepNDOS = processStepMapper.selectOrderStatus(orderId, getUserOrganId()); - - return orderProcessStepNDOS.isEmpty(); - - } - - - // 查看板材信息的组合名称 - @Override - public List selectPlateName(Long stepItemId) { - - - List orderModuleVOS = processStepItemMapper.selectPlateName(stepItemId); - - for (OrderModuleVO orderModuleVO : orderModuleVOS) { - if(orderModuleVO.getGroupName().isEmpty()){ - return orderModuleVOS; - } - - // 修改组合名称为加工组的名称 - orderModuleVO.setName(orderModuleVO.getGroupName()); - } - - return orderModuleVOS; - - } - - - - // 查询生产单对应的柜体名称 - @Override - public List selectBodyName(OrderBodyReqVO reqVO) { - - if(reqVO.getProcessType() == 7){ - // 等于 7(组件加工) ，则不返回柜体信息 - return null; - } - - List orderBodyDOS = orderBodyMapper.selectListByOrderId(reqVO.getOrderId(),getUserOrganId(),null); - - - return BeanUtils.toBean(orderBodyDOS, OrderBodyRespVo.class); - - - } - - - - @Override - public OrderPlateReqVO selectPlate(ProcessPlateReqVO reqVO) { - - OrderPlateReqVO orderPlateReqVO = new OrderPlateReqVO(); - - if(reqVO.getProcessType().equals(ProcessProcessingTypeEnum.COMPONENTPROCESSING.getNumber())){ - - // 等于 7(组件加工) ,根据生产单工序步骤ID查询对应的柜体ID，再根据柜体ID查询对应的板件ID - - List OrderBodyRespVos = processStepItemMapper.selectBodyIds(reqVO.getProcessStepId(),reqVO.getName(),getUserOrganId()); - List collect = OrderBodyRespVos.stream().map(m -> m.getId()).collect(Collectors.toList()); - List plateDetails = orderItemMapper.selectPlateListByBodyIds(collect, reqVO.getOrderId(), getUserOrganId()); - - orderPlateReqVO.setOrderBodyRespVoList(OrderBodyRespVos); - orderPlateReqVO.setPlateDetails(plateDetails); - - return orderPlateReqVO; - - } - - - // 不等于 7(组件加工) ，现根据订单号查询所有的柜体信息 - // 进行判断，如果传入的柜体ID为空，进行详细查询，不为空，直接根据订单ID查询全部的板材信息 - if(reqVO.getBodyId() == null){ - - List orderBodyDOS = orderBodyMapper.selectListByOrderId(reqVO.getOrderId(), getUserOrganId(),reqVO.getBodyId()); - - List orderBodyRespVos = BeanUtils.toBean(orderBodyDOS, OrderBodyRespVo.class); - // 查询全部的板材信息 - List orderPlateReqVOS = orderPlateMapper.selectListByOrderId(reqVO.getOrderId(),getUserOrganId()); - orderPlateReqVO.setOrderBodyRespVoList(orderBodyRespVos); - orderPlateReqVO.setPlateDetails(orderPlateReqVOS); - - return orderPlateReqVO; - } - - - // 有柜体ID，进行详细查询 - List orderBodyDOS = orderBodyMapper.selectListByOrderId(reqVO.getOrderId(), getUserOrganId(),reqVO.getBodyId()); - - List orderBodyRespVos = BeanUtils.toBean(orderBodyDOS, OrderBodyRespVo.class); - - List plateDetails = orderItemMapper.selectByOrderId(reqVO, getUserOrganId()); - - orderPlateReqVO.setOrderBodyRespVoList(orderBodyRespVos); - orderPlateReqVO.setPlateDetails(plateDetails); - - return orderPlateReqVO; - - - } - - -} - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java deleted file mode 100644 index a14b63ef5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cf.imes.module.manage.service.query; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.pack.vo.PackDetailsReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PrintOrderRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.*; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRatePageReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; - -import java.util.List; - -public interface ProductionStatusService { - - - // 生产状态分页查询 - PageResult getProductionPage(OrderPlatePageReqVO pageReqVO); - - // 查看生产单下的加工的工序组 - List selectProduction(Long orderNo); - - - // 查看板材信息的组合名称 - List selectPlateName(OrderModuleReqVO reqVO); - - - // 查看板材信息分页 - PageResult getOrderPlatePage(PlatePageVO pageReqVO); - - - // 计件工资分页查询 - PageResult getSalaryPage(PriceRatePageReqVO pageReqVO); - - - - // 打包查询分页 - PageResult queryPackage(OrderPlatePageReqVO pageReqVO); - - - - // 生产单打包完成包裹查看 - List getPackageList(Long orderNo); - - - - // 查看包裹详情 - PageResult queryPackageDetails(PackDetailsReqVO reqVO); - - - // 打印订单 - PrintOrderRespVO printOrder(Long orderNo); - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java deleted file mode 100644 index a7514f783..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.cf.imes.module.manage.service.query; - - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.cf.imes.framework.common.enums.OrderPackageTypeEnum; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList; -import com.cf.imes.module.manage.controller.admin.pack.vo.PackDetailsReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.PrintOrderRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.*; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRatePageReqVO; -import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; -import com.cf.imes.module.manage.dal.mysql.plate.OrderPlateMapper; -import com.cf.imes.module.manage.dal.mysql.process.OrdersMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProcessStepMapper; -import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; -import com.cf.imes.module.manage.dal.mysql.query.OrderPartsMapper; -import com.cf.imes.module.manage.util.page.PageHelperUtil; -import com.github.pagehelper.PageInfo; -import com.github.pagehelper.page.PageMethod; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; - - -@Service -@Validated -public class ProductionStatusServiceImpl implements ProductionStatusService { - - - - @Resource - private ProcessStepMapper processStepMapper; - - @Resource - private OrdersMapper ordersMapper; - - @Resource - private OrderItemMapper orderItemMapper; - - @Resource - private OrderPartsMapper orderPartsMapper; - - @Resource - private OrderPlateMapper orderPlateMapper; - - - // 生产状态分页查询 - @Override - public PageResult getProductionPage(OrderPlatePageReqVO pageReqVO) { - - return ordersMapper.selectProductionPage(pageReqVO); - - } - - - - // 查看生产单下的加工的工序组 - @Override - public List selectProduction(Long orderNo) { - - List productionGroupVOS = processStepMapper.selectProducitonList(orderNo,getUserOrganId()); - - for (int i = 1; i < productionGroupVOS.size(); i++) { - productionGroupVOS.get(i).setGroupName(null); - } - - return productionGroupVOS; - } - - - - - - // 查询板材信息的组合名称 - @Override - public List selectPlateName(OrderModuleReqVO reqVO) { - - return orderItemMapper.selectCombinationName(reqVO.getOrderNo()); - - } - - - - - // 查看板材信息分页 - @Override - public PageResult getOrderPlatePage(PlatePageVO pageReqVO) { - - - PageMethod.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - List orderPlateRespVOS = orderItemMapper.selectPlateList(pageReqVO); - PageInfo pageInfo = new PageInfo<>(orderPlateRespVOS); - PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); - - return priceRateReqVOPageResult; - - } - - - - - // 计件工资分页查询 - @Override - public PageResult getSalaryPage(PriceRatePageReqVO pageReqVO) { - - PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - - IPage priceRateReqVOS = processStepMapper.selectSalaryList(page,pageReqVO,getUserOrganId()); - - if (CollUtil.isEmpty(priceRateReqVOS.getRecords())) { - return new PageResult<>(); - } - - List orderProcessStepNDOS = processStepMapper.selectProcessList(getUserOrganId()); - - for (PriceRateReqVO record : priceRateReqVOS.getRecords()) { - record.setAmount(orderProcessStepNDOS - .stream() - .filter( f -> Objects.equals(f.getProcessinfoId(),record.getProcessId())) - .filter(f -> Objects.equals(f.getName(),record.getName())) - .filter(f -> Objects.equals(f.getManager(),record.getManager())) - .mapToDouble(OrderProcessStepNDO::getSalaryAmount).sum()); - } - - - return new PageResult<>(priceRateReqVOS.getRecords(), priceRateReqVOS.getTotal()); - - - } - - - - - // 打包查询分页 - @Override - public PageResult queryPackage(OrderPlatePageReqVO pageReqVO) { - - return ordersMapper.selectProductionPage(pageReqVO); - - } - - - - - // 生产单打包完成包裹查看 - @Override - public List getPackageList(Long orderNo) { - -// List orderPackageDOS = orderPackageMapper.selectByOrderNo(orderNo); - -// return BeanUtils.toBean(orderPackageDOS, OrderPackageVO.class); - - return null; - } - - - - - // 查看包裹详情 - @Override - public PageResult queryPackageDetails(PackDetailsReqVO reqVO) { - - PageDTO page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize()); - - // 查看配件包裹 - if(reqVO.getType().equals(OrderPackageTypeEnum.PARTS.getType()) || reqVO.getType().equals(OrderPackageTypeEnum.OTHER_ACCESSORIES.getType())){ - - - // 查看配件包裹 - IPage packageDetailsRespVOS = orderPartsMapper.selectParts(page,reqVO.getPackageId(),getUserOrganId()); - if (CollUtil.isEmpty(packageDetailsRespVOS.getRecords())) { - return new PageResult<>(); - } - - return new PageResult<>(packageDetailsRespVOS.getRecords(), packageDetailsRespVOS.getTotal()); - - } - - - // 查看板材包裹 - IPage packageDetailsRespVOS = orderPlateMapper.selectPackPlateList(page,reqVO.getPackageId(),getUserOrganId()); - - if (CollUtil.isEmpty(packageDetailsRespVOS.getRecords())) { - return new PageResult<>(); - } - - for (PackageDetailsRespVO plateDetailsRespVO : packageDetailsRespVOS.getRecords()) { - String name = ""; - - if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { - for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) { - // 去除最后的逗号 - name += groupNameList.getName() + ","; - } - name = name.substring(0, name.length() - 1); - } - - plateDetailsRespVO.setProcessGroup(name); - } - - - return new PageResult<>(packageDetailsRespVOS.getRecords(), packageDetailsRespVOS.getTotal()); - - } - - - - - // 打印订单 - @Override - public PrintOrderRespVO printOrder(Long orderNo) { - -// return productionStatusMapper.selectPrintOrder(orderNo,getUserOrganId()); - - return null; - - } - - - - -// // 导出缺板 -// @Override -// public PageResult getMissingBoard(OrderPartsReqVO pageReqVO) { -// -// -// PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); -// -// IPage plateDetailsRespVOS = orderPackageMapper.selectMissingBoard(page,pageReqVO.getOrderId(),getUserOrganId()); -// -// if (CollectionUtil.isEmpty(plateDetailsRespVOS.getRecords())) { -// return new PageResult<>(); -// } -// -// -// return new PageResult<>(plateDetailsRespVOS.getRecords(), plateDetailsRespVOS.getTotal()); -// -// -// } - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateService.java deleted file mode 100644 index bbd0114af..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateService.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.cf.imes.module.manage.service.remainplaten; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateSaveReqVO; -import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO; - -import javax.validation.Valid; -import java.util.Set; - -/** - * 生产单余料板表 Service 接口 - * - * @author 晨丰科技 - */ -public interface RemainPlateService { - - /** - * 创建生产单余料板表 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Boolean createRemainPlate(@Valid RemainPlateSaveReqVO createReqVO); - - /** - * 创建生产单余料板表 - * - * @param createReqVOS 创建信息 多个 - * @return 编号 - */ - Boolean createRemainPlateMultiple(@Valid Set createReqVOS); - - /** - * 批量核销 - * - * @param ids 编号 - * @param status 状态 - * @param useType 使用类型 - * @param planId 排单id - */ - void updateRemainPlateStatus(Set ids, Integer status,Integer useType,Long planId); - - /** - * 更新生产单余料板表 - * - * @param ids 编号 - * @param status 状态 - */ - void revertRemainPlateStatus(Set ids, Integer status); - - /** - * 核销板材库 - * - * @param updateReqVO 更新信息 - */ - void updateRemainPlate(@Valid RemainPlateSaveReqVO updateReqVO); - - /** - * 删除生产单余料板表 - * - * @param ids 编号 - */ - void deleteRemainPlate(Set ids); - - /** - * 获得生产单余料板表 - * - * @param id 编号 - * @return 生产单余料板表 - */ - RemainPlateDO getRemainPlate(Long id); - - /** - * 获得生产单余料板表 - * - * @param pageReqVO 分页查询 - * @return 生产单余料板表 - */ - PageResult getRemainPlatePage(RemainPlatePageReqVO pageReqVO); - - /** - * 查询可添加余料板 - * - * @param pageReqVO 分页查询 - * @return 生产单余料板表 - */ - PageResult getRemainPlatePageToAdd(RemainPlatePageReqVO pageReqVO); -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java deleted file mode 100644 index 8fc9aed4b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.cf.imes.module.manage.service.remainplaten; - -import com.cf.imes.framework.organ.core.context.OrganContextHolder; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePageReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateSaveReqVO; -import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateUpSaveVO; -import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO; -import com.cf.imes.module.manage.dal.mysql.remainplaten.RemainPlateMapper; -import com.cf.imes.framework.common.enums.DeletedCodeEnum; -import com.cf.imes.module.manage.enums.remainPlate.RemainPlateStatusEnum; -import com.cf.imes.module.manage.enums.remainPlate.RemainPlateUseTypeEnum; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import com.cf.imes.framework.common.pojo.PageResult; - - -import com.cf.imes.framework.common.util.object.BeanUtils; - -import javax.annotation.Resource; - -import java.util.*; - -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; - -/** - * 生产单余料板表 order_remain_plate_{N} Service 实现类 - * - * @author 晨丰科技 - */ -@Service -@Validated -public class RemainPlateServiceImpl implements RemainPlateService { - - @Resource - private RemainPlateMapper remainPlateMapper; - - private static final Integer MAX_NUM = 999; // 余料单次最大条数 - @Override - public Boolean createRemainPlate(RemainPlateSaveReqVO createReqVO) { - List remainPlates = new ArrayList<>(); - // 限制新增数量不能超过999 - if (createReqVO.getCount() > MAX_NUM) { - throw exception(REMAIN_PLATE_COUNT_MAX); - } - // 插入 - if (createReqVO.getCount() >= 1) { - for (int i = 0; i < createReqVO.getCount(); i++) { - RemainPlateDO remainPlate = BeanUtils.toBean(createReqVO, RemainPlateDO.class).setCount(1).setOrganId(OrganContextHolder.getOrganId()); - remainPlates.add(remainPlate); - } - } - // 批量增加 - return remainPlateMapper.insertBatch(remainPlates); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean createRemainPlateMultiple(Set createReqVOS) { - Collection remainPlates = new ArrayList<>(); - createReqVOS.forEach(createReqVO -> { - // 判断该排单是否已经添加过余料 - if (remainPlateMapper.selectRemainPlatesByInitPlanId(createReqVO.getInitPlanId(), DeletedCodeEnum.NOT_DELETED.getStatus(), OrganContextHolder.getOrganId()).size() > 0) { - // 删除余料 - remainPlateMapper.deleteRemainPlate(createReqVO.getInitPlanId(), OrganContextHolder.getOrganId()); - } - RemainPlateDO remainPlate = BeanUtils.toBean(createReqVO, RemainPlateDO.class); - remainPlates.add(remainPlate); - }); - return remainPlateMapper.insertBatch(remainPlates); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateRemainPlateStatus(Set ids, Integer status, Integer useType, Long planId) { - // 余料存在判断 - validateRemainPlateExists(ids); - if (useType != RemainPlateUseTypeEnum.TYPE_ONE.getStatus() && useType != RemainPlateUseTypeEnum.TYPE_ZERO.getStatus()) { //余料使用状态为2或3 - // 判断该排单是否存在以使用的余料 - if (remainPlateMapper.selectRemainPlatesByPlanId(planId, RemainPlateStatusEnum.USED.getStatus(), - DeletedCodeEnum.NOT_DELETED.getStatus(), OrganContextHolder.getOrganId()).size() > 0) { - // 余料状态还原 - remainPlateMapper.updateRemainPlateStatusByPlanId(RemainPlateStatusEnum.UNUSED.getStatus(), RemainPlateUseTypeEnum.TYPE_ZERO.getStatus(), - OrganContextHolder.getOrganId(), planId); - } - } - if (ids != null){ - //判断是否符合核销标准 - validateRemainPlateStatus(ids, RemainPlateStatusEnum.USED.getStatus()); - //以id为条件批量修改余料库中的状态 - remainPlateMapper.updateRemainPlateStatus(ids, status, useType, OrganContextHolder.getOrganId(), planId); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void revertRemainPlateStatus(Set ids, Integer status) { - if (ids == null) { - throw exception(REMAIN_PLATE_ID_NOT_EXISTS); - } - // 判断余料的状态是否存在使用中 - validateRemainPlateStatus(ids, RemainPlateStatusEnum.UNUSED.getStatus()); - // 判断使用类型是否为核销 - for (Long id : ids) { - if (!validateRemainPlateUseType(id).equals(RemainPlateUseTypeEnum.TYPE_ONE.getStatus())) { - throw exception(REMAIN_PLATE_USR_TYPE); - } - } - remainPlateMapper.updateRemainPlateStatus(ids, status, null, OrganContextHolder.getOrganId(), 0L); - } - - @Override - public void updateRemainPlate(RemainPlateSaveReqVO updateReqVO) { - // 校验存在 - validateRemainPlateExists(updateReqVO.getId()); - // 是否使用 - if (validateRemainPlateStatus(updateReqVO.getId()) == RemainPlateStatusEnum.USED.getStatus()) { - throw exception(REMAIN_PLATE_STATUS_USED); - } - // 判断是否为开料添加 - RemainPlateDO updateObj = validateRemainPlateIsCutting(updateReqVO.getId()); - RemainPlateDO updateUpSaveVO = BeanUtils.toBean(updateReqVO, RemainPlateDO.class); - updateObj.setWidth(updateUpSaveVO.getWidth()).setLength(updateUpSaveVO.getLength()).setThickness(updateUpSaveVO.getThickness()) - .setMaterial(updateUpSaveVO.getMaterial()).setColor(updateUpSaveVO.getColor()).setBrand(updateUpSaveVO.getBrand()) - .setRemark(updateUpSaveVO.getRemark()).setStore(updateUpSaveVO.getStore()).setTexture(updateUpSaveVO.getTexture()) - .setPlaceStyle(updateUpSaveVO.getPlaceStyle()).setOutLineJson(updateUpSaveVO.getOutLineJson()); - remainPlateMapper.updateById(updateUpSaveVO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteRemainPlate(Set ids) { - if (ids == null) { - throw exception(REMAIN_PLATE_ID_NOT_EXISTS); - } - // 余料存在判断 - validateRemainPlateExists(ids); - // 判断余料的状态是否存在使用中 - validateRemainPlateStatus(ids, RemainPlateStatusEnum.USED.getStatus()); - // 删除 - remainPlateMapper.deleteBatchIds(ids); - } - - // 判断余料板是否正在使用 - private void validateRemainPlateStatus(Set ids, Integer status) { - for (Long id : ids) { - if (validateRemainPlateStatus(id) == status) { - if (status == RemainPlateStatusEnum.USED.getStatus()) - throw exception(REMAIN_PLATE_STATUS_USED); - if (status == RemainPlateStatusEnum.UNUSED.getStatus()) - throw exception(REMAIN_PLATE_STATUS_NO_USED); - } - } - } - - private void validateRemainPlateExists(Long id) { - if (remainPlateMapper.selectById(id) == null) { - throw exception(REMAIN_PLATE_NOT_EXISTS); - } - } - private void validateRemainPlateExists(Set id) { - if (remainPlateMapper.selectBatchIds(id).isEmpty()) { - throw exception(REMAIN_PLATE_NOT_EXISTS); - } - } - private RemainPlateDO validateRemainPlateIsCutting(Long id) { - return remainPlateMapper.selectById(id); - } - - private Integer validateRemainPlateStatus(Long id) { - return remainPlateMapper.selectById(id).getStatus(); - } - - private Integer validateRemainPlateUseType(Long id) { - return remainPlateMapper.selectById(id).getUseType(); - } - - @Override - public RemainPlateDO getRemainPlate(Long id) { - return remainPlateMapper.selectById(id); - } - - @Override - public PageResult getRemainPlatePage(RemainPlatePageReqVO pageReqVO) { - return remainPlateMapper.selectPage(pageReqVO); - } - - @Override - public PageResult getRemainPlatePageToAdd(RemainPlatePageReqVO pageReqVO) { - return remainPlateMapper.selectPageToAdd(pageReqVO.setStatus(RemainPlateStatusEnum.UNUSED.getStatus())); - } - -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/voice/VoiceService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/voice/VoiceService.java deleted file mode 100644 index d8e0c777f..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/voice/VoiceService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cf.imes.module.manage.service.voice; - - -import com.jacob.com.Dispatch; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.sql.Blob; -import java.sql.SQLException; - -public interface VoiceService { - - - // 生成音频文件 - - String voiceAnnouncements(String data) throws IOException, SQLException; - - - // 把生成的音频文件进行压缩 - void zipFiles(String sourceFile, String gzipFile) throws IOException; - - void deleteFiles(String sourceFile); - - ResponseEntity getVoice(String sourceFile); - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/voice/VoiceServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/voice/VoiceServiceImpl.java deleted file mode 100644 index a7c8f8d76..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/voice/VoiceServiceImpl.java +++ /dev/null @@ -1,232 +0,0 @@ -package com.cf.imes.module.manage.service.voice; - - -import com.cf.imes.module.manage.config.VocieParameters; -import com.jacob.activeX.ActiveXComponent; -import com.jacob.com.Dispatch; -import com.jacob.com.Variant; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.io.*; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import java.io.IOException; -import java.util.Objects; - - -import java.io.File; -import java.io.FileInputStream; -import java.nio.ByteBuffer; -import java.nio.channels.Channels; -import java.nio.channels.FileChannel; -import java.nio.channels.WritableByteChannel; -import java.util.Random; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -@Service -@Slf4j -public class VoiceServiceImpl implements VoiceService{ - - @Resource - private VocieParameters vocieParameters; - - - - -// static { -// System.loadLibrary("jacob-1.18-x64"); -// } - - //生成音频文件 - @Override - public String voiceAnnouncements(String data) { - - - // 音频保存的路径 - String path = vocieParameters.getPath(); - - // 设置音频的质量（ 越大越好，目前最大好像 22，最小为 4 ） - Long quality = vocieParameters.getQuality(); - - // 朗读声音大小 - Long soundSize = vocieParameters.getSoundSize(); - - // 朗读速度 - Long readingSpeed = vocieParameters.getReadingSpeed(); - - ActiveXComponent ax = null; - Dispatch spFileStream = null; - Dispatch spAudioFormat = null; - Dispatch spVoice = null; - try{ - ax = new ActiveXComponent("Sapi.SpFileStream"); - spFileStream = ax.getObject(); - - ax = new ActiveXComponent("Sapi.SpAudioFormat"); - spAudioFormat = ax.getObject(); - - spVoice = new ActiveXComponent("Sapi.SpVoice").getObject(); - // 设置音频流格式 - Dispatch.put(spAudioFormat, "Type", new Variant(quality)); - // 设置文件输出流格式 - Dispatch.putRef(spFileStream, "Format", spAudioFormat); - // 随机数，控制文件的名字 - int randomInt = new Random(System.currentTimeMillis()).nextInt(900) + 100;// 生成100到999之间的随机数 - // 文件的路径 - String filePath = path + randomInt + ".mp3"; - - // 调用输出文件流打开方法，创建一个.wav文件 - Dispatch.call(spFileStream, "Open", new Variant(filePath), new Variant(3), new Variant(true)); - // 设置声音对象的音频输出流为输出文件对象 - Dispatch.putRef(spVoice, "AudioOutputStream", spFileStream); - // 设置音量 0 ~ 100 - Dispatch.put(spVoice, "Volume", new Variant(soundSize)); - // 设置朗读速度 -10 ~ +10 - Dispatch.put(spVoice, "Rate", new Variant(readingSpeed)); - - Dispatch.call(spVoice, "Speak", new Variant(data)); - - log.info("输出语音文件成功！"); - - return filePath; - - }catch(Exception e){ - e.printStackTrace(); - }finally { - // 关闭输出文件 - Dispatch.call(Objects.requireNonNull(spFileStream), "Close"); - Dispatch.putRef(Objects.requireNonNull(spVoice), "AudioOutputStream", null); - - Objects.requireNonNull(spAudioFormat).safeRelease(); - spFileStream.safeRelease(); - spVoice.safeRelease(); - ax.safeRelease(); - } - - return null; - } - - - - - - @Override - public ResponseEntity getVoice( String fileName) { - try { - File audioFile = new File(fileName); - if (!audioFile.exists()) { - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); - } - - // 读取文件到字节数组 - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - try (FileInputStream fileInputStream = new FileInputStream(audioFile)) { - byte[] buffer = new byte[1024]; - int bytesRead; - while ((bytesRead = fileInputStream.read(buffer)) != -1) { - byteArrayOutputStream.write(buffer, 0, bytesRead); - } - } - - byte[] audioBytes = byteArrayOutputStream.toByteArray(); - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.parseMediaType("audio/mpeg")); - headers.setContentLength(audioBytes.length); - headers.setCacheControl("must-revalidate, post-check=0, pre-check=0"); - - return new ResponseEntity<>(audioBytes, headers, HttpStatus.OK); - - } catch (IOException e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - - - - - - - /** - * 把生成的音频文件进行压缩 - * @param fileNames 需要压缩的文件名称列表(包含相对路径) - * @param zipOutName 压缩后的文件名称 - **/ - @Override - public void zipFiles(String fileNames, String zipOutName) throws IOException { - WritableByteChannel writableByteChannel = null; - ByteBuffer buffer = ByteBuffer.allocate(2048); - FileInputStream fileInputStream = null; - FileChannel fileChannel = null; - try (ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(zipOutName))) { - writableByteChannel = Channels.newChannel(zipOutputStream); - File source = new File(fileNames); - zipOutputStream.putNextEntry(new ZipEntry(source.getName())); - fileInputStream = new FileInputStream(fileNames); - fileChannel = fileInputStream.getChannel(); - while (fileChannel.read(buffer) != -1) { - //更新缓存区位置 - buffer.flip(); - while (buffer.hasRemaining()) { - writableByteChannel.write(buffer); - } - buffer.rewind(); - } - fileChannel.close(); - - log.info("文件压缩成功"); - - - } catch (Exception e) { - log.error("batchZipFiles error fileNames:"); - } finally { - IOUtils.closeQuietly(writableByteChannel); - IOUtils.closeQuietly(fileChannel); - IOUtils.closeQuietly(fileInputStream); - buffer.clear(); - } - } - - - // 删除生成的 mp3 文件 - @Override - public void deleteFiles(String sourceFile) { - - // 检查文件路径是否为空 - if (sourceFile == null || sourceFile.isEmpty()) { - log.error("文件路径为空"); - } - - File file = new File(sourceFile); - - // 检查文件是否存在 - if (!file.exists()) { - log.error("文件不存在：" + sourceFile); - } - - // 检查是否是文件 - if (!file.isFile()) { - log.error("路径指向的不是文件：" + sourceFile); - } - - // 尝试删除文件 - if (file.delete()) { - log.error("文件删除成功：" + sourceFile); - } else { - log.error("文件删除失败：" + sourceFile); - } - } - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/ExcelListener.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/ExcelListener.java deleted file mode 100644 index 701ddcbb5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/ExcelListener.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.cf.imes.module.manage.util.file; - -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 文件读取监听 - */ -public class ExcelListener extends AnalysisEventListener { - /** - * 自定义用于暂时存储data - * 可以通过实例获取该值 - */ - private List dates = new ArrayList<>(); - - private boolean flag = true; - - private Map valueMap = new HashMap<>(); - - - @Override - public void invoke(T t, AnalysisContext analysisContext) { - - } - - /** - * 读取完后操作 - * - * @param context - */ - @Override - public void doAfterAllAnalysed(AnalysisContext context) { - - } - - /** - * 返回数据 - * - * @return 返回读取的数据集合 - **/ - public List getDates() { - return dates; - } - - /** - * 返回读取结果 - * - * @return 是否读取成功 - **/ - public boolean getFlag() { - return flag; - } - - /** - * 返回错误信息 - * - * @return String - **/ - public Map getValueMap() { - return valueMap; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/ExcelReadUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/ExcelReadUtil.java deleted file mode 100644 index d9879a1d9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/ExcelReadUtil.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cf.imes.module.manage.util.file; - -import com.alibaba.excel.EasyExcelFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 文件读取 - */ -@Slf4j -public final class ExcelReadUtil{ - - private String value; - private boolean flag; - - public List read(MultipartFile file, Class head, ExcelListener listener) throws IOException { - value = ""; - Long fileSize = 1024 * 1024 * 10L; // 10 MB - flag = FileHelperUtil.checkFile(file, fileSize); - - if (flag) { - EasyExcelFactory.read(file.getInputStream(), head, listener) - .autoCloseStream(true) // 不要自动关闭，交给 Servlet 自己处理 - .headRowNumber(1).sheet(0).doRead(); - //获取读取的数据 - List list = listener.getDates(); - flag = listener.getFlag(); - if (!flag) { - value = "导入数据有误"; - } - return list; - } - return new ArrayList<>(); - } - - public String getValue() { - return value; - } - - public boolean getFlag() { - return flag; - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/FileHelperUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/FileHelperUtil.java deleted file mode 100644 index 7911366b1..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/file/FileHelperUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cf.imes.module.manage.util.file; - -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; - -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; -import static com.cf.imes.module.manage.enums.ErrorCodeConstants.*; - -/** - * 文件相关工具类 - */ -public class FileHelperUtil { - - // 文件下载 - public static void getFile(String route, HttpServletResponse response, String value) { - // path是指想要下载的文件的路径 - File file = new File(route + File.separator + value); - // 获取文件名 - String filename = file.getName(); - // 将文件写入输入流 - try (FileInputStream fis = new FileInputStream(file)) { - byte[] buffer = new byte[fis.available()]; - fis.read(buffer); - fis.close(); - - response.reset(); - response.setCharacterEncoding("UTF-8"); - response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); - response.addHeader("Content-Length", "" + file.length()); - OutputStream outputStream = new BufferedOutputStream(response.getOutputStream()); - response.setContentType("application/octet-stream"); - outputStream.write(buffer); - outputStream.flush(); - } catch (IOException ex) { - throw exception(FILE_NOT_EXISTS); - } - } - - // 文件条件判断 - public static boolean checkFile(MultipartFile file, - Long fileSize) { - if (file.isEmpty()) { - throw exception(FILE_NULL); - } - if (!(file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls"))) { - throw exception(FILE_FORMAT_ERROR); - } - if (file.getSize() > fileSize) { - throw exception(FILE_EXCEED_SIZE); - } - if (file.getSize() == 0) { - throw exception(FILE_CONTENT_NULL); - } - - return true; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberHelperUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberHelperUtil.java deleted file mode 100644 index a0d615b69..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/number/NumberHelperUtil.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cf.imes.module.manage.util.number; - -import org.springframework.stereotype.Component; - -/** - * 数据处理相关工具类 - */ -@Component -public class NumberHelperUtil { - - public Double[] compareLength(Double[] numbers) { - if (numbers == null || numbers.length < 2) { - return numbers; // 如果数组为空或长度不足2，直接返回原数组 - } - - Double min = numbers[0]; - Double max = numbers[1]; - - // 检查前值和后值是否都为null或小于等于0 - if ((min == null || min <= 0) && (max == null || max <= 0)) { - return new Double[]{null, null}; // 忽略该字段 - } - - // 只输入前值，不输入后值 - if (max == null || max <= 0) { - return new Double[]{min, null}; - } - - // 不输入前值，只输入后值 - if (min == null || min <= 0) { - return new Double[]{null, max}; - } - - // 前值和后值都输入，且前值大于后值，则前值和后值交换 - if (min > max) { - return new Double[]{max, min}; - } - - return new Double[]{min, max}; - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java deleted file mode 100644 index a7ddcec8b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/packageNo/PackageNoUtil.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cf.imes.module.manage.util.packageNo; - - -import java.time.LocalDateTime; -import java.util.Random; - -/** - * 生成包裹编号 工具类 - * - * @author 晨丰科技 - */ -public class PackageNoUtil { - - - public static String randomPageNo(){ - - // 获取当前日期 - String DateNum = LocalDateTime.now().toLocalDate().toString().replace("-", ""); - - // 获取当前时间戳并使用Random类生成随机数 - int randomInt = new Random(System.currentTimeMillis()).nextInt(900000) + 100000; // 生成100000到999999之间的随机数 - - - return DateNum+randomInt; - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/page/PageHelperUtil.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/page/PageHelperUtil.java deleted file mode 100644 index 96c4c5e9c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/util/page/PageHelperUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cf.imes.module.manage.util.page; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.github.pagehelper.PageInfo; - - -/** - * PageHelper 工具类 - * - * @author 晨丰科技 - */ -public class PageHelperUtil { - - // 转换分页数据类型 - public static PageResult convertToPageResult(PageInfo pageInfo) { - PageResult pageResult = new PageResult<>(); - pageResult.setTotal(pageInfo.getTotal()); - pageResult.setList(pageInfo.getList()); - return pageResult; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/common/CommonStatusValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/common/CommonStatusValidator.java deleted file mode 100644 index a74568c20..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/common/CommonStatusValidator.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cf.imes.module.manage.validation.common; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import com.cf.imes.module.manage.enums.remainPlate.RemainPlateStatusEnum; - -/** - * 状态校验 - */ -public class CommonStatusValidator implements ConstraintValidator { - - private ValidCommonStatus annotation; - - @Override - public void initialize(ValidCommonStatus constraintAnnotation) { - this.annotation = constraintAnnotation; - } - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext context) { - if (value == null) { - value = RemainPlateStatusEnum.UNUSED.getStatus(); // 默认值为未使用 - } - return value == RemainPlateStatusEnum.UNUSED.getStatus() || value == RemainPlateStatusEnum.USED.getStatus(); - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/common/ValidCommonStatus.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/common/ValidCommonStatus.java deleted file mode 100644 index bb8b3e458..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/common/ValidCommonStatus.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cf.imes.module.manage.validation.common; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - -/** - * 状态校验注解 - */ -@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = CommonStatusValidator.class) -@Documented -public @interface ValidCommonStatus { - String message() default "状态值必须为 0：未使用、1：已使用 "; - - Class[] groups() default {}; - - Class[] payload() default {}; -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/OrderPackagedStatusValid.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/OrderPackagedStatusValid.java deleted file mode 100644 index 2f5c1a208..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/OrderPackagedStatusValid.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cf.imes.module.manage.validation.pack; - - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - - -/** - * @author 打包状态校验注解 - */ -@Target({ - ElementType.FIELD, -}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Constraint( - validatedBy = {OrderPackagedValidator.class} -) -public @interface OrderPackagedStatusValid { - - String message() default "打包状态不合法"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/OrderPackagedValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/OrderPackagedValidator.java deleted file mode 100644 index 5a856e58a..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/OrderPackagedValidator.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cf.imes.module.manage.validation.pack; - -import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.framework.common.enums.OrderPackageStatusEnum; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * @author 打包状态校验器 - */ -public class OrderPackagedValidator implements ConstraintValidator { - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext constraintValidatorContext) { - - if (ObjectUtil.isNull(value)) { - return true; - } - - for (OrderPackageStatusEnum statusEnum : OrderPackageStatusEnum.values()) { - if (ObjectUtil.equal(statusEnum.getStatus(), value)) { - return true; - } - } - - return false; - - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/PackTypeValid.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/PackTypeValid.java deleted file mode 100644 index 994000486..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/PackTypeValid.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cf.imes.module.manage.validation.pack; - - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - -/** - * @author 包裹类型校验注解 - */ -@Target({ - ElementType.FIELD, -}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Constraint( - validatedBy = {PackTypeValidator.class} -) -public @interface PackTypeValid { - - String message() default "包裹类型不合法"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/PackTypeValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/PackTypeValidator.java deleted file mode 100644 index 2bf866934..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/pack/PackTypeValidator.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cf.imes.module.manage.validation.pack; - - -import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.framework.common.enums.OrderPackageTypeEnum; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * @author 包裹类型校验器 - */ -public class PackTypeValidator implements ConstraintValidator { - - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext constraintValidatorContext) { - - if (ObjectUtil.isNull(value)) { - return true; - } - - for (OrderPackageTypeEnum typeEnum : OrderPackageTypeEnum.values()) { - if (ObjectUtil.equal(typeEnum.getType(), value)) { - return true; - } - } - - return false; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsCategoryValid.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsCategoryValid.java deleted file mode 100644 index dc50473a9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsCategoryValid.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cf.imes.module.manage.validation.parts; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - -/** - * 配件主类校验注解 - */ -@Target({ - ElementType.FIELD, -}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Constraint( - validatedBy = {PartsCategoryValidator.class} -) -public @interface PartsCategoryValid { - - String message() default "配件主类不合法，1：封边条，2：五金，3：组件"; - - Class[] groups() default {}; - - Class[] payload() default {}; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsCategoryValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsCategoryValidator.java deleted file mode 100644 index c6f04af59..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsCategoryValidator.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.manage.validation.parts; - -import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.module.manage.enums.parts.CategoryEnum; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import java.util.Objects; - -/** - * 配件主类校验 - */ -public class PartsCategoryValidator implements ConstraintValidator { - - @Override - public boolean isValid(String value, ConstraintValidatorContext context) { - if (ObjectUtil.isNull(value)) { - return true; - } - for (CategoryEnum categoryEnum : CategoryEnum.values()) { - if (Objects.equals(categoryEnum.getValue(), value)) { - return true; - } - } - return false; - } - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsNumberValid.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsNumberValid.java deleted file mode 100644 index 01c9d113e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsNumberValid.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cf.imes.module.manage.validation.parts; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 数组校验注解 - */ -@Target({ - ElementType.METHOD, - ElementType.FIELD, - ElementType.ANNOTATION_TYPE, - ElementType.CONSTRUCTOR, - ElementType.PARAMETER, - ElementType.TYPE_USE -}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Constraint(validatedBy = PartsNumberValidator.class) -public @interface PartsNumberValid { - - String name(); - - String message() default "数字不合法"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - int integer() default 5; - - int fraction() default 3; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsNumberValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsNumberValidator.java deleted file mode 100644 index 656156810..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/parts/PartsNumberValidator.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.cf.imes.module.manage.validation.parts; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import java.math.BigDecimal; -import java.text.DecimalFormat; - -/** - * 数组校验 - */ -public class PartsNumberValidator implements ConstraintValidator { - - private static final String ZERO = "0"; - - private static final String GREATER_THAN_ZERO_NOTIFICATION = "%s必须大于0"; - - private static final String FLOAT_NUMBER_LENGTH_ERROR_NOTIFICATION = "%s长度不合法，总长度不超过8位，小数点后不超过3位"; - - private String name; - - private int integer; - - private int fraction; - - @Override - public void initialize(PartsNumberValid constraintAnnotation) { - this.name = constraintAnnotation.name(); - this.integer = constraintAnnotation.integer(); - this.fraction = constraintAnnotation.fraction(); - } - - @Override - public boolean isValid(Object value, ConstraintValidatorContext context) { - // 空的不校验，由原生@NotNull之类的进行判断 - if (value == null) { - return true; - } - - if (value instanceof Number[]) { - return validateArray((Number[]) value, context); - } else if (value instanceof Number) { - return validateSingleValue((Number) value, context); - } - - return true; - } - - private boolean validateArray(Number[] values, ConstraintValidatorContext context) { - for (Number value : values) { - if (!validateSingleValue(value, context)) { - return false; - } - } - return true; - } - - private boolean validateSingleValue(Number value, ConstraintValidatorContext context) { - // 提示信息 - String notification = null; - if (value instanceof Integer) { - notification = handleInteger(value.intValue()); - } else if (value instanceof Long) { - notification = handleLong(value.longValue()); - } else if (value instanceof Double) { - notification = handleDouble(value.doubleValue()); - } else if (value instanceof BigDecimal) { - notification = handleBigDecimal((BigDecimal) value); - } - if (notification != null) { - context.disableDefaultConstraintViolation(); // 禁用默认的 message 的值 - context.buildConstraintViolationWithTemplate(notification).addConstraintViolation(); - return false; - } - return true; - } - - private String handleInteger(Integer value) { - if (value < Integer.parseInt(ZERO)) { - return String.format(GREATER_THAN_ZERO_NOTIFICATION, name); - } - return null; - } - - private String handleLong(Long value) { - if (value < Long.parseLong(ZERO)) { - return String.format(GREATER_THAN_ZERO_NOTIFICATION, name); - } - return null; - } - - private String handleDouble(Double value) { - if (value < Double.parseDouble(ZERO)) { - return String.format(GREATER_THAN_ZERO_NOTIFICATION, name); - } - // 处理科学计数法,保留小数点后四位 - DecimalFormat decimalFormat = new DecimalFormat("#.####"); - String valueString = decimalFormat.format(value); - - String[] split = valueString.split("\\."); - // 获取小数点前的位数 - int integerPartLength = split[0].length(); - // 获取小数点后的位数 - int fractionalPartLength = 0; - if (split.length > 1) { - fractionalPartLength = split[1].length(); - } - - // 总位数不超过 8 位，小数点后位数不超过 3 位 - if (integerPartLength > integer || fractionalPartLength > fraction) { - return String.format(FLOAT_NUMBER_LENGTH_ERROR_NOTIFICATION, name); - } - return null; - } - - private String handleBigDecimal(BigDecimal value) { - if (value.compareTo(BigDecimal.ZERO) < 0) { - return String.format(GREATER_THAN_ZERO_NOTIFICATION, name); - } - - String[] split = value.toPlainString().split("\\."); - // 获取小数点前的位数 - int integerPartLength = split[0].length(); - // 获取小数点后的位数 - int fractionalPartLength = 0; - if (split.length > 1) { - fractionalPartLength = split[1].length(); - } - - // 总位数不超过 8 位，小数点后位数不超过 3 位 - if (integerPartLength > integer || fractionalPartLength > fraction) { - return String.format(FLOAT_NUMBER_LENGTH_ERROR_NOTIFICATION, name); - } - return null; - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/placeStyle/PlaceStyleValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/placeStyle/PlaceStyleValidator.java deleted file mode 100644 index b775e29c5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/placeStyle/PlaceStyleValidator.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.module.manage.validation.placeStyle; - -import com.cf.imes.module.manage.enums.remainPlate.RemainPlatePlaceStyleEnum; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * 放置样式校验 - */ -public class PlaceStyleValidator implements ConstraintValidator { - - private ValidPlaceStyle annotation; - - @Override - public void initialize(ValidPlaceStyle constraintAnnotation) { - this.annotation = constraintAnnotation; - } - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext context) { - if (value == null) { - value = RemainPlatePlaceStyleEnum.ZERO.getStatus(); // 默认值为正面 - } - return value == RemainPlatePlaceStyleEnum.ONE.getStatus() - || value == RemainPlatePlaceStyleEnum.TWO.getStatus() - || value == RemainPlatePlaceStyleEnum.THREE.getStatus() - || value == RemainPlatePlaceStyleEnum.FOUR.getStatus() - || value == RemainPlatePlaceStyleEnum.FIVE.getStatus() - || value == RemainPlatePlaceStyleEnum.SIX.getStatus() - || value == RemainPlatePlaceStyleEnum.SEVEN.getStatus() - || value == RemainPlatePlaceStyleEnum.ZERO.getStatus(); - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/placeStyle/ValidPlaceStyle.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/placeStyle/ValidPlaceStyle.java deleted file mode 100644 index a6fd3f057..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/placeStyle/ValidPlaceStyle.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.manage.validation.placeStyle; - - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - -/** - * 放置样式校验注解 - */ -@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = PlaceStyleValidator.class) -@Documented -public @interface ValidPlaceStyle { - - String message() default " 放置样式不合法，0正面，1正面右转，2正面后转，3正面左转，4反面，5反面右转，6反面后转，7反面左转"; - - Class[] groups() default {}; - - Class[] payload() default {}; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/type/TypeFieldValidator.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/type/TypeFieldValidator.java deleted file mode 100644 index ab689ff54..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/type/TypeFieldValidator.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cf.imes.module.manage.validation.type; - -import com.cf.imes.module.manage.enums.remainPlate.RemainPlateUseTypeEnum; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * 使用类型校验 - */ -public class TypeFieldValidator implements ConstraintValidator { - - private ValidTypeField annotation; - - @Override - public void initialize(ValidTypeField constraintAnnotation) { - this.annotation = constraintAnnotation; - } - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext context) { - // 如果值为 null，则不做校验，直接返回 true - if (value == null) { - value = RemainPlateUseTypeEnum.TYPE_ZERO.getStatus(); // 默认值为未使用 - } - return value == RemainPlateUseTypeEnum.TYPE_ONE.getStatus() || - value == RemainPlateUseTypeEnum.TYPE_TWO.getStatus() || - value == RemainPlateUseTypeEnum.TYPE_THREE.getStatus() || - value == RemainPlateUseTypeEnum.TYPE_ZERO.getStatus(); - } -} \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/type/ValidTypeField.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/type/ValidTypeField.java deleted file mode 100644 index 1dff4e4f2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/validation/type/ValidTypeField.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cf.imes.module.manage.validation.type; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - -/** - * 使用类型校验注解 - */ -@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = TypeFieldValidator.class) -@Documented -public @interface ValidTypeField { - String message() default "状态值必须为 0：核销、1：排单 或 2：补板"; - - Class[] groups() default {}; - - Class[] payload() default {}; -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-dev.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-dev.yaml deleted file mode 100644 index 0078f470c..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-dev.yaml +++ /dev/null @@ -1,171 +0,0 @@ ---- #################### 数据库相关配置 #################### -spring: - # 数据源配置项 - autoconfigure: - exclude: - - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 - datasource: - druid: # Druid 【监控】相关的全局配置 - web-stat-filter: - enabled: true - stat-view-servlet: - enabled: true - allow: # 设置白名单，不填则允许所有访问 - url-pattern: /druid/* - login-username: # 控制台管理用户名和密码 - login-password: - filter: - stat: - enabled: true - log-slow-sql: true # 慢 SQL 记录 - slow-sql-millis: 100 - merge-sql: true - wall: - config: - multi-statement-allow: true - dynamic: # 多数据源配置 - druid: # Druid 【连接池】相关的全局配置 - initial-size: 5 # 初始连接数 - min-idle: 10 # 最小连接池数量 - max-active: 20 # 最大连接池数量 - max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒 - time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒 - min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒 - max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒 - validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 - test-while-idle: true - test-on-borrow: false - test-on-return: false - primary: master - datasource: - master: - name: imes_base - url: jdbc:mysql://192.168.1.205:3307/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - - # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 - redis: - host: 192.168.1.205 # 地址 - port: 6379 # 端口 - database: 1 # 数据库索引 - password: cf@2024 # 密码，建议生产环境开启 - ---- #################### MQ 消息队列相关配置 #################### - -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv - -spring: - # RabbitMQ 配置项，对应 RabbitProperties 配置类 - rabbitmq: - host: 127.0.0.1 # RabbitMQ 服务的地址 - port: 5672 # RabbitMQ 服务的端口 - username: guest # RabbitMQ 服务的账号 - password: guest # RabbitMQ 服务的密码 - # Kafka 配置项，对应 KafkaProperties 配置类 - kafka: - bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 - ---- #################### 定时任务相关配置 #################### -xxl: - job: - admin: - addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 - ---- #################### 服务保障相关配置 #################### - -# Lock4j 配置项 -lock4j: - acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒 - expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒 - ---- #################### 监控相关配置 #################### - -# Actuator 监控端点的配置项 -management: - endpoints: - web: - base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator - exposure: - include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 - -# Spring Boot Admin 配置项 -spring: - boot: - admin: - # Spring Boot Admin Client 客户端的相关配置 - client: - instance: - service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] - # Spring Boot Admin Server 服务端的相关配置 - context-path: /admin # 配置 Spring - ---- #################### 微信公众号、小程序相关配置 #################### -wx: - mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 - # app-id: wx041349c6f39b268b - # secret: 5abee519483bc9f8cb37ce280e814bd0 - app-id: wx5b23ba7a5589ecbb # 测试号 - secret: 2a7b3b20c537e52e74afd395eb85f61f - # 存储配置，解决 AccessToken 的跨节点的共享 - config-storage: - type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 - key-prefix: wx # Redis Key 的前缀 - http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 - miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 - # appid: wx62056c0d5e8db250 - # secret: 333ae72f41552af1e998fe1f54e1584a - appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 - secret: 6f270509224a7ae1296bbf1c8cb97aed - config-storage: - type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 - key-prefix: wa # Redis Key 的前缀 - http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 - ---- #################### 晨丰相关配置 #################### - -# 晨丰配置项，设置当前项目所有自定义的配置 -chenfeng: - xss: - enable: false - exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 - - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 - pay: - pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify - pay-return-url: http://niubi.natapp1.cc/api/pay/order/return - refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify - -justauth: - enabled: true - type: - DINGTALK: # 钉钉 - client-id: dingvrnreaje3yqvzhxg - client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI - ignore-check-redirect-uri: true - WECHAT_ENTERPRISE: # 企业微信 - client-id: wwd411c69a39ad2e54 - client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw - agent-id: 1000004 - ignore-check-redirect-uri: true - WECHAT_MINI_APP: # 微信小程序 - client-id: ${wx.miniapp.appid} - client-secret: ${wx.miniapp.secret} - ignore-check-redirect-uri: true - ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验 - WECHAT_MP: # 微信公众号 - client-id: ${wx.mp.app-id} - client-secret: ${wx.mp.secret} - ignore-check-redirect-uri: true - ignore-check-state: true # 微信公众号，未调用后端的 getSocialAuthorizeUrl 方法，所以无法进行 state 校验 TODO 芋艿：后续考虑支持 - cache: - type: REDIS - prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: - timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 - -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志 \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-local.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-local.yaml deleted file mode 100644 index a20f091c6..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-local.yaml +++ /dev/null @@ -1,139 +0,0 @@ ---- #################### 数据库相关配置 #################### -spring: - - # 数据源配置项 - autoconfigure: - exclude: - - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 - datasource: - druid: # Druid 【监控】相关的全局配置 - web-stat-filter: - enabled: true - stat-view-servlet: - enabled: true - allow: # 设置白名单，不填则允许所有访问 - url-pattern: /druid/* - login-username: # 控制台管理用户名和密码 - login-password: - filter: - stat: - enabled: true - log-slow-sql: true # 慢 SQL 记录 - slow-sql-millis: 100 - merge-sql: true - wall: - config: - multi-statement-allow: true - dynamic: # 多数据源配置 - druid: # Druid 【连接池】相关的全局配置 - initial-size: 1 # 初始连接数 - min-idle: 1 # 最小连接池数量 - max-active: 20 # 最大连接池数量 - max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒 - time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒 - min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒 - max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒 - validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 - test-while-idle: true - test-on-borrow: false - test-on-return: false - primary: master - datasource: - master: - name: imes_base - url: jdbc:mysql://192.168.1.205:3307/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - driver-class-name: com.mysql.cj.jdbc.Driver - # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 - # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例 - # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 - # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 - username: root - password: root - # username: sa - # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W - redis: - host: 127.0.0.1 # 地址 - port: 6379 # 端口 - database: 0 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 - ---- #################### MQ 消息队列相关配置 #################### - -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv - -spring: - # RabbitMQ 配置项，对应 RabbitProperties 配置类 - rabbitmq: - host: 127.0.0.1 # RabbitMQ 服务的地址 - port: 5672 # RabbitMQ 服务的端口 - username: guest # RabbitMQ 服务的账号 - password: guest # RabbitMQ 服务的密码 - # Kafka 配置项，对应 KafkaProperties 配置类 - kafka: - bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 - ---- #################### 定时任务相关配置 #################### -xxl: - job: - enabled: false # 是否开启调度中心，默认为 true 开启 - admin: - addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 - ---- #################### 服务保障相关配置 #################### - -# Lock4j 配置项 -lock4j: - acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒 - expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒 - ---- #################### 监控相关配置 #################### - -# Actuator 监控端点的配置项 -management: - endpoints: - web: - base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator - exposure: - include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 - -# Spring Boot Admin 配置项 -spring: - boot: - admin: - # Spring Boot Admin Client 客户端的相关配置 - client: - instance: - service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] - # Spring Boot Admin Server 服务端的相关配置 - context-path: /admin # 配置 Spring - -# 日志文件配置 -logging: - level: - # 配置自己写的 MyBatis Mapper 打印日志 - com.cf.imes.module.business.dal.mysql: debug - com.cf.imes.module.business.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info - ---- #################### 晨丰相关配置 #################### - -# 晨丰配置项，设置当前项目所有自定义的配置 -chenfeng: - env: # 多环境的配置项 - tag: ${HOSTNAME} - security: - mock-enable: true - xss: - enable: false - exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 - - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 - access-log: # 访问日志的配置项 - enable: false - error-code: # 错误码相关配置项 - enable: false - -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志 \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-test.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-test.yaml deleted file mode 100644 index 110cf76c9..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application-test.yaml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Feign 等会存在重复定义的服务 \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application.yaml deleted file mode 100644 index 341585cec..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/application.yaml +++ /dev/null @@ -1,160 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Feign 等会存在重复定义的服务 - - # Servlet 配置 - servlet: - # 文件上传相关配置项 - multipart: - max-file-size: 16MB # 单个文件大小 - max-request-size: 32MB # 设置总上传的文件大小 - mvc: - pathmatch: - matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题，参见 SpringFoxHandlerProviderBeanPostProcessor 类 - - # Jackson 配置项 - jackson: - serialization: - write-dates-as-timestamps: true # 设置 LocalDateTime 的格式，使用时间戳 - write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401 - write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳 - fail-on-empty-beans: false # 允许序列化无属性的 Bean - - # Cache 配置项 - cache: - type: REDIS - redis: - time-to-live: 1h # 设置过期时间为 1 小时 - ---- #################### 接口文档配置 #################### - -springdoc: - api-docs: - enabled: true # 1. 是否开启 Swagger 接文档的元数据 - path: /v3/api-docs - swagger-ui: - enabled: true # 2.1 是否开启 Swagger 文档的官方 UI 界面 - path: /swagger-ui.html - default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档 - -knife4j: - enable: true # 2.2 是否开启 Swagger 文档的 Knife4j UI 界面 - setting: - language: zh_cn - -# MyBatis Plus 的配置项 -mybatis-plus: - configuration: - map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 - global-config: - db-config: - worker-id: 0 - datacenter-id: 0 - id-type: ASSIGN_ID # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 - # id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库 - # id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 - # id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解 - - logic-delete-value: 1 # 逻辑已删除值(默认为 1) - logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - banner: false # 关闭控制台的 Banner 打印 - type-aliases-package: ${chenfeng.info.base-package}.dal.dataobject - encryptor: - password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 -mybatis-plus-join: - banner: false # 关闭控制台的 Banner 打印 -# Spring Data Redis 配置 -spring: - data: - redis: - repositories: - enabled: false # 项目未使用到 Spring Data Redis 的 Repository，所以直接禁用，保证启动速度 - ---- #################### RPC 远程调用相关配置 #################### - ---- #################### 消息队列相关 #################### - -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - # Producer 配置项 - producer: - group: ${spring.application.name}_PRODUCER # 生产者分组 - -spring: - # Kafka 配置项，对应 KafkaProperties 配置类 - kafka: - # Kafka Producer 配置项 - producer: - acks: 1 # 0-不应答。1-leader 应答。all-所有 leader 和 follower 应答。 - retries: 3 # 发送失败时，重试发送的次数 - value-serializer: org.springframework.kafka.support.serializer.JsonSerializer # 消息的 value 的序列化 - # Kafka Consumer 配置项 - consumer: - auto-offset-reset: earliest # 设置消费者分组最初的消费进度为 earliest 。可参考博客 https://blog.csdn.net/lishuangzhe7047/article/details/74530417 理解 - value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer - properties: - spring.json.trusted.packages: '*' - # Kafka Consumer Listener 监听器配置 - listener: - missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错 - ---- #################### 定时任务相关配置 #################### - -xxl: - job: - executor: - appname: ${spring.application.name} # 执行器 AppName - logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 - accessToken: default_token # 执行器通讯TOKEN - ---- #################### 验证码相关配置 #################### - -aj: - captcha: - jigsaw: classpath:images/jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 - pic-click: classpath:images/pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 - cache-type: redis # 缓存 local/redis... - cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存 - timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行 - type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 - water-mark: 晨丰科技 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode - interference-options: 0 # 滑动干扰项(0/1/2) - req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false - req-get-lock-limit: 5 # 验证失败5次，get接口锁定 - req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔 - req-get-minute-limit: 30 # get 接口一分钟内请求数限制 - req-check-minute-limit: 60 # check 接口一分钟内请求数限制 - req-verify-minute-limit: 60 # verify 接口一分钟内请求数限制 - ---- #################### 晨丰相关配置 #################### - -chenfeng: - dynamicDataSource: - enabled: true - info: - version: 1.0.0 - base-package: com.cf.imes.module.manage - web: - admin-ui: - url: http://dashboard.chenfeng.iocoder.cn # Admin 管理后台 UI 的地址 - swagger: - title: 生产单管理 - description: 提供生产单管理的所有功能 - version: ${chenfeng.info.version} - base-package: ${chenfeng.info.base-package} - captcha: - enable: true # 验证码的开关，默认为 true； - error-code: # 错误码相关配置项 - constants-class-list: - - com.cf.imes.module.manage.enums.ErrorCodeConstants - organ: # 多组织相关配置项 - enable: true - superadmin-prod-org-ignore-enable: false - ignore-urls: - - /rpc-api/** - ignore-tables: - - test - encrypt: - enable: false - publicKey: cfimes \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-dev.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-dev.yaml deleted file mode 100644 index 85d60b65e..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-dev.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.1.205:8848 - username: nacos - password: nacos - discovery: - #namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.1.205:8848 # Nacos 服务器地址 - namespace: # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-local.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-local.yaml deleted file mode 100644 index 427d44813..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-local.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - # namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-test.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-test.yaml deleted file mode 100644 index 7ea73df48..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap-test.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.1.204:8848 - username: nacos - password: nacos - discovery: - namespace: imes-test # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.1.204:8848 # Nacos 服务器地址 - namespace: imes-test # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap.yaml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap.yaml deleted file mode 100644 index 6436f0a06..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: manage-server - - profiles: - active: local - -server: - port: 48083 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml deleted file mode 100644 index 0e8651dc5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE order_package - SET deleted = true - WHERE organ_id = #{organId} and order_id = #{orderId} and id = #{packageId} - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml deleted file mode 100644 index 17ce652fa..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml +++ /dev/null @@ -1,380 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml deleted file mode 100644 index ff8494b5b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/OrdersMapper.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml deleted file mode 100644 index ea9055fef..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - update order_process_step_item - SET status = TRUE - WHERE process_step_id = #{id}; - - - - - - - update order_process_step_item opsi - - set opsi.status = true - - where opsi.process_step_id = #{processStepId} and opsi.name = #{name} - - - - - - - - - update order_process_step_item opsi - - set opsi.status = true - - where opsi.body_id = #{goodsId} - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml deleted file mode 100644 index e513af47b..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - UPDATE order_process_step SET status = true,finish_time = now(),salary_amount = #{salary} WHERE id = #{id} - - - - - - - - update order_process_step - set status = true, - finish_time = now(), - manager = #{nickname}, - salary_amount = #{salary} - where id = #{id}; - - - - - - - update order_process_step - set manager = #{nickname} - where id = #{id}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml deleted file mode 100644 index 762d614fb..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE order_item - - SET package_id = 0 - - WHERE organ_id = #{organId} and order_id = #{orderId} and package_id = #{packId} ; - - - - - - - - - DELETE FROM order_item - - WHERE organ_id = #{organId} - and order_id = #{orderId} - and parts_id = #{partsId} - - - - - - - - - delete from order_item - - where organ_id = #{organId} - and order_id = #{orderId} - and package_id = #{packageId} - and parts_id in - - #{partsIds} - - - - - - - - - - update order_item - - set package_id = #{packId} - - where organ_id = #{organId} - and order_id = #{orderId} - and plate_id in - - #{id} - - - - - - - - - update order_item oi - - set package_id = 0 - - where - organ_id = #{organId} - and order_id = #{orderId} - and package_id = #{packId} - and plate_id in - - #{id} - - - - - - - - - - update order_item oi - - set package_id = #{packId} - - where organ_id = #{organId} - and order_id = #{orderId} - and parts_id in - - #{id} - - - - - - - - update order_item oi - - set package_id = #{packId} - - where organ_id = #{organId} - and order_id = #{orderId} - and parts_id in - - #{id} - - - - - - - - update order_item oi - - set package_id = 0 - - where - organ_id = #{organId} - and order_id = #{orderId} - and package_id = #{packId} - and parts_id in - - #{id} - - - - - - - - - update order_item - - set package_id = 0 - - where organ_id = #{organId} - and order_id = #{orderId} - and package_id = #{packageId} - and parts_id = #{partsId}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml deleted file mode 100644 index 1ded583dd..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update order_parts op - - set op.deleted = true - where - op.organ_id = #{organId} - and op.order_id = #{orderId} - and op.deleted = false - and op.id in - - #{id} - - - - - - - - - UPDATE order_parts op - - SET op.deleted = true - - WHERE op.organ_id = #{organId} - and op.order_id = #{orderId} - and op.id = #{partsId}; - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/logback-spring.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/logback-spring.xml deleted file mode 100644 index 0ad83831d..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/plate/PlateMapper.xml deleted file mode 100644 index 337f6ceb8..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/remainPlaten/RemainPlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/remainPlaten/RemainPlateMapper.xml deleted file mode 100644 index d772d5914..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/remainPlaten/RemainPlateMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - delete from order_remain_plate where init_plan_id = #{initPlanId} and organ_id = #{organId} - - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_parts_add.xlsx b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_parts_add.xlsx deleted file mode 100644 index 1b34ecbb7..000000000 Binary files a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_parts_add.xlsx and /dev/null differ diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx deleted file mode 100644 index f2a8bb33c..000000000 Binary files a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx and /dev/null differ diff --git a/cf-module-prod-manage/pom.xml b/cf-module-prod-manage/pom.xml deleted file mode 100644 index 134a7055f..000000000 --- a/cf-module-prod-manage/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - com.cf.imes - cf - ${revision} - - pom - - cf-module-prod-manage-api - cf-module-prod-manage-biz - - - cf-module-prod-manage - - - 17 - 17 - UTF-8 - - - - manage 模块下，我们放生产单管理业务 - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index e2359fdbf..06598c311 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ cf-module-system cf-module-infra cf-module-report - cf-module-prod-manage cf-module-prod-executor cf-module-prod-plan