同步数据机具轨迹新增仓库ID

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineTrack.java

@@ -121,6 +121,24 @@ public class KxsMachineTrack extends Model<KxsMachineTrack> implements Serializa
     @Schema(description = "合伙人ID'")
     private Integer partnerId;
 
+    /**
+     * 操作前仓库
+     */
+    @Schema(description = "操作前仓库'")
+    private Integer beforeWhsId;
+
+    /**
+     * 操作后仓库
+     */
+    @Schema(description = "操作后仓库'")
+    private Integer afterWhsId;
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注'")
+    private String remark;
+
 
 
 

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineTrackMapper.xml

@@ -16,6 +16,9 @@
         <result column="change_type" property="changeType" />
         <result column="partner_id" property="partnerId" />
         <result column="pos_sn" property="posSn" />
+        <result column="before_whs_id" property="beforeWhsId" />
+        <result column="after_whs_id" property="afterWhsId" />
+        <result column="remark" property="remark" />
 
     </resultMap>
 

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopOrderMapper.xml

@@ -70,13 +70,14 @@
                     </choose>
                     and user_id = #{query.userId}
                 </where>
+                order by a.create_time desc
                 LIMIT #{start}, #{size}
              ) a
         LEFT JOIN kxs_shop_order_info t  ON a.id = t.order_id
         <where>
             a.user_id = #{query.userId}
         </where>
-        order by a.create_time desc
+
     </select>
     <select id="getDateBetweenOrders" resultType="com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO">
         SELECT a.id, a.total_price, a.user_id

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineTrackService.java

@@ -74,6 +74,15 @@ public class KxsMachineTrackService extends ServiceImpl<KxsMachineTrackMapper, K
                 case "TransType":
                     machineTrack.setTrackType(Integer.parseInt(validFieldDataMap.get(field).toString()));
                     break;
+                case "StoreId":
+                    machineTrack.setAfterWhsId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "SourceStoreId":
+                    machineTrack.setBeforeWhsId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "FromRemark":
+                    machineTrack.setRemark(validFieldDataMap.get(field).toString());
+                    break;
                 case "OpId":
                     machineTrack.setPartnerId(Integer.parseInt(validFieldDataMap.get(field).toString()));
                     break;