0805代码更新

src/main/resources/application-druid.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.20:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://192.168.1.20:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                url: jdbc:mysql://localhost:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: shzg

src/main/resources/application.yml

@@ -68,8 +68,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.20
-#    host: 192.168.1.251
+#    host: 192.168.1.20
+    host: 192.168.1.251
 #    host: localhost
     # 端口，默认为6379
     port: 6379
@@ -146,7 +146,7 @@ gen:
 
 agv:
   job:
-    create-url: http://192.168.1.245:9012/agv/task/create
+    create-url: http://192.168.1.155:1880/api/job/create
 
 wcs:
   job:

src/main/resources/mybatis/wisdom/AgvTaskResultMapper.xml

@@ -11,6 +11,12 @@
         <result property="taskNo" column="task_no"/>
         <result property="status" column="status"/>
         <result property="msg" column="msg"/>
+        <result property="jobId" column="job_id"/>
+        <result property="owner" column="owner"/>
+        <result property="type" column="type"/>
+        <result property="priority" column="priority"/>
+        <result property="sourceName" column="source_name"/>
+        <result property="targetName" column="target_name"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -18,8 +24,24 @@
         <result property="isDelete" column="is_delete"/>
     </resultMap>
 
+
     <sql id="selectAgvTaskResultVo">
-        id, request_id, task_no, status, msg, create_by, create_time, update_by, update_time, is_delete
+        id,
+    request_id,
+    task_no,
+    status,
+    msg,
+    job_id,
+    owner,
+    type,
+    priority,
+    source_name,
+    target_name,
+    create_by,
+    create_time,
+    update_by,
+    update_time,
+    is_delete
     </sql>
 
     <select id="selectAgvTaskResultById" resultMap="AgvTaskResultResultMap">
@@ -57,8 +79,16 @@
             <if test="taskNo != null">task_no,</if>
             <if test="status != null">status,</if>
             <if test="msg != null">msg,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="owner != null">owner,</if>
+            <if test="type != null">type,</if>
+            <if test="priority != null">priority,</if>
+            <if test="sourceName != null">source_name,</if>
+            <if test="targetName != null">target_name,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
             create_time,
+            update_time,
             is_delete
         </trim>
         VALUES
@@ -67,7 +97,15 @@
             <if test="taskNo != null">#{taskNo},</if>
             <if test="status != null">#{status},</if>
             <if test="msg != null">#{msg},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="owner != null">#{owner},</if>
+            <if test="type != null">#{type},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="sourceName != null">#{sourceName},</if>
+            <if test="targetName != null">#{targetName},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            NOW(),
             NOW(),
             '0'
         </trim>

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -67,16 +67,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ri.rk_type, st.type_name AS rk_type_name,
             ri.wl_type, mt.type_name AS wl_type_name,
             ri.cangku, wh.warehouse_name AS cangku_name,
-            ri.rk_time, ri.lihuo_y, ri.is_chuku, ri.is_borrowed,ri.remark,
+            ri.rk_time, ri.lihuo_y, ri.is_chuku, ri.is_borrowed, ri.remark,
             ri.ck_lihuo_y, ri.ck_type, sot.type_name AS ck_type_name,
             ri.team_code, ct.team_name,
             ri.ck_remark,
             ri.ly_time,
             ri.borrow_time, ri.return_time,
-            ri.xj, ri.xm_no, ri.xm_ms, ri.wl_no, ri.wl_ms,ri.xm_no_ck, ri.xm_ms_ck,
-            ri.gys_no, ri.gys_mc, ri.jh_amt, ri.ht_dj, ri.sap_no, ri.xh,ri.gys_jh_id,
+            ri.xj, ri.xm_no, ri.xm_ms, ri.wl_no, ri.wl_ms, ri.xm_no_ck, ri.xm_ms_ck,
+            ri.gys_no, ri.gys_mc, ri.jh_amt, ri.ht_dj, ri.sap_no, ri.xh, ri.gys_jh_id,
             ri.jh_qty, ri.ht_qty, ri.dw, ri.real_qty,
             ri.pcode, ri.pcode_id, ri.tray_code, ri.entity_id,
+            ri.status, ri.has_moved,
             ri.create_by, ri.create_time, ri.update_by, ri.update_time, ri.is_delete,
             u.user_name AS lihuo_y_name
         FROM rk_info ri
@@ -123,21 +124,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertRkInfo" parameterType="RkInfo" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO rk_info (
             rk_type, wl_type, cangku, rk_time, lihuo_y,
-            is_chuku, remark, bill_no, xj, xm_no, xm_ms,is_borrowed,
+            is_chuku, remark, bill_no, xj, xm_no, xm_ms, is_borrowed,
             wl_no, wl_ms, gys_no, gys_mc, jh_amt, ht_dj,
             sap_no, xh, jh_qty, ht_qty, dw, real_qty,
             pcode, tray_code, entity_id,
             ck_lihuo_y, ck_type, team_code, ck_remark,
             ly_time, bill_no_ck, has_moved,
+            gys_jh_id,
             create_by, create_time, update_by, update_time, is_delete
         ) VALUES (
                      #{rkType}, #{wlType}, #{cangku}, #{rkTime}, #{lihuoY},
-                     #{isChuku}, #{remark}, #{billNo}, #{xj}, #{xmNo}, #{xmMs},#{isBorrowed},
+                     #{isChuku}, #{remark}, #{billNo}, #{xj}, #{xmNo}, #{xmMs}, #{isBorrowed},
                      #{wlNo}, #{wlMs}, #{gysNo}, #{gysMc}, #{jhAmt}, #{htDj},
                      #{sapNo}, #{xh}, #{jhQty}, #{htQty}, #{dw}, #{realQty},
                      #{pcode}, #{trayCode}, #{entityId},
                      #{ckLihuoY}, #{ckType}, #{teamCode}, #{ckRemark},
                      #{lyTime}, #{billNoCk}, #{hasMoved},
+                     #{gysJhId},
                      #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{isDelete}
                  )
     </insert>

src/main/resources/mybatis/wisdom/WcsTaskResultMapper.xml

@@ -62,8 +62,8 @@
 
     <select id="countByTaskId" resultType="java.lang.Integer" parameterType="java.lang.String">
         SELECT COUNT(*)
-        FROM wcs_status
-        WHERE TaskID = #{taskId}
+        FROM wcs_task_result
+        WHERE task_id = #{taskId}
           AND TaskStatus = '1'
     </select>