Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/steerinfo/dil/service/impl/AmsContractTruckPriceServiceImpl.java
#	src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

src/main/java/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.java

@@ -120,4 +120,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     int selectMaxIdrra();
 
     void insertshdz(Map<String, Object> map);
+
+    List<Map<String, Object>> getPriceValueListInward(BigDecimal oilTypeId);
+
 }

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

@@ -354,9 +354,16 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         BigDecimal oilTypeId = DataChange.dataToBigDecimal(map.get("oilTypeId"));
         //获取预执行油价
         BigDecimal newOilPrice = DataChange.dataToBigDecimal(map.get("newOilPrice"));
-        BigDecimal type = new BigDecimal(1);
+        //获取type,如果type为1则为销售,如果为2则为内转包括计时，计重，计数
+        BigDecimal type = DataChange.dataToBigDecimal(map.get("type"));
         //根据油品名称ID和非历史油价筛选出符合条件的运价合集
-        List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
+        List<Map<String, Object>> PriceValueList = new ArrayList<>();
+        if (type.compareTo(new BigDecimal(1)) == 0) {
+            PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
+        }else if(type.compareTo(new BigDecimal(2)) == 0) {
+            PriceValueList = amsContractTruckPriceMapper.getPriceValueListInward(oilTypeId);
+        }
+
         for (Map<String, Object> stringObjectMap : PriceValueList) {
             //有距离则是销售钢材
             if (stringObjectMap.get("haulDistance")!=null) {

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/AmsContractTruckPriceMapper.xml

@@ -1599,7 +1599,21 @@
   <select id="selectMaxIdrra" resultType="int">
        select max(address_id) from RMS_RECEIVE_ADDRESS
   </select>
-
+  <select id="getPriceValueListInward" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    select a_t_price.PRICE_ID "priceId",
+           a_t_price.PRICE_VALUE "priceValue",
+           a_t_price.OILPRICE_BASE "oilpriceBase",
+           a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
+           a_t_price.CARGONAME_ID "cargonameId",
+           a_t_price.haul_distance "haulDistance",
+           a_t_price.REFERENCE_HT "referenceHt",
+           a_t_price.inventory "inventory",
+           a_t_price.place_id "placeId"
+    from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
+    where a_t_price.OIL_TYPE_ID = #{oilTypeId} and a_t_price.DELETED = 0
+      and a_t_price.type in (2,5,6)
+    order by a_t_price.PRICE_ID desc
+  </select>
   <insert id="insertshdz" parameterType="map">
     insert into RMS_RECEIVE_ADDRESS (ADDRESS_ID, ADDRESS_PROVINCE, ADDRESS_DISTRICT
     <if test="addressTown!=null">

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

@@ -522,7 +522,7 @@
     ON apo.RECEIVE_UNIT_ID = rsr.SHIPPER_ID
     where
       apo.DELETED = 0
-      <if test="con != null" >
+      <if test="con != null and con !=''.toString()" >
         and instr(apo.PURCHASE_ORDER_NO, #{con}) > 0 or instr(rsu.SUPPLIER_NAME, #{con}) > 0
         or instr(rsb.SHIPPER_NAME, #{con}) > 0  or instr(rm.MATERIAL_NAME, #{con}) > 0
         or instr(db.RESULT_FOREIGN_SHIP_NAME, #{con}) > 0

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO,file,RUNNING,errorfile
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout