修改新增装货点

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

@@ -252,6 +252,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 8:
             case 17:
             case 18:
+                if (map.get("loadNameId")!=null) omstruckOrder.setDriverConfirmation(DataChange.dataToBigDecimal(map.get("loadNameId")));//装货点
                 if (map.get("purchaseOrderId") != null)  omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId"))); //订单ID
                 if (map.get("unloadPointId") != null)  omstruckOrder.setUnloadPointId(DataChange.dataToBigDecimal(map.get("unloadPointId")));// 添加卸货点
                 break;

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

@@ -790,6 +790,7 @@
                 OO.INSERT_TIME "insertTime",
                 OO.ORDER_NUMBER "orderNumber",
                 RW.WAREHOUSE_NAME "warehouseName", --卸货点
+                RW2.WAREHOUSE_NAME "loadName",
                 to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
                 RS.SUPPLIER_NAME "supplierName", --发货单位
                 RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
@@ -814,6 +815,8 @@
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_WAREHOUSE RW
         on OO.UNLOAD_POINT_ID = RW.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2
+        ON OO.DRIVER_CONFIRMATION = RW2.WAREHOUSE_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         left join RMS_CONSIGNEE RCSE
@@ -2851,6 +2854,7 @@
                RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
                RW.WAREHOUSE_NAME  "unloadName",
                OO.ORDER_TYPE      "orderType",
+               RW2.WAREHOUSE_NAME "loadName",
                (case when APO.PURCHASING_ORGANIZATION_ID = 1
                      then '一厂'
                      when APO.PURCHASING_ORGANIZATION_ID = 2
@@ -2863,6 +2867,8 @@
                            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN AMS_PURCHASE_ORDER APO
                            ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_WAREHOUSE RW2
+                 ON RW2.WAREHOUSE_ID=OO.DRIVER_CONFIRMATION
                  LEFT JOIN RMS_SUPPLIER RS
                            ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                  LEFT JOIN RMS_CONSIGNEE RCON