dasd

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

@@ -4544,7 +4544,7 @@
         FROM RMS_CONSIGNEE RC
         WHERE RC.CONSIGNEE_ID = #{receiveId}
   </select>
-  <select id="selectSaleAreaIdByName" resultType="java.math.BigDecimal" parameterType="decimal">
+  <select id="selectSaleAreaIdByName" resultType="java.math.BigDecimal" parameterType="string">
         SELECT RSA.AREA_ID FROM RMS_SALE_AREA RSA
         WHERE RSA.AREA_NAME = #{saleAreaName}
   </select>

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

@@ -981,7 +981,7 @@
         rm.material_name || rm.material_specification || '(' || rm.material_model || ')' "materialName",
         AIR.INSERT_UPDATE_REMARK "Tel"
         FROM
-        ( SELECT AIR2.REQUIREMENT_ID,,AIR2.capacity_type_id FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+        ( SELECT AIR2.REQUIREMENT_ID,AIR2.capacity_type_id FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
         LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id