问题处理

hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -42,6 +42,7 @@
 
     <sql id="getProfitClearing">
         SELECT
+            sc.id,
             sc.`code` AS salesContractCode,
             sc.customer_id,
             cu.`name` AS customerName,

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -150,7 +150,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         IWrapper<Stock> wrapper = IWrapper.getWrapper();
         wrapper.isNotNull("pi.stock_threshold");
         wrapper.ne("pi.stock_threshold", "");
-        wrapper.ltSql("s.quantity", "pi.stock_threshold");
+        wrapper.ltSql("IFNULL(s.quantity,0)", "pi.stock_threshold");
         return baseMapper.getHeadStatistic(wrapper);
     }
 

hx-wms/src/main/resources/mapper/stock/StockMapper.xml

@@ -51,11 +51,10 @@
     </select>
     <select id="getHeadStatistic" resultType="com.fjhx.wms.entity.stock.vo.StockTotalVo">
         SELECT
-            count(s.id) as stockThresholdQuantity
+            count( pi.id ) AS stockThresholdQuantity
         FROM
-            stock s
-                LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
-                LEFT JOIN bytesailing_item.product_spu ps ON pi.product_spu_id = ps.id
+            bytesailing_item.product_info pi
+                LEFT JOIN stock s ON s.product_id = pi.id AND pi.del_flag = 0
             ${ew.customSqlSegment}
     </select>