Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -466,7 +466,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal number;
             BigDecimal materialNumber = (BigDecimal) map.get("materialNumber");
             BigDecimal materialWeight = (BigDecimal) map.get("materialWeight");
-            if (materialNumber != null && materialNumber.toString().length() != 0) {
+            String materialName =(String) map.get("materialName");
+            if (materialNumber != null && materialNumber.toString().length() != 0 && !materialName.equals("钒渣")) {
                 number = materialNumber;
             }
             else {

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -2263,7 +2263,6 @@
     on t_t_result.result_total_id=t_w_result.result_total_id
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-  
     ) sumWeight
     on sumWeight.SALE_ORDER_ID=ASO.SALE_ORDER_ID
     left join (
@@ -2280,7 +2279,6 @@
     where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-  
     ) sumWeight2
     on sumWeight2.SALE_ORDER_ID=ASO.SALE_ORDER_ID
     left join (
@@ -2292,7 +2290,7 @@
     on o_order.order_id=t_t_result.order_id
     left join Tmstruck_Weight_Result t_w_result
     on t_t_result.result_total_id=t_w_result.result_total_id
-    where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
+    where  o_order.order_status in (2,4,5)
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
   
@@ -3649,7 +3647,8 @@
 
     ) carCount
     on carCount.SALE_ORDER_ID=a_s_order.SALE_ORDER_ID
-    where ASM.SALE_WAREHOUSE = '副产品库'
+    where (ASM.SALE_WAREHOUSE = '副产品库'
+    or ASM.SALE_WAREHOUSE = '钒渣库')
     and a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
     and a_s_order.DELETED = #{deleted}