bug修复20260106

src/main/resources/application.yml

@@ -188,7 +188,7 @@ mqtt:
 
   # MQTT 客户端 ID（在 EMQX 中唯一）
   # 建议：系统名 + 模块名，避免重复
-  clientId: zg-wms-backend
+  clientId: zg-wms-backend-test
 
   # MQTT 账号（EMQX Dashboard 中配置）
   username: demo02

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

@@ -59,11 +59,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">
                 and status = #{status}
             </if>
-            and (status is null or trim(status) != '1')
-
+            <!-- and (status is null or trim(status) != '1') -->
             <if test="isDelete != null and isDelete != ''">
                 and is_delete = #{isDelete}
             </if>
+            <!-- 按创建时间筛选：create_time 在 [beginTime, endTime] -->
+            <if test="beginTime != null">
+                and create_time <![CDATA[>=]]> #{beginTime}
+            </if>
+            <if test="endTime != null">
+                and create_time <![CDATA[<]]> #{endTime}
+            </if>
         </where>
     </select>
     
@@ -75,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getBySapNo" parameterType="java.lang.String" resultMap="GysJhResult">
         <include refid="selectGysJhVo"/>
         WHERE sap_no = #{sapNo}
-        AND status != '1'
     </select>
 
     <!-- 【已注释】唯一性校验查询：基于SAP订单号、项目号、物料号判断是否已存在 -->

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

@@ -181,7 +181,7 @@
             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,
+            ly_time, bill_no_ck, has_moved, borrow_time,
             gys_jh_id,
             status,
             create_by, create_time, update_by, update_time, is_delete
@@ -192,7 +192,7 @@
                      #{sapNo}, #{xh}, #{jhQty}, #{htQty}, #{dw}, #{realQty},
                      #{pcode}, #{trayCode}, #{entityId},
                      #{ckLihuoY}, #{ckType}, #{teamCode}, #{ckRemark},
-                     #{lyTime}, #{billNoCk}, #{hasMoved},
+                     #{lyTime}, #{billNoCk}, #{hasMoved}, #{borrowTime},
                      #{gysJhId},
                      #{status},
                      #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{isDelete}
@@ -870,6 +870,42 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updateByBillNoCk" parameterType="com.zg.project.wisdom.domain.RkInfo">
+        UPDATE rk_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rkType != null">rk_type = #{rkType},</if>
+            <if test="wlType != null">wl_type = #{wlType},</if>
+            <if test="cangku != null and cangku != ''">
+                cangku = #{cangku},
+            </if>
+            <if test="rkTime != null">rk_time = #{rkTime},</if>
+            <if test="lihuoY != null">lihuo_y = #{lihuoY},</if>
+            <if test="isChuku != null">is_chuku = #{isChuku},</if>
+            <if test="isBorrowed != null">is_borrowed = #{isBorrowed},</if>
+
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="xmNoCk != null">xm_no_ck = #{xmNoCk},</if>
+            <if test="xmMsCk != null">xm_ms_ck = #{xmMsCk},</if>
+
+            <if test="ckLihuoY != null">ck_lihuo_y = #{ckLihuoY},</if>
+            <if test="ckType != null">ck_type = #{ckType},</if>
+            <if test="teamCode != null">team_code = #{teamCode},</if>
+            <if test="ckRemark != null">ck_remark = #{ckRemark},</if>
+
+            <if test="lyTime != null">ly_time = #{lyTime},</if>
+            <if test="borrowTime != null">borrow_time = #{borrowTime},</if>
+            <if test="returnTime != null">return_time = #{returnTime},</if>
+
+            <if test="isDelivery != null">is_delivery = #{isDelivery},</if>
+            <if test="hasMoved != null">has_moved = #{hasMoved},</if>
+
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        WHERE bill_no_ck = #{billNoCk}
+        AND is_delete = '0'
+    </update>
+
     <update id="deleteRkInfoById" parameterType="Long">
         update rk_info
         <set>
@@ -905,6 +941,8 @@
             <if test="lyTime != null">ly_time = #{lyTime},</if>
             <if test="borrowTime != null">borrow_time = #{borrowTime},</if>
             <if test="returnTime != null">return_time = #{returnTime},</if>
+            <if test="pcode != null and pcode != ''">pcode = #{pcode},</if>
+            <if test="cangku != null and cangku != ''">cangku = #{cangku},</if>
             <if test="status != null">status = #{status},</if>
             <if test="realQty != null">real_qty = #{realQty},</if>
         </set>
@@ -988,10 +1026,20 @@
         <where>
             (ri.is_delete = '0' OR ri.is_delete = 0 OR ri.is_delete IS NULL)
 
-            <if test="isChuku != null and isChuku != ''">
+            <if test="isChukuList != null and isChukuList.size() > 0">
+                AND ri.is_chuku IN
+                <foreach collection="isChukuList"
+                         item="item"
+                         open="("
+                         separator=","
+                         close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="(isChukuList == null or isChukuList.size() == 0)
+          and isChuku != null">
                 AND ri.is_chuku = #{isChuku}
             </if>
-
             <if test="warehouseCode != null and warehouseCode != ''">
                 AND ri.cangku = #{warehouseCode}
             </if>
@@ -1214,7 +1262,6 @@
             </if>
         </where>
     </select>
-
     <select id="selectDeliveryCkList"
             parameterType="com.zg.project.wisdom.domain.RkInfo"
             resultMap="RkInfoResult">