luobang 2 gadi atpakaļ
vecāks
revīzija
dce0a76c68

+ 2 - 0
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1019,7 +1019,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Transactional(rollbackFor = {Exception.class})
     public int receiveOrderResult(Map<String, Object> map) throws Exception {
         int result=0;
+        System.out.println("异地库回传接口");
         System.out.println(map);
+        System.out.println("异地库回传接口");
         //获取运输订单号
         Object orderNumber = map.get("orderNumber");
         Object receviceOrNot = map.get("receviceOrNot");

+ 6 - 1
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -913,7 +913,12 @@
         WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
     <select id="finCarAndCarrierAndEntries" resultType="java.util.Map" parameterType="decimal">
-        SELECT DISTINCT RC.CAPACITY_NUMBER AS "carNum",
+        SELECT DISTINCT
+                (case when
+                    RC.CAPACITY_NUMBER = '空白'
+                    then ' '
+                    else RC.CAPACITY_NUMBER
+                    END) AS "carNum",
                (case when ASO.SALE_ORDER_ISSELF_MENTION = '是'
                then '自提'
                else RCE.CARRIER_ABBREVIATION