diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/config/ChanjetClientConfig.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/config/ChanjetClientConfig.java index 92a87305..fe3a25be 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/config/ChanjetClientConfig.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/config/ChanjetClientConfig.java @@ -1,6 +1,6 @@ package com.chanko.yunxi.mes.module.biz.config; -import com.chanjet.openapi.sdk.java.ChanjetClient; +import com.chanjet.openapi.sdk.java.AbstractChanjetClient; import com.chanjet.openapi.sdk.java.DefaultChanjetClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; @Configuration public class ChanjetClientConfig { @Bean - public ChanjetClient chanjetClient(ChanjetOpenApiConfig chanjetOpenApiConfig) { + public AbstractChanjetClient chanjetClient(ChanjetOpenApiConfig chanjetOpenApiConfig) { return new DefaultChanjetClient(chanjetOpenApiConfig.getGatewayUrl(), chanjetOpenApiConfig.getSecret()); } } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java similarity index 86% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetController.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java index 69cebc04..185b0a1b 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetController.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet; import com.chanjet.openapi.sdk.java.exception.ChanjetApiException; import com.chanjet.openapi.sdk.java.response.GetTokenResponse; @@ -7,9 +7,7 @@ import com.chanko.yunxi.mes.framework.tenant.core.aop.TenantIgnore; import com.chanko.yunxi.mes.module.biz.controller.admin.procedure.vo.ProcedureSaveReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.storage.vo.StorageSaveReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.taskreport.vo.TaskReportSaveReqVO; -import com.chanko.yunxi.mes.module.biz.controller.admin.workshop.vo.WorkshopSaveReqVO; import com.chanko.yunxi.mes.module.biz.manager.ChanjetManager; -import com.chanko.yunxi.mes.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO; import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserSaveReqVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -61,18 +59,20 @@ public class ChanjetController { return response; } - @PostMapping("/dept/create") - @Operation(summary = "创建部门") - @PreAuthorize("@ss.hasPermission('system:dept:create')") - public CommonResult createDept(@Valid @RequestBody DeptSaveReqVO createReqVO) throws ChanjetApiException { - return success(chanjetManager.createDepartment(createReqVO)); + @GetMapping("/dept/query") + @Operation(summary = "获取部门数据") + @PreAuthorize("@ss.hasPermission('system:dept:query')") + public CommonResult queryDept() throws ChanjetApiException { + chanjetManager.queryDept(); + return success(true); } - @PostMapping("/workshop/create") - @Operation(summary = "创建车间") - @PreAuthorize("@ss.hasPermission('biz:workshop:create')") - public CommonResult createWorkshop(@Valid @RequestBody WorkshopSaveReqVO createReqVO) throws ChanjetApiException { - return success(chanjetManager.createWorkshop(createReqVO)); + @GetMapping("/workshop/query") + @Operation(summary = "获取车间数据") + @PreAuthorize("@ss.hasPermission('biz:workshop:query')") + public CommonResult queryWorkshop() throws ChanjetApiException { + chanjetManager.queryWorkshop(); + return success(true); } @PostMapping("/customer/query") diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetInterfaceEnum.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java similarity index 80% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetInterfaceEnum.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java index e497d09f..dd4aedee 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetInterfaceEnum.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java @@ -1,10 +1,9 @@ -package com.chanko.yunxi.mes.module.biz.chanjet; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet; import com.chanjet.openapi.sdk.java.ChanjetContent; -import com.chanjet.openapi.sdk.java.ChanjetResponse; import com.chanjet.openapi.sdk.java.enums.HttpMethod; -import com.chanko.yunxi.mes.module.biz.chanjet.vo.*; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo.*; import lombok.Getter; /** @@ -15,8 +14,7 @@ import lombok.Getter; @Getter public enum ChanjetInterfaceEnum { - CREATE_DEPARTMENT("/tplus/api/v2/department/Create", "创建部门", CreateDepartmentReqVO.class, SimpleChanjetResponse.class), - CREATE_WORKSHOP("/tplus/api/v2/department/Create", "创建车间", CreateDepartmentReqVO.class, SimpleChanjetResponse.class), + QUERY_DEPARTMENT_OR_WORKSHOP("/tplus/api/v2/department/Query", "查询部门/车间", CreateDepartmentReqVO.class, QueryDepartmentResVO.class), QUERY_CUSTOMER("/tplus/api/v2/partner/Query", "查询客户", QueryPartnerReqVO.class, SimpleChanjetResponse.class), // TODO reponse QUERY_SUPPLIER("/tplus/api/v2/partner/Query", "查询供应商", QueryPartnerReqVO.class, SimpleChanjetResponse.class), // TODO reponse CREATE_PROCEDURE("/tplus/api/v2/process/Create", "创建工序", CreateProcedureReqVO.class, SimpleChanjetResponse.class), @@ -35,9 +33,9 @@ public enum ChanjetInterfaceEnum { private HttpMethod httpMethod; private String description; private Class requestContentClass; - private Class responseContentClass; + private Class responseContentClass; - ChanjetInterfaceEnum(String uri, String description, Class requestContentClass, Class responseContentClass) { + ChanjetInterfaceEnum(String uri, String description, Class requestContentClass, Class responseContentClass) { this.uri = uri; this.description = description; this.requestContentClass = requestContentClass; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetSpi.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetSpi.java similarity index 62% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetSpi.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetSpi.java index 4ce4ad02..1df16256 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetSpi.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetSpi.java @@ -1,8 +1,13 @@ -package com.chanko.yunxi.mes.module.biz.chanjet; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet; -import com.chanjet.openapi.sdk.java.ChanjetClient; +import cn.hutool.http.HttpStatus; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.alibaba.fastjson.util.ParameterizedTypeImpl; +import com.chanjet.openapi.sdk.java.AbstractChanjetClient; import com.chanjet.openapi.sdk.java.ChanjetContent; import com.chanjet.openapi.sdk.java.ChanjetResponse; +import com.chanjet.openapi.sdk.java.HttpResponse; import com.chanjet.openapi.sdk.java.domain.GetAppAccessTokenContent; import com.chanjet.openapi.sdk.java.domain.GetOrgAccessTokenContent; import com.chanjet.openapi.sdk.java.domain.GetPermanentAuthCodeContent; @@ -10,13 +15,15 @@ import com.chanjet.openapi.sdk.java.domain.GetTokenByPermanentCodeContent; import com.chanjet.openapi.sdk.java.exception.ChanjetApiException; import com.chanjet.openapi.sdk.java.request.*; import com.chanjet.openapi.sdk.java.response.*; -import com.chanko.yunxi.mes.module.biz.chanjet.ChanjetInterfaceEnum; -import com.chanko.yunxi.mes.module.biz.chanjet.vo.SimpleChanjetRequest; -import com.chanko.yunxi.mes.module.biz.chanjet.vo.SimpleChanjetResponse; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.module.biz.config.ChanjetOpenApiConfig; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo.SimpleChanjetRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import java.lang.reflect.Type; +import java.util.List; import java.util.Map; /** @@ -30,7 +37,7 @@ public class ChanjetSpi { @Autowired private ChanjetOpenApiConfig chanjetOpenApiConfig; @Autowired - private ChanjetClient chanjetClient; + private AbstractChanjetClient chanjetClient; /** * 获取应用凭证 @@ -94,7 +101,7 @@ public class ChanjetSpi { //填写开发者的真实OAuth回调地址 getTokenRequest.addQueryParam("redirectUri", chanjetOpenApiConfig.getRedirectUri()); getTokenRequest.addQueryParam("code", code); - getTokenRequest.setRequestUri("/auth/v2/getToken"); + getTokenRequest.setRequestUri("/auth/getToken"); return chanjetClient.execute(getTokenRequest); } @@ -147,4 +154,57 @@ public class ChanjetSpi { return execute(chanjetInterfaceEnum, null, chanjetContent); } + public CommonResult invoke(ChanjetInterfaceEnum chanjetInterfaceEnum, Map queryParams, ChanjetContent chanjetContent, Class responseClass) throws ChanjetApiException { + CommonResult result = CommonResult.success(null); + SimpleChanjetRequest simpleChanjetRequest = new SimpleChanjetRequest(chanjetInterfaceEnum, queryParams, chanjetContent); + HttpResponse response = chanjetClient.invoke(simpleChanjetRequest); + if(response.getStatusCode() == HttpStatus.HTTP_OK){ + if(!StringUtils.isEmpty(response.getBody())){ + result.setData(JSON.parseObject(response.getBody(), buildType(responseClass))); + } + }else{ + return CommonResult.error(response.getStatusCode(), response.getBody()); + } + return result; + } + + public CommonResult> invokeRetList(ChanjetInterfaceEnum chanjetInterfaceEnum, Map queryParams, ChanjetContent chanjetContent, Class responseClass) throws ChanjetApiException { + CommonResult> result = CommonResult.success(null); + SimpleChanjetRequest simpleChanjetRequest = new SimpleChanjetRequest(chanjetInterfaceEnum, queryParams, chanjetContent); + HttpResponse response = chanjetClient.invoke(simpleChanjetRequest); + if(response.getStatusCode() == HttpStatus.HTTP_OK){ + if(!StringUtils.isEmpty(response.getBody())){ + result.setData(JSON.parseObject(response.getBody(), buildType(List.class, responseClass))); + } + }else{ + return CommonResult.error(response.getStatusCode(), response.getBody()); + } + return result; + } + + public CommonResult invoke(ChanjetInterfaceEnum chanjetInterfaceEnum, Map queryParams, Class responseClass) throws ChanjetApiException { + return invoke(chanjetInterfaceEnum, queryParams, null, responseClass); + } + + public CommonResult invoke(ChanjetInterfaceEnum chanjetInterfaceEnum, ChanjetContent chanjetContent, Class responseClass) throws ChanjetApiException { + return invoke(chanjetInterfaceEnum, null, chanjetContent, responseClass); + } + + public CommonResult> invokeRetList(ChanjetInterfaceEnum chanjetInterfaceEnum, Map queryParams, Class responseClass) throws ChanjetApiException { + return invokeRetList(chanjetInterfaceEnum, queryParams, null, responseClass); + } + + public CommonResult> invokeRetList(ChanjetInterfaceEnum chanjetInterfaceEnum, ChanjetContent chanjetContent, Class responseClass) throws ChanjetApiException { + return invokeRetList(chanjetInterfaceEnum, null, chanjetContent, responseClass); + } + + public static Type buildType(Type... types) { + ParameterizedTypeImpl beforeType = null; + if (types != null && types.length > 0) { + for (int i = types.length - 1; i > 0; i--) { + beforeType = new ParameterizedTypeImpl(new Type[]{beforeType == null ? types[i] : beforeType}, null, types[i - 1]); + } + } + return beforeType; + } } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetTokenHolder.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetTokenHolder.java similarity index 97% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetTokenHolder.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetTokenHolder.java index 797a71c5..85792d05 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/ChanjetTokenHolder.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetTokenHolder.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet; import com.alibaba.fastjson.JSON; import com.chanjet.openapi.sdk.java.exception.ChanjetApiException; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/AdjustCostDetails.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/AdjustCostDetails.java similarity index 87% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/AdjustCostDetails.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/AdjustCostDetails.java index 6dc55983..206cc270 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/AdjustCostDetails.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/AdjustCostDetails.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 16:43:39 @@ -35,4 +35,4 @@ public class AdjustCostDetails { return Amount; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/BusinessType.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/BusinessType.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/BusinessType.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/BusinessType.java index 4c6f4469..2a77179d 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/BusinessType.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/BusinessType.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class BusinessType { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/CreateReportDto.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/CreateReportDto.java similarity index 93% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/CreateReportDto.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/CreateReportDto.java index ead0381f..966d87e8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/CreateReportDto.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/CreateReportDto.java @@ -1,7 +1,7 @@ /** * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/CreateStockOutOrderDto.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/CreateStockOutOrderDto.java similarity index 88% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/CreateStockOutOrderDto.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/CreateStockOutOrderDto.java index ae16df7b..554f31cc 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/CreateStockOutOrderDto.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/CreateStockOutOrderDto.java @@ -1,7 +1,7 @@ /** * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Customer.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Customer.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Customer.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Customer.java index bd1fb8b1..5892f279 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Customer.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Customer.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Customer { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Department.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Department.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Department.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Department.java index e5247edd..d93ea09f 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Department.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Department.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Department { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/DynamicPropertyKeys.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/DynamicPropertyKeys.java similarity index 63% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/DynamicPropertyKeys.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/DynamicPropertyKeys.java index f2b8575c..0c9a71b8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/DynamicPropertyKeys.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/DynamicPropertyKeys.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -11,4 +11,4 @@ package com.chanko.yunxi.mes.module.biz.chanjet.dto; */ public class DynamicPropertyKeys { -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/DynamicPropertyValues.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/DynamicPropertyValues.java similarity index 63% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/DynamicPropertyValues.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/DynamicPropertyValues.java index cac444da..3f3e97d7 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/DynamicPropertyValues.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/DynamicPropertyValues.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -11,4 +11,4 @@ package com.chanko.yunxi.mes.module.biz.chanjet.dto; */ public class DynamicPropertyValues { -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/InspectionReturnReason.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/InspectionReturnReason.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/InspectionReturnReason.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/InspectionReturnReason.java index 1066396f..7487fb83 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/InspectionReturnReason.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/InspectionReturnReason.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class InspectionReturnReason { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Inventory.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Inventory.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Inventory.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Inventory.java index 21e7e892..0f0eb5bc 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Inventory.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Inventory.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Inventory { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/JsonRootBean.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/JsonRootBean.java similarity index 86% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/JsonRootBean.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/JsonRootBean.java index 5e43b491..d5a12e6f 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/JsonRootBean.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/JsonRootBean.java @@ -1,7 +1,7 @@ /** * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ManufactureReportDetails.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ManufactureReportDetails.java similarity index 94% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ManufactureReportDetails.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ManufactureReportDetails.java index 9acb756d..4ca11925 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ManufactureReportDetails.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ManufactureReportDetails.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; import java.util.List; /** @@ -15,7 +15,7 @@ public class ManufactureReportDetails { private String SourceVoucherId; private MultiMaterialWasteReasonSelect MultiMaterialWasteReasonSelect; private String Inventory_Code; - private Process Process; + private com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.Process Process; private List ManufactureReportTeamDetails; private Unit Unit; private int QualifiedQuantity; @@ -62,10 +62,10 @@ public class ManufactureReportDetails { return Inventory_Code; } - public void setProcess(Process Process) { + public void setProcess(com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.Process Process) { this.Process = Process; } - public Process getProcess() { + public com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.Process getProcess() { return Process; } @@ -244,4 +244,4 @@ public class ManufactureReportDetails { return Inventory; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ManufactureReportTeamDetails.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ManufactureReportTeamDetails.java similarity index 95% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ManufactureReportTeamDetails.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ManufactureReportTeamDetails.java index bd88b7b9..56219e88 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ManufactureReportTeamDetails.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ManufactureReportTeamDetails.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -91,4 +91,4 @@ public class ManufactureReportTeamDetails { return QualifiedQuantity; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/MultiArtificialWasteReasonSelect.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/MultiArtificialWasteReasonSelect.java similarity index 77% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/MultiArtificialWasteReasonSelect.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/MultiArtificialWasteReasonSelect.java index e62ad56d..913bffc5 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/MultiArtificialWasteReasonSelect.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/MultiArtificialWasteReasonSelect.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class MultiArtificialWasteReasonSelect { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/MultiMaterialWasteReasonSelect.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/MultiMaterialWasteReasonSelect.java similarity index 77% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/MultiMaterialWasteReasonSelect.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/MultiMaterialWasteReasonSelect.java index c80d0017..1da32c6d 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/MultiMaterialWasteReasonSelect.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/MultiMaterialWasteReasonSelect.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class MultiMaterialWasteReasonSelect { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Partner.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Partner.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Partner.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Partner.java index e5631510..0ce97e81 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Partner.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Partner.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Partner { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Person.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Person.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Person.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Person.java index 4ed54ebf..c9a791b0 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Person.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Person.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Person { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Process.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Process.java similarity index 84% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Process.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Process.java index 0148da11..3e154fa6 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Process.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Process.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -27,4 +27,4 @@ public class Process { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ProcessSubUnit.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ProcessSubUnit.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ProcessSubUnit.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ProcessSubUnit.java index 3c237072..abec12b4 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ProcessSubUnit.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ProcessSubUnit.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class ProcessSubUnit { return Name; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ProcessTeam.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ProcessTeam.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ProcessTeam.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ProcessTeam.java index 11c731f4..f9b5fa7f 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/ProcessTeam.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/ProcessTeam.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class ProcessTeam { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Project.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Project.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Project.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Project.java index dda9702f..6cb36192 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Project.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Project.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Project { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/QueryDepartmentDTO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/QueryDepartmentDTO.java new file mode 100644 index 00000000..81f6d9aa --- /dev/null +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/QueryDepartmentDTO.java @@ -0,0 +1,13 @@ +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; + +import lombok.Data; + +/** + * @author chenxi + * @date 2024-04-22 16:43 + */ +@Data +public class QueryDepartmentDTO { + + private String SelectFields = "ID,Code,Name,Parent.Code,Parent.Name"; +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Routing.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Routing.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Routing.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Routing.java index e00030f4..154262d1 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Routing.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Routing.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Routing { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SNObject.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SNObject.java similarity index 82% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SNObject.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SNObject.java index b261a570..0a2194d6 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SNObject.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SNObject.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; import java.util.List; /** @@ -20,4 +20,4 @@ public class SNObject { return SnAccountDetails; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SalaryType.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SalaryType.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SalaryType.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SalaryType.java index 80af6dcd..e6cf570f 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SalaryType.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SalaryType.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class SalaryType { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SnAccountDetails.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SnAccountDetails.java similarity index 77% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SnAccountDetails.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SnAccountDetails.java index 96828e79..d0cb5640 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/SnAccountDetails.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/SnAccountDetails.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class SnAccountDetails { return SNCode; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Unit.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Unit.java similarity index 75% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Unit.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Unit.java index c6c75652..cf322454 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Unit.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Unit.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Unit { return Name; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Unit2.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Unit2.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Unit2.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Unit2.java index 0b77fefb..dd622a6d 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Unit2.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Unit2.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class Unit2 { return Name; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Warehouse.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Warehouse.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Warehouse.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Warehouse.java index 824874cf..f3abfab8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/Warehouse.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/Warehouse.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 16:43:39 @@ -19,4 +19,4 @@ public class Warehouse { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/WorkShop.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/WorkShop.java similarity index 76% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/WorkShop.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/WorkShop.java index 71d13e21..75ab0343 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/dto/WorkShop.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/WorkShop.java @@ -1,7 +1,7 @@ /** - * Copyright 2024 bejson.com + * Copyright 2024 bejson.com */ -package com.chanko.yunxi.mes.module.biz.chanjet.dto; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto; /** * Auto-generated: 2024-04-20 15:37:29 @@ -19,4 +19,4 @@ public class WorkShop { return Code; } -} \ No newline at end of file +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateDepartmentReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateDepartmentReqVO.java similarity index 90% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateDepartmentReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateDepartmentReqVO.java index 57f83933..fd747338 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateDepartmentReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateDepartmentReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateOrUpdateEmployeeReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateOrUpdateEmployeeReqVO.java similarity index 93% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateOrUpdateEmployeeReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateOrUpdateEmployeeReqVO.java index 61c976aa..12af1006 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateOrUpdateEmployeeReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateOrUpdateEmployeeReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateProcedureReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateProcedureReqVO.java similarity index 97% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateProcedureReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateProcedureReqVO.java index 7822b4a0..bbe4c31a 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateProcedureReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateProcedureReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateReportReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateReportReqVO.java similarity index 96% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateReportReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateReportReqVO.java index a83b3822..69ef21c1 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateReportReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateReportReqVO.java @@ -1,7 +1,7 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; -import com.chanko.yunxi.mes.module.biz.chanjet.dto.CreateReportDto; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.CreateReportDto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateStockOutOrderReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateStockOutOrderReqVO.java similarity index 88% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateStockOutOrderReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateStockOutOrderReqVO.java index 0724ef9b..f7debe7d 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateStockOutOrderReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/CreateStockOutOrderReqVO.java @@ -1,7 +1,7 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; -import com.chanko.yunxi.mes.module.biz.chanjet.dto.CreateStockOutOrderDto; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.CreateStockOutOrderDto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/DeleteReportReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/DeleteReportReqVO.java similarity index 92% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/DeleteReportReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/DeleteReportReqVO.java index 77548549..70567fb0 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/DeleteReportReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/DeleteReportReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryBomReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryBomReqVO.java similarity index 98% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryBomReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryBomReqVO.java index 2c11702b..71670962 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryBomReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryBomReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryDepartmentReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryDepartmentReqVO.java new file mode 100644 index 00000000..f9b5e498 --- /dev/null +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryDepartmentReqVO.java @@ -0,0 +1,17 @@ +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; + +import com.chanjet.openapi.sdk.java.AbstractChanjetContent; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.QueryDepartmentDTO; +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @author chenxi + * @date 2024-04-22 16:43 + */ +@Data +@AllArgsConstructor +public class QueryDepartmentReqVO extends AbstractChanjetContent { + + private QueryDepartmentDTO dto; +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryDepartmentResVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryDepartmentResVO.java new file mode 100644 index 00000000..a96db476 --- /dev/null +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryDepartmentResVO.java @@ -0,0 +1,24 @@ +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; + +import lombok.Data; + +/** + * @author chenxi + * @date 2024-04-22 16:49 + */ +@Data +public class QueryDepartmentResVO { + + private Long id; + private String code; + private String name; + private ParentVO parent; + + @Data + public static class ParentVO { + + private Long id; + private String code; + private String name; + } +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryMaterialReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java similarity index 94% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryMaterialReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java index 67b0b259..98bc589e 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryMaterialReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryPartnerReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryPartnerReqVO.java similarity index 95% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryPartnerReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryPartnerReqVO.java index d38b58e1..0f860263 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QueryPartnerReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryPartnerReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QuerySaleOrderListReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderListReqVO.java similarity index 86% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QuerySaleOrderListReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderListReqVO.java index 9ec7f991..56272595 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QuerySaleOrderListReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderListReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QuerySaleOrderReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderReqVO.java similarity index 90% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QuerySaleOrderReqVO.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderReqVO.java index 43fc4b0c..24c27d53 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/QuerySaleOrderReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderReqVO.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetContent; import lombok.AllArgsConstructor; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/SimpleChanjetRequest.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/SimpleChanjetRequest.java similarity index 58% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/SimpleChanjetRequest.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/SimpleChanjetRequest.java index 6af5f166..1b3288c1 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/SimpleChanjetRequest.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/SimpleChanjetRequest.java @@ -1,11 +1,10 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetRequest; import com.chanjet.openapi.sdk.java.ChanjetContent; -import com.chanjet.openapi.sdk.java.ChanjetResponse; import com.chanjet.openapi.sdk.java.enums.HttpMethod; -import com.chanko.yunxi.mes.module.biz.chanjet.ChanjetInterfaceEnum; -import com.chanko.yunxi.mes.module.biz.chanjet.ChanjetTokenHolder; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.ChanjetInterfaceEnum; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.ChanjetTokenHolder; import java.util.Map; @@ -16,28 +15,27 @@ import java.util.Map; */ public class SimpleChanjetRequest extends AbstractChanjetRequest { - private Class responseClass; + private Class responseClass; - public SimpleChanjetRequest(String uri, Class responseClass){ + public SimpleChanjetRequest(String uri, Class responseClass){ this(uri, responseClass, null, null); } - public SimpleChanjetRequest(String uri, Class responseClass, ChanjetContent chanjetContent){ + public SimpleChanjetRequest(String uri, Class responseClass, ChanjetContent chanjetContent){ this(uri, responseClass, chanjetContent, null); } - public SimpleChanjetRequest(String uri, Class responseClass, Map queryParams){ + public SimpleChanjetRequest(String uri, Class responseClass, Map queryParams){ this(uri, responseClass, null, queryParams); } - public SimpleChanjetRequest(String uri, Class responseClass, ChanjetContent chanjetContent, Map queryParams){ + public SimpleChanjetRequest(String uri, Class responseClass, ChanjetContent chanjetContent, Map queryParams){ this.setRequestUri(uri); this.setAppKey(ChanjetTokenHolder.APP_KEY); this.setAppSecret(ChanjetTokenHolder.APP_SECRET); this.setOpenToken(ChanjetTokenHolder.TOKEN); if(chanjetContent != null) this.setBizContent(chanjetContent); if(queryParams != null) this.addQueryParams(queryParams); - this.responseClass = responseClass; } public SimpleChanjetRequest(ChanjetInterfaceEnum chanjetInterfaceEnum, Map queryParams, ChanjetContent chanjetContent) { @@ -45,7 +43,7 @@ public class SimpleChanjetRequest extends AbstractChanjetRequest { } @Override - public Class getResponseClass() { + public Class getResponseClass() { return responseClass; } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/SimpleChanjetResponse.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/SimpleChanjetResponse.java similarity index 84% rename from mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/SimpleChanjetResponse.java rename to mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/SimpleChanjetResponse.java index a16013f9..02e521e3 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/SimpleChanjetResponse.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/SimpleChanjetResponse.java @@ -1,4 +1,4 @@ -package com.chanko.yunxi.mes.module.biz.chanjet.vo; +package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo; import com.chanjet.openapi.sdk.java.AbstractChanjetResponse; import lombok.Data; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java index 606619b1..4d8d1dc0 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java @@ -1,19 +1,22 @@ package com.chanko.yunxi.mes.module.biz.manager; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanjet.openapi.sdk.java.exception.ChanjetApiException; import com.chanko.yunxi.mes.framework.common.enums.CommonStatusEnum; -import com.chanko.yunxi.mes.module.biz.chanjet.ChanjetSpi; -import com.chanko.yunxi.mes.module.biz.chanjet.dto.CreateReportDto; -import com.chanko.yunxi.mes.module.biz.chanjet.dto.CreateStockOutOrderDto; -import com.chanko.yunxi.mes.module.biz.chanjet.dto.ManufactureReportDetails; -import com.chanko.yunxi.mes.module.biz.chanjet.vo.*; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.ChanjetSpi; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.CreateReportDto; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.CreateStockOutOrderDto; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.ManufactureReportDetails; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.QueryDepartmentDTO; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo.*; import com.chanko.yunxi.mes.module.biz.controller.admin.procedure.vo.ProcedureSaveReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.storage.vo.StorageSaveReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.taskreport.vo.TaskReportSaveReqVO; -import com.chanko.yunxi.mes.module.biz.controller.admin.workshop.vo.WorkshopSaveReqVO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.procedure.ProcedureDO; @@ -31,10 +34,10 @@ import com.chanko.yunxi.mes.module.biz.service.procedure.ProcedureService; import com.chanko.yunxi.mes.module.biz.service.storage.StorageService; import com.chanko.yunxi.mes.module.biz.service.taskreport.TaskReportService; import com.chanko.yunxi.mes.module.biz.service.workshop.WorkshopService; -import com.chanko.yunxi.mes.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO; import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserSaveReqVO; import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.chanko.yunxi.mes.module.system.dal.mysql.dept.DeptMapper; import com.chanko.yunxi.mes.module.system.service.dept.DeptService; import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; import org.springframework.stereotype.Component; @@ -42,11 +45,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import javax.annotation.Resource; -import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; -import static com.chanko.yunxi.mes.module.biz.chanjet.ChanjetInterfaceEnum.*; +import static com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.ChanjetInterfaceEnum.*; /** * 畅捷通 管理类 @@ -60,8 +62,6 @@ public class ChanjetManager { @Resource private ChanjetSpi chanjetSpi; @Resource - private DeptService deptService; - @Resource private WorkshopService workshopService; @Resource private CustomerMapper customerMapper; @@ -79,48 +79,66 @@ public class ChanjetManager { private TaskReportService taskReportService; @Resource private StorageService storageService; + @Resource + private DeptMapper deptMapper; /** - * 创建部门 - * @param deptSaveReqVO - * @return + * 查询部门 + * @throws ChanjetApiException */ @Transactional(rollbackFor = Exception.class) - public Long createDepartment(@Valid DeptSaveReqVO deptSaveReqVO) throws ChanjetApiException { - Long deptId = deptService.createDept(deptSaveReqVO); + public void queryDept() throws ChanjetApiException { + CommonResult> result = chanjetSpi.invokeRetList(QUERY_DEPARTMENT_OR_WORKSHOP, new QueryDepartmentReqVO(new QueryDepartmentDTO()), QueryDepartmentResVO.class); + if(!result.isSuccess()){ + throw new RuntimeException(result.getMsg()); + } - DeptDO deptDO = deptService.getDept(deptId); + if(CollUtil.isNotEmpty(result.getData())){ + // 过滤车间数据 + List deptDataList = result.getData().stream().filter(queryDepartmentResVO -> queryDepartmentResVO.getName().indexOf("车间") < 0).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(deptDataList)){ + + ArrayList insertList = new ArrayList<>(16); + ArrayList updateList = new ArrayList<>(16); + + Map> queryDeptGroupById = deptDataList.stream().collect(Collectors.groupingBy(QueryDepartmentResVO::getId)); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(DeptDO::getId, queryDeptGroupById.keySet()); + List existsDOList = deptMapper.selectList(query); + Map> existsDOGroupById = existsDOList.stream().collect(Collectors.groupingBy(DeptDO::getId)); + + // 处理 + queryDeptGroupById.forEach((id, voList) -> { + QueryDepartmentResVO queryDept = voList.get(0); + QueryDepartmentResVO.ParentVO parent = queryDept.getParent(); + long parentId = parent != null && parent.getId() != null ? parent.getId() : 0; + + List existsDOs = existsDOGroupById.get(id); + if(CollUtil.isNotEmpty(existsDOs)){ + DeptDO existsDO = existsDOs.get(0); + existsDO.setCode(queryDept.getCode()).setName(existsDO.getName()).setParentId(parentId); + updateList.add(existsDO); + }else{ + DeptDO deptDO = BeanUtils.toBean(queryDept, DeptDO.class); + deptDO.setParentId(parentId); + insertList.add(deptDO); + } + }); - CreateDepartmentReqVO.DepartmentVO departmentVO = new CreateDepartmentReqVO.DepartmentVO(String.valueOf(deptDO.getId()), deptDO.getName(), new HashMap(1) {{ - put("Code", String.valueOf(deptDO.getParentId())); - }}); - SimpleChanjetResponse response = (SimpleChanjetResponse) chanjetSpi.execute(CREATE_DEPARTMENT, new CreateDepartmentReqVO(departmentVO)); - if(!response.isSuccess()){ - throw new RuntimeException(response.getMessage()); + // 入库 + if(CollUtil.isNotEmpty(updateList)) deptMapper.updateBatch(updateList); + if(CollUtil.isNotEmpty(insertList)) deptMapper.insertBatch(insertList); + } } - return deptId; } /** - * 创建车间 - * @param createReqVO - * @return + * 查询车间 * @throws ChanjetApiException */ @Transactional(rollbackFor = Exception.class) - public Long createWorkshop(WorkshopSaveReqVO createReqVO) throws ChanjetApiException { - Long workshopId = workshopService.createWorkshop(createReqVO); - - WorkshopDO workshop = workshopService.getWorkshop(workshopId); + public void queryWorkshop() throws ChanjetApiException { - CreateDepartmentReqVO.DepartmentVO departmentVO = new CreateDepartmentReqVO.DepartmentVO(String.valueOf(workshop.getCode()), workshop.getName(), new HashMap(1) {{ - put("Code", String.valueOf(workshop.getDeptId())); - }}); - SimpleChanjetResponse response = (SimpleChanjetResponse) chanjetSpi.execute(CREATE_DEPARTMENT, new CreateDepartmentReqVO(departmentVO)); - if(!response.isSuccess()){ - throw new RuntimeException(response.getMessage()); - } - return workshopId; } /** @@ -528,4 +546,5 @@ public class ChanjetManager { return id; } + } diff --git a/mes-module-system/mes-module-system-api/src/main/java/com/chanko/yunxi/mes/module/system/api/dept/dto/DeptRespDTO.java b/mes-module-system/mes-module-system-api/src/main/java/com/chanko/yunxi/mes/module/system/api/dept/dto/DeptRespDTO.java index edeef017..c94d4e82 100644 --- a/mes-module-system/mes-module-system-api/src/main/java/com/chanko/yunxi/mes/module/system/api/dept/dto/DeptRespDTO.java +++ b/mes-module-system/mes-module-system-api/src/main/java/com/chanko/yunxi/mes/module/system/api/dept/dto/DeptRespDTO.java @@ -19,6 +19,10 @@ public class DeptRespDTO { * 部门名称 */ private String name; + /** + * 部门编码 + */ + private String code; /** * 父部门编号 */ diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java index ea9470d1..a7921f05 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java @@ -10,6 +10,9 @@ public class DeptListReqVO { @Schema(description = "部门名称，模糊匹配", example = "芋道") private String name; + @Schema(description = "部门编码，模糊匹配", example = "芋道") + private String code; + @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") private Integer status; diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java index 4afe1608..336c7952 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java @@ -15,6 +15,9 @@ public class DeptRespVO { @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") private String name; + @Schema(description = "部门编码", example = "芋道") + private String code; + @Schema(description = "父部门 ID", example = "1024") private Long parentId; diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java index 90ed662b..9b4b77a8 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java @@ -22,6 +22,10 @@ public class DeptSaveReqVO { @Size(max = 30, message = "部门名称长度不能超过 30 个字符") private String name; + @Schema(description = "部门编码") + @Size(max = 16, message = "部门名称长度不能超过 16 个字符") + private String code; + @Schema(description = "父部门 ID", example = "1024") private Long parentId; diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index 489a879d..88c9a72b 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -17,6 +17,9 @@ public class DeptSimpleRespVO { @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") private String name; + @Schema(description = "部门编码") + private String code; + @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/dataobject/dept/DeptDO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/dataobject/dept/DeptDO.java index 00ac7825..3d9a005a 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/dataobject/dept/DeptDO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/dataobject/dept/DeptDO.java @@ -30,6 +30,10 @@ public class DeptDO extends TenantBaseDO { * 部门名称 */ private String name; + /** + * 部门编码 + */ + private String code; /** * 父部门ID * diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/dept/DeptMapper.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/dept/DeptMapper.java index c0c1785f..d46dac24 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/dept/DeptMapper.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/dept/DeptMapper.java @@ -15,6 +15,7 @@ public interface DeptMapper extends BaseMapperX { default List selectList(DeptListReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .likeIfPresent(DeptDO::getName, reqVO.getName()) + .likeIfPresent(DeptDO::getCode, reqVO.getCode()) .eqIfPresent(DeptDO::getStatus, reqVO.getStatus())); } diff --git a/mes-server/src/main/resources/application-local.yaml b/mes-server/src/main/resources/application-local.yaml index 248a7906..b19eeaca 100644 --- a/mes-server/src/main/resources/application-local.yaml +++ b/mes-server/src/main/resources/application-local.yaml @@ -224,4 +224,4 @@ chanjet: appKey: fZtARspH #需要填写在开放平台申请的appKey appSecret: B071433DABBE48DB2241AE12280C8CBC #需要填写在开放平台申请的appSecret secret: 1234567890123456 #秘钥，用于解密，需要去开放平台自主填写，然后配置在此处 - redirectUri: http://192.168.0.158:9021/admin-api/mes/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处 + redirectUri: http://192.168.0.72:9021/admin-api/mes/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处 diff --git a/mes-server/src/main/resources/application.yaml b/mes-server/src/main/resources/application.yaml index 0052818e..c88c8a81 100644 --- a/mes-server/src/main/resources/application.yaml +++ b/mes-server/src/main/resources/application.yaml @@ -190,7 +190,7 @@ mes: - /jmreport/* # 积木报表，无法携带租户编号 - /ureport/* # UReport 报表，无法携带租户编号 - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，无法携带租户编号 - - /admin-api/mes/chanjet/** # 畅捷通开放平台 无需租户 + - /admin-api/biz/chanjet/receiveCode # 畅捷通开放平台 无需租户 ignore-tables: - system_tenant - system_tenant_package diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 29df68f8..df3a9e83 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -3,3 +3,5 @@ ALTER TABLE base_procedure ADD COLUMN standard_labour_price DECIMAL ( 20, 2 ) CO ALTER TABLE base_procedure ADD COLUMN piecework_basis CHAR ( 2 ) COMMENT '计件依据 01：合格数量02：报工数量' AFTER `procedure_type`; ALTER TABLE project_sale_order ADD COLUMN `external_code` VARCHAR ( 64 ) COMMENT '销售订单号 来源用友 唯一' AFTER `code`; + +ALTER TABLE system_dept ADD COLUMN `code` VARCHAR ( 16 ) COMMENT '部门编码' AFTER `name`;