|
|
@@ -5049,12 +5049,12 @@
|
|
|
/* TsaGoods.getGoodsQuikDeleverySkipCount */
|
|
|
SELECT COUNT(*)
|
|
|
FROM TB_GOODS_SHOT_DELV_SKIP A
|
|
|
- INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
|
|
|
- INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
|
|
|
- INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
|
|
|
- INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
|
|
|
+ LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
|
|
|
+ LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
|
|
|
+ LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
|
|
|
+ LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
|
|
|
<if test="searchGb != null and searchGb =='EXCEL'">
|
|
|
- INNER JOIN (
|
|
|
+ LEFT JOIN (
|
|
|
SELECT SEARCH_CD
|
|
|
, TMP_DISP_ORD
|
|
|
FROM (
|
|
|
@@ -5097,7 +5097,7 @@
|
|
|
FROM (
|
|
|
SELECT A.*
|
|
|
FROM (
|
|
|
- SELECT G.GOODS_CD
|
|
|
+ SELECT A.GOODS_CD
|
|
|
, G.GOODS_NM
|
|
|
, G.GOODS_STAT
|
|
|
, G.SUPPLY_COMP_CD
|
|
|
@@ -5115,12 +5115,12 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
FROM TB_GOODS_SHOT_DELV_SKIP A
|
|
|
- INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
|
|
|
- INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
|
|
|
- INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
|
|
|
- INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
|
|
|
+ LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
|
|
|
+ LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
|
|
|
+ LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
|
|
|
+ LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
|
|
|
<if test="searchGb != null and searchGb =='EXCEL'">
|
|
|
- INNER JOIN (
|
|
|
+ LEFT JOIN (
|
|
|
SELECT SEARCH_CD
|
|
|
, TMP_DISP_ORD
|
|
|
FROM (
|