lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库自动确认

Browse Source
This commit is contained in:
刘汗青
2026-05-14 11:48:18 +08:00
parent dd103765f1
commit 367740c5ab
5 changed files with 9 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -144,20 +144,20 @@ public class ToWcsServiceImpl implements IToWcsService {
public AjaxResult cancelTaskByTaskNo(MydoJob job) {
Map<String, String> 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:

6
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
View File

@@ -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;

117
ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml
View File

@@ -1,117 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.ai.message.mapper.ChatMessageMapper">
<resultMap type="ChatMessage" id="ChatMessageResult">
<result property="id" column="id" />
<result property="sessionId" column="session_id" />
<result property="conversationId" column="conversation_id" />
<result property="content" column="content" />
<result property="role" column="role" />
<result property="deductCost" column="deduct_cost" />
<result property="totalTokens" column="total_tokens" />
<result property="modelName" column="model_name" />
<result property="createDept" column="create_dept" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectChatMessageVo">
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
</sql>
<select id="selectChatMessageList" parameterType="ChatMessage" resultMap="ChatMessageResult">
<include refid="selectChatMessageVo"/>
<where>
<if test="sessionId != null "> and session_id = #{sessionId}</if>
<if test="conversationId != null "> and conversation_id = #{conversationId}</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="role != null and role != ''"> and role = #{role}</if>
<if test="deductCost != null "> and deduct_cost = #{deductCost}</if>
<if test="totalTokens != null "> and total_tokens = #{totalTokens}</if>
<if test="modelName != null and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
<if test="createDept != null "> and create_dept = #{createDept}</if>
</where>
order by create_time asc
</select>
<select id="selectChatMessageById" parameterType="Long" resultMap="ChatMessageResult">
<include refid="selectChatMessageVo"/>
where id = #{id}
</select>
<insert id="insertChatMessage" parameterType="ChatMessage">
insert into chat_message
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="sessionId != null">session_id,</if>
<if test="conversationId != null">conversation_id,</if>
<if test="content != null">content,</if>
<if test="role != null">role,</if>
<if test="deductCost != null">deduct_cost,</if>
<if test="totalTokens != null">total_tokens,</if>
<if test="modelName != null">model_name,</if>
<if test="createDept != null">create_dept,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="sessionId != null">#{sessionId},</if>
<if test="conversationId != null">#{conversationId},</if>
<if test="content != null">#{content},</if>
<if test="role != null">#{role},</if>
<if test="deductCost != null">#{deductCost},</if>
<if test="totalTokens != null">#{totalTokens},</if>
<if test="modelName != null">#{modelName},</if>
<if test="createDept != null">#{createDept},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateChatMessage" parameterType="ChatMessage">
update chat_message
<trim prefix="SET" suffixOverrides=",">
<if test="sessionId != null">session_id = #{sessionId},</if>
<if test="conversationId != null">conversation_id = #{conversationId},</if>
<if test="content != null">content = #{content},</if>
<if test="role != null">role = #{role},</if>
<if test="deductCost != null">deduct_cost = #{deductCost},</if>
<if test="totalTokens != null">total_tokens = #{totalTokens},</if>
<if test="modelName != null">model_name = #{modelName},</if>
<if test="createDept != null">create_dept = #{createDept},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteChatMessageById" parameterType="Long">
delete from chat_message where id = #{id}
</delete>
<delete id="deleteChatMessageByIds" parameterType="String">
delete from chat_message where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteChatMessageByConversationId">
delete from chat_message where conversation_id = #{conversationId}
</delete>
</mapper>

107
ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml
View File

@@ -1,107 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.ai.conversation.mapper.ConversationsMapper">
<resultMap type="Conversations" id="ConversationsResult">
<result property="id" column="id" />
<result property="sessionId" column="session_id" />
<result property="userId" column="user_id" />
<result property="title" column="title" />
<result property="status" column="status" />
<result property="metadata" column="metadata" />
<result property="firstQuery" column="first_query" />
<result property="messageCount" column="message_count" />
<result property="tokenUsage" column="token_usage" />
<result property="createdAt" column="created_at" />
<result property="updatedAt" column="updated_at" />
<result property="lastInteractionAt" column="last_interaction_at" />
</resultMap>
<sql id="selectConversationsVo">
select id, session_id, user_id, title, status, metadata, first_query, message_count, token_usage, created_at, updated_at, last_interaction_at from conversations
</sql>
<select id="selectConversationsList" parameterType="Conversations" resultMap="ConversationsResult">
<include refid="selectConversationsVo"/>
<where>
<if test="sessionId != null and sessionId != ''"> and session_id = #{sessionId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="title != null and title != ''"> and title = #{title}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="metadata != null and metadata != ''"> and metadata = #{metadata}</if>
<if test="firstQuery != null and firstQuery != ''"> and first_query = #{firstQuery}</if>
<if test="messageCount != null "> and message_count = #{messageCount}</if>
<if test="tokenUsage != null "> and token_usage = #{tokenUsage}</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="lastInteractionAt != null "> and last_interaction_at = #{lastInteractionAt}</if>
order by id desc
</where>
</select>
<select id="selectConversationsById" parameterType="Long" resultMap="ConversationsResult">
<include refid="selectConversationsVo"/>
where id = #{id}
</select>
<insert id="insertConversations" parameterType="Conversations" useGeneratedKeys="true" keyProperty="id">
insert into conversations
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sessionId != null and sessionId != ''">session_id,</if>
<if test="userId != null and userId != ''">user_id,</if>
<if test="title != null">title,</if>
<if test="status != null">status,</if>
<if test="metadata != null">metadata,</if>
<if test="firstQuery != null">first_query,</if>
<if test="messageCount != null">message_count,</if>
<if test="tokenUsage != null">token_usage,</if>
<if test="createdAt != null">created_at,</if>
<if test="updatedAt != null">updated_at,</if>
<if test="lastInteractionAt != null">last_interaction_at,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sessionId != null and sessionId != ''">#{sessionId},</if>
<if test="userId != null and userId != ''">#{userId},</if>
<if test="title != null">#{title},</if>
<if test="status != null">#{status},</if>
<if test="metadata != null">#{metadata},</if>
<if test="firstQuery != null">#{firstQuery},</if>
<if test="messageCount != null">#{messageCount},</if>
<if test="tokenUsage != null">#{tokenUsage},</if>
<if test="createdAt != null">#{createdAt},</if>
<if test="updatedAt != null">#{updatedAt},</if>
<if test="lastInteractionAt != null">#{lastInteractionAt},</if>
</trim>
</insert>
<update id="updateConversations" parameterType="Conversations">
update conversations
<trim prefix="SET" suffixOverrides=",">
<if test="sessionId != null and sessionId != ''">session_id = #{sessionId},</if>
<if test="userId != null and userId != ''">user_id = #{userId},</if>
<if test="title != null">title = #{title},</if>
<if test="status != null">status = #{status},</if>
<if test="metadata != null">metadata = #{metadata},</if>
<if test="firstQuery != null">first_query = #{firstQuery},</if>
<if test="messageCount != null">message_count = #{messageCount},</if>
<if test="tokenUsage != null">token_usage = #{tokenUsage},</if>
<if test="createdAt != null">created_at = #{createdAt},</if>
<if test="updatedAt != null">updated_at = #{updatedAt},</if>
<if test="lastInteractionAt != null">last_interaction_at = #{lastInteractionAt},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteConversationsById" parameterType="Long">
delete from conversations where id = #{id}
</delete>
<delete id="deleteConversationsByIds" parameterType="String">
delete from conversations where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

106
ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml
View File

@@ -1,106 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.ai.vector.mapper.KnowledgeFileMapper">
<resultMap type="KnowledgeFile" id="KnowledgeFileResult">
<result property="id" column="id" />
<result property="knowledgeBaseId" column="knowledge_base_id" />
<result property="fileName" column="file_name" />
<result property="filePath" column="file_path" />
<result property="fileSize" column="file_size" />
<result property="fileType" column="file_type" />
<result property="description" column="description" />
<result property="isVectorized" column="is_vectorized" />
<result property="vectorizedTime" column="vectorized_time" />
<result property="uploadTime" column="upload_time" />
<result property="updatedAt" column="updated_at" />
<result property="isDeleted" column="is_deleted" />
</resultMap>
<sql id="selectKnowledgeFileVo">
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
</sql>
<select id="selectKnowledgeFileList" parameterType="KnowledgeFile" resultMap="KnowledgeFileResult">
<include refid="selectKnowledgeFileVo"/>
<where>
<if test="knowledgeBaseId != null "> and knowledge_base_id = #{knowledgeBaseId}</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="filePath != null and filePath != ''"> and file_path = #{filePath}</if>
<if test="fileSize != null "> and file_size = #{fileSize}</if>
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="isVectorized != null "> and is_vectorized = #{isVectorized}</if>
<if test="vectorizedTime != null "> and vectorized_time = #{vectorizedTime}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
</where>
</select>
<select id="selectKnowledgeFileById" parameterType="Long" resultMap="KnowledgeFileResult">
<include refid="selectKnowledgeFileVo"/>
where id = #{id}
</select>
<insert id="insertKnowledgeFile" parameterType="KnowledgeFile" useGeneratedKeys="true" keyProperty="id">
insert into knowledge_file
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="knowledgeBaseId != null">knowledge_base_id,</if>
<if test="fileName != null and fileName != ''">file_name,</if>
<if test="filePath != null and filePath != ''">file_path,</if>
<if test="fileSize != null">file_size,</if>
<if test="fileType != null">file_type,</if>
<if test="description != null">description,</if>
<if test="isVectorized != null">is_vectorized,</if>
<if test="vectorizedTime != null">vectorized_time,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="updatedAt != null">updated_at,</if>
<if test="isDeleted != null">is_deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="knowledgeBaseId != null">#{knowledgeBaseId},</if>
<if test="fileName != null and fileName != ''">#{fileName},</if>
<if test="filePath != null and filePath != ''">#{filePath},</if>
<if test="fileSize != null">#{fileSize},</if>
<if test="fileType != null">#{fileType},</if>
<if test="description != null">#{description},</if>
<if test="isVectorized != null">#{isVectorized},</if>
<if test="vectorizedTime != null">#{vectorizedTime},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="updatedAt != null">#{updatedAt},</if>
<if test="isDeleted != null">#{isDeleted},</if>
</trim>
</insert>
<update id="updateKnowledgeFile" parameterType="KnowledgeFile">
update knowledge_file
<trim prefix="SET" suffixOverrides=",">
<if test="knowledgeBaseId != null">knowledge_base_id = #{knowledgeBaseId},</if>
<if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
<if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
<if test="fileSize != null">file_size = #{fileSize},</if>
<if test="fileType != null">file_type = #{fileType},</if>
<if test="description != null">description = #{description},</if>
<if test="isVectorized != null">is_vectorized = #{isVectorized},</if>
<if test="vectorizedTime != null">vectorized_time = #{vectorizedTime},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="updatedAt != null">updated_at = #{updatedAt},</if>
<if test="isDeleted != null">is_deleted = #{isDeleted},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteKnowledgeFileById" parameterType="Long">
delete from knowledge_file where id = #{id}
</delete>
<delete id="deleteKnowledgeFileByIds" parameterType="String">
delete from knowledge_file where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>