数据完善

2026-08-12 21:02:08 +08:00 · 2024-05-17 18:05:03 +08:00
parent e7fbf3b1c3
commit f936c39cad
26 changed files with 1018 additions and 541 deletions
@@ -1,5 +1,6 @@
 package com.cf.imes.module.system.api.process;

+import com.cf.imes.module.system.api.process.dto.ProcessListReqDTO;
 import com.cf.imes.module.system.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -20,4 +21,9 @@ public interface ProcessGroupApi {
    @Parameter(name = "groupId", description = "工序组编号", required = true, example = "1024")
    Boolean getProcessGroup(@RequestParam("groupId") Long groupId);

+    @GetMapping(PREFIX + "/getGroup")
+    @Operation(summary = "工序组是否存在")
+    @Parameter(name = "groupId", description = "工序组编号", required = true, example = "1024")
+    ProcessListReqDTO getProcessGroupDetail(@RequestParam("groupId") Long groupId);
+
 }
@@ -26,7 +26,7 @@ public interface DictTypeConstants {
    String SMS_SEND_STATUS = "system_sms_send_status"; // 短信发送状态
    String SMS_RECEIVE_STATUS = "system_sms_receive_status"; // 短信接收状态

-    String YPOGRAPHY_TYPE = "ypographyType"; // 排版面
+    String TYPOGRAPHY_TYPE = "typographyType"; // 排版面
    String GRAIN_TYPE = "grainType";//纹路类型
    String DOOR_OPENING_DIRECTIONS = "doorOpeningDirections";//开门方向
    String PRODUCT_TYPE = "productType";//产品类型
@@ -185,6 +185,7 @@ public interface ErrorCodeConstants {

    //=========== 工序组信息 1-002-029-000 ============
    ErrorCode PROCESS_GROUP_NOT_EXISTS = new ErrorCode(1_002_029_000, "工序组不存在");
+    ErrorCode PROCESS_GROUP_USED = new ErrorCode(1_002_029_001, "工序组已使用，禁止删除 ");

    // ========== 机台  1-002-029-000 ==========
    ErrorCode MACHINE_NOT_EXISTS = new ErrorCode(1_002_029_000, "机台不存在");
@@ -195,6 +195,12 @@
            <groupId>com.github.binarywang</groupId>
            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>  <!-- 微信登录（小程序） -->
        </dependency>
+        <dependency>
+            <groupId>com.cf.imes</groupId>
+            <artifactId>cf-module-prod-executor-api</artifactId>
+            <version>2.0.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>

    </dependencies>

@@ -1,6 +1,12 @@
 package com.cf.imes.module.system.api.process;

+import com.cf.imes.framework.common.util.object.BeanUtils;
+import com.cf.imes.module.system.api.process.dto.ProcessListReqDTO;
+import com.cf.imes.module.system.api.process.dto.ProcessRespDTO;
+import com.cf.imes.module.system.dal.dataobject.process.ProcessDO;
+import com.cf.imes.module.system.dal.dataobject.process.ProcessGroupDO;
 import com.cf.imes.module.system.dal.mysql.process.ProcessGroupMapper;
+import com.cf.imes.module.system.dal.mysql.process.ProcessMapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

@@ -16,10 +22,27 @@ public class ProcessGroupApiImpl implements ProcessGroupApi {
    @Resource
    private ProcessGroupMapper processGroupMapper;

+    @Resource
+    private ProcessMapper processMapper;
+
    @Override
    public Boolean getProcessGroup(Long groupId) {
        if (processGroupMapper.selectById(groupId) == null)
            return false;
        return true;
    }
+
+    @Override
+    public ProcessListReqDTO getProcessGroupDetail(Long groupId) {
+        ProcessGroupDO processGroupDO = processGroupMapper.selectById(groupId);
+        if (processGroupDO == null)
+            throw exception(PROCESS_GROUP_NOT_EXISTS);
+        String[] items = processGroupDO.getItems().split(",");
+        ProcessListReqDTO processListReqDTO = BeanUtils.toBean(processGroupDO, ProcessListReqDTO.class);
+        for (String item : items) {
+            ProcessDO processDO = processMapper.selectById(Long.parseLong(item));
+            processListReqDTO.getLists().add(BeanUtils.toBean(processDO, ProcessRespDTO.class));
+        }
+        return processListReqDTO;
+    }
 }
@@ -1,11 +1,12 @@
 package com.cf.imes.module.system.framework.rpc.config;

+import com.cf.imes.module.executor.api.orderProcess.OrderProcessApi;
 import com.cf.imes.module.infra.api.file.FileApi;
 import com.cf.imes.module.infra.api.websocket.WebSocketSenderApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;

@Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class})
+@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, OrderProcessApi.class})
 public class RpcConfiguration {
 }
@@ -2,6 +2,7 @@ package com.cf.imes.module.system.service.process;

 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
+import com.cf.imes.module.executor.api.orderProcess.OrderProcessApi;
 import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO;
 import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupPageReqVO;
 import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupRespVO;
@@ -48,6 +49,9 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
    @Resource
    private ProcessMapper processMapper;

+    @Resource
+    private OrderProcessApi orderProcessApi;
+
    @Override
    public Long createProcessGroup(ProcessGroupSaveReqVO createReqVO) {
        // 插入
@@ -78,10 +82,18 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
    public void deleteProcessGroup(Long id) {
        // 校验存在
        validateProcessGroupExists(id);
+        // 判断是否在生产中使用这个加工组，如果使用则不能删除
+//        checkProcessGroupUsed(id);
        // 删除
        processGroupMapper.deleteById(id);
    }

+    // 判断是否在生产中使用这个加工组
+    private void checkProcessGroupUsed(Long id) {
+        if (orderProcessApi.getOrderProcessByProcessGroupId(id) != null){
+            throw exception(PROCESS_GROUP_USED);
+        }
+    }
    private void validateProcessGroupExists(Long id) {
        if (processGroupMapper.selectById(id) == null) {
            throw exception(PROCESS_GROUP_NOT_EXISTS);
@@ -56,6 +56,7 @@ public class GroupServiceImplTest extends BaseDbUnitTest {
        assertPojoEquals(createReqVO, group, "id");
    }

+
 /*    @Test
    public void testUpdateGroup_success() {
        // mock 数据
@@ -145,6 +146,6 @@ public class GroupServiceImplTest extends BaseDbUnitTest {
       assertEquals(1, pageResult.getTotal());
       assertEquals(1, pageResult.getList().size());
       assertPojoEquals(dbGroup, pageResult.getList().get(0));
-    }
+    }*/

 }