修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-ams-api</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -11,7 +11,6 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -85,6 +84,14 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderService.getCarrierIdBySSO(mapValue);
+        if (carrierIdList != null && carrierIdList.size() == 1) {
+            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
+            mapValue.put("carrierId", carrierId);
+        }
+        else {
+            mapValue.put("carrierId",null);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder);

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

@@ -2,12 +2,10 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
 import com.steerinfo.dil.mapper.AmsSaleOrderMaterialMapper;
-import com.steerinfo.dil.mapper.AmsSaleTrucknoMaterialMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
 import com.steerinfo.dil.model.AmsSaleOrderMaterial;
 import com.steerinfo.dil.service.IAmsDispatchSaleOrderService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.dil.util.MapRemoveUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -16,7 +14,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * AmsDispatchSaleOrder服务实现：
@@ -261,14 +262,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
 //        String carrierSsoId = (String) mapValue.get("carrierSsoId");
-        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
-        if (carrierIdList != null && carrierIdList.size() == 1) {
-            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
-            mapValue.put("carrierId", carrierId);
-        }
-        else {
-            mapValue.put("carrierId",null);
-        }
+
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
         if (mapList == null) {
             return null;
@@ -543,4 +537,8 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         return result;
     }
+
+    public List<Map<String, Object>> getCarrierIdBySSO(Map<String, Object> mapValue) {
+        return amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
+    }
 }