添加销售订单船名

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

@@ -247,7 +247,23 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             return getAllOrderResult(resultTotalId);
         }else if(orderType == 21|| orderType == 26){
             return getTimeOrderResult(resultTotalId);
-        }else {
+        }
+        //else if(orderType == 1){
+        //    //如果是钢材的订单则
+        //    Map<String,Object> steelDeliveryOrderMap = new HashMap<>();
+        //    steelDeliveryOrderMap.put("pointName","小东门自助一体机");
+        //    steelDeliveryOrderMap.put("linkName","送货单打印");
+        //    steelDeliveryOrderMap.put("pointDate",null);
+        //    List<Map<String,Object>> steelList  = getNormalOrderResult(resultTotalId);
+        //    Map<String,Object> steelLeaveFactoryMap = steelList.get(steelList.size()-1);
+        //    steelDeliveryOrderMap.put("segmenSqe",steelLeaveFactoryMap.get("segmenSqe"));
+        //    steelLeaveFactoryMap.put("segmenSqe",DataChange.dataToBigDecimal(steelLeaveFactoryMap.get("segmenSqe")).intValue() + 1);
+        //    steelList.remove(steelList.size()-1);
+        //    steelList.add(steelDeliveryOrderMap);
+        //    steelList.add(steelLeaveFactoryMap);
+        //    return steelList;
+        //}
+        else{
             return getNormalOrderResult(resultTotalId);
         }
     }

src/main/resources/application-prod.yml

@@ -16,11 +16,11 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:

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

@@ -3328,7 +3328,8 @@
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),
         RDA.ADDRESS_DELIVERY_ADDRESS ) "receiveAddressName",
-        ASM.SALE_WAREHOUSE "remark"
+        ASM.SALE_WAREHOUSE "remark",
+        ASO.SALE_REMARK     "shipName"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID