维多利亚明细数据搜索

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalInfoServiceImpl.java

@@ -46,7 +46,9 @@ public class AbnormalInfoServiceImpl extends ServiceImpl<AbnormalInfoMapper, Abn
         wrapper.eq("p.create_user", dto.getPurchaseUserId());
         wrapper.keyword(dto.getKeyword(),
                 new SqlField("ai",AbnormalInfo::getTitle),
-                new SqlField("ai",AbnormalInfo::getLinkCode)
+                new SqlField("ai",AbnormalInfo::getLinkCode),
+                new SqlField("pi.custom_code"),
+                new SqlField("pi.name")
         );
 
         //添加权限过滤

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -81,6 +81,8 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
             wrapper.and(q -> q.like("li", LogisticsInfos::getCode, dto.getKeyword())
                     .or().like("li", LogisticsInfos::getBusinessCode, dto.getKeyword())
                     .or().in("li", LogisticsInfos::getLogisticsCompanyCode, companyCodes)
+                    .or().like("pi.custom_code", dto.getKeyword())
+                    .or().like("pi.name", dto.getKeyword())
             );
         }
 

hx-victoriatourist/src/main/resources/mapper/abnormal/AbnormalInfoMapper.xml

@@ -21,7 +21,15 @@
         from abnormal_info ai
                  left JOIN bytesailing_purchase.purchase p ON ai.purchase_id = p.id
                  LEFT JOIN bytesailing_purchase.purchase_detail pd ON pd.purchase_id = p.id
+                <!-- 调仓来源 -->
+                left JOIN stock_transfer st ON ai.link_id = st.id
+                left JOIN stock_transfer_details std ON std.stock_transfer_id = st.id
+                <!-- 到货来源 -->
+                left JOIN bytesailing_purchase.arrival arr ON ai.link_id = arr.id and arr.del_flag = 0
+                left JOIN bytesailing_purchase.arrival_detail arrd ON arrd.arrival_id = arr.id and arr.del_flag = 0
+                <!-- 产品信息 -->
                  LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
+                    or std.product_id = pi.id or arrd.bussiness_id = pi.id
                  LEFT JOIN bytesailing_base.sys_dept de
                            ON CAST(json_unquote(pi.victoriatourist_json -> '$.deptId') AS UNSIGNED) = de.dept_id
             ${ew.customSqlSegment}

hx-victoriatourist/src/main/resources/mapper/logistics/LogisticsInfosMapper.xml

@@ -26,11 +26,24 @@
             de.dept_name,
             dg.status arrivalStatus
         from logistics_infos li
-                 LEFT JOIN deliver_goods dg on li.business_id = dg.id
-                 LEFT JOIN bytesailing_purchase.purchase p ON li.purchase_id = p.id
-                 LEFT JOIN bytesailing_purchase.purchase_detail pd ON pd.purchase_id = p.id
-                 LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
-                 LEFT JOIN bytesailing_base.sys_dept de
+                LEFT JOIN deliver_goods dg on li.business_id = dg.id
+                LEFT JOIN bytesailing_purchase.purchase p ON li.purchase_id = p.id
+                LEFT JOIN bytesailing_purchase.purchase_detail pd ON pd.purchase_id = p.id
+                <!-- 京东退货来源 -->
+                LEFT JOIN jd_back jb ON li.business_id = jb.id
+                LEFT JOIN jd_back_details jbd ON jbd.jd_back_id = jb.id
+                <!-- 京东订单来源 -->
+                LEFT JOIN jd_order jo ON li.business_id = jo.id
+                LEFT JOIN jd_order_details jod ON jod.jd_order_id = jo.id
+                <!-- 销售订单来源 -->
+                LEFT JOIN order_info oi ON li.business_id = oi.id
+                LEFT JOIN order_details od ON od.order_id = oi.id
+                <!-- 关联产品 -->
+                LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
+                OR jbd.product_code = pi.custom_code
+                OR jod.product_id = pi.id
+                OR od.product_id = pi.id
+        LEFT JOIN bytesailing_base.sys_dept de
                            ON CAST(json_unquote(pi.victoriatourist_json -> '$.deptId') AS UNSIGNED) = de.dept_id
             ${ew.customSqlSegment}
     </select>