修改内转钢材到异地库

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderMaterialController.java

@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.controller.AmsSaleTrucknoMaterialController;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
@@ -12,8 +11,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -520,7 +517,13 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
 
     @Override
     public int updateInwardConsignee(Map<String, Object> mapValue) {
-        return amsSaleOrderMaterialMapper.updateInwardConsignee(mapValue);
+        if(mapValue.get("saleOrderId") != null && mapValue.get("sendStationId") != null ){
+            amsSaleOrderMaterialMapper.updateSendStation(mapValue);
+        }
+        if(mapValue.get("saleOrderId") != null && mapValue.get("consigneeId") != null){
+            amsSaleOrderMaterialMapper.updateInwardConsignee(mapValue);
+        }
+        return 1;
     }
 
     /**

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

@@ -4467,7 +4467,10 @@
                         ASO.TRANSFER_IN_DEP                                    "transInDep",
                         ASO.TRANSFER_OUT_DEP                                   "transOutDep",
                         ASM.TRANSFER_IN_OF_WAREHOUSE                           "transInWarehouse",
-                        RC.CONSIGNEE_COMPANY_NAME                              "receiveName"
+                        RC.CONSIGNEE_COMPANY_NAME                              "receiveName",
+                        ASO.SALE_ORDER_ID                                       "saleOrderId",
+                        RAS1.ARRIVAL_ID                                         "sendStationId",
+                        RAS.ARRIVAL_ID                                          "toTheStationId"
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID