From 367740c5ab301d35f169238af218874c680f1cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B1=97=E9=9D=92?= Date: Thu, 14 May 2026 11:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E8=87=AA=E5=8A=A8=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ToWcsServiceImpl.java | 18 +-- .../in/stockin/domain/vo/InstockInVo.java | 6 - .../resources/mapper/ai/ChatMessageMapper.xml | 117 ------------------ .../mapper/ai/ConversationsMapper.xml | 107 ---------------- .../mapper/api/KnowledgeFileMapper.xml | 106 ---------------- 5 files changed, 9 insertions(+), 345 deletions(-) delete mode 100644 ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 6b7cddf..9fa558d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -144,20 +144,20 @@ public class ToWcsServiceImpl implements IToWcsService { public AjaxResult cancelTaskByTaskNo(MydoJob job) { Map map = new HashMap<>(); map.put("taskNo", job.getTaskNo()); - if (job.getWarehouseId().equals("01")){ + if (job.getWarehouseId().equals("01")) { RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB_1, JSONUtil.toJsonStr(map), "取消任务"); if ("1".equals(requestLog.getIsSuccessful())) { return AjaxResult.success(); } return AjaxResult.error(requestLog.getErrorDetails()); - }else if (job.getWarehouseId().equals("02")){ + } else if (job.getWarehouseId().equals("02")) { RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB_2, JSONUtil.toJsonStr(map), "取消任务"); if ("1".equals(requestLog.getIsSuccessful())) { return AjaxResult.success(); } return AjaxResult.error(requestLog.getErrorDetails()); - }else { + } else { return AjaxResult.error(); } } @@ -241,7 +241,7 @@ public class ToWcsServiceImpl implements IToWcsService { } } if (ObjUtil.isNull(basCargoSpace)) { - if ("1519".equals(basCargoSpaceParam.getCargoHight())){ + if ("1519".equals(basCargoSpaceParam.getCargoHight())) { basCargoSpaceParam.setThePlatoon(null); basCargoSpaceParam.setRule1(null); basCargoSpaceParam.setRule2(null); @@ -251,7 +251,7 @@ public class ToWcsServiceImpl implements IToWcsService { if (ObjUtil.isNull(basCargoSpace)) { return AjaxResult.error("没有空货位"); } - }else { + } else { //去除排的条件 再次查询货位 basCargoSpaceParam.setThePlatoon(null); basCargoSpaceParam.setRule1(null); @@ -325,10 +325,10 @@ public class ToWcsServiceImpl implements IToWcsService { MydoJob outJob = outMydoJobs.get(0); outJob.setExecutionPhase("2"); mydoJobService.updateMydoJob(outJob); - if ("24".equals(outJob.getInOrOut()) || "25".equals(outJob.getInOrOut())) { - String[] jobIds = new String[]{outJob.getJobId()}; - mydoJobService.OuthandFinish(jobIds); - } +// if ("20".equals(outJob.getJobId()) || "21".equals(outJob.getJobId()) || "24".equals(outJob.getInOrOut()) || "25".equals(outJob.getInOrOut())) { + String[] jobIds = new String[]{outJob.getJobId()}; + mydoJobService.OuthandFinish(jobIds); +// } break; default: diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java index 41efccd..2ff5918 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; -import javax.validation.constraints.NotNull; import java.util.List; @Data @@ -15,19 +14,14 @@ import java.util.List; @AllArgsConstructor public class InstockInVo { - @NotNull private String warehouseId; - @NotNull private String supplierId; - @NotNull private String inType; - @NotNull private String erpBill; - @NotNull private String productType; private String remark; diff --git a/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml b/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml deleted file mode 100644 index 99c335a..0000000 --- a/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select id, session_id, conversation_id, content, role, deduct_cost, total_tokens, model_name, create_dept, create_by, create_time, update_by, update_time, remark from chat_message - - - - - - - - insert into chat_message - - id, - session_id, - conversation_id, - content, - role, - deduct_cost, - total_tokens, - model_name, - create_dept, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{id}, - #{sessionId}, - #{conversationId}, - #{content}, - #{role}, - #{deductCost}, - #{totalTokens}, - #{modelName}, - #{createDept}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update chat_message - - session_id = #{sessionId}, - conversation_id = #{conversationId}, - content = #{content}, - role = #{role}, - deduct_cost = #{deductCost}, - total_tokens = #{totalTokens}, - model_name = #{modelName}, - create_dept = #{createDept}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from chat_message where id = #{id} - - - - delete from chat_message where id in - - #{id} - - - - delete from chat_message where conversation_id = #{conversationId} - - diff --git a/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml deleted file mode 100644 index 62ac9b6..0000000 --- a/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select id, session_id, user_id, title, status, metadata, first_query, message_count, token_usage, created_at, updated_at, last_interaction_at from conversations - - - - - - - - insert into conversations - - session_id, - user_id, - title, - status, - metadata, - first_query, - message_count, - token_usage, - created_at, - updated_at, - last_interaction_at, - - - #{sessionId}, - #{userId}, - #{title}, - #{status}, - #{metadata}, - #{firstQuery}, - #{messageCount}, - #{tokenUsage}, - #{createdAt}, - #{updatedAt}, - #{lastInteractionAt}, - - - - - update conversations - - session_id = #{sessionId}, - user_id = #{userId}, - title = #{title}, - status = #{status}, - metadata = #{metadata}, - first_query = #{firstQuery}, - message_count = #{messageCount}, - token_usage = #{tokenUsage}, - created_at = #{createdAt}, - updated_at = #{updatedAt}, - last_interaction_at = #{lastInteractionAt}, - - where id = #{id} - - - - delete from conversations where id = #{id} - - - - delete from conversations where id in - - #{id} - - - diff --git a/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml b/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml deleted file mode 100644 index 75155ec..0000000 --- a/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select id, knowledge_base_id, file_name, file_path, file_size, file_type, description, is_vectorized, vectorized_time, upload_time, updated_at, is_deleted from knowledge_file - - - - - - - - insert into knowledge_file - - knowledge_base_id, - file_name, - file_path, - file_size, - file_type, - description, - is_vectorized, - vectorized_time, - upload_time, - updated_at, - is_deleted, - - - #{knowledgeBaseId}, - #{fileName}, - #{filePath}, - #{fileSize}, - #{fileType}, - #{description}, - #{isVectorized}, - #{vectorizedTime}, - #{uploadTime}, - #{updatedAt}, - #{isDeleted}, - - - - - update knowledge_file - - knowledge_base_id = #{knowledgeBaseId}, - file_name = #{fileName}, - file_path = #{filePath}, - file_size = #{fileSize}, - file_type = #{fileType}, - description = #{description}, - is_vectorized = #{isVectorized}, - vectorized_time = #{vectorizedTime}, - upload_time = #{uploadTime}, - updated_at = #{updatedAt}, - is_deleted = #{isDeleted}, - - where id = #{id} - - - - delete from knowledge_file where id = #{id} - - - - delete from knowledge_file where id in - - #{id} - - - \ No newline at end of file