Merge branch 'dev'

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

@@ -102,37 +102,13 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     Integer dispatchType,
-                                                    String carrierSsoId,
-                                                    String con){
-        if (con != null) {
-            if(!"undefined".equals(con)){
-                String index="get_pc_dispatch";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+                                                    String carrierSsoId){
         mapValue.put("dispatchType",dispatchType);
         if (carrierSsoId != null && (carrierSsoId.equals("null") || carrierSsoId.equals("undefined"))) {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == 2) {
-            //将查询结果存入索引中
-            dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_pc_dispatch");
-            //添加id
-            map1.put("indexId","dispatchId");
-            dispatchSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(dispatchSaleOrderList);
-            //删除
-            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
-        }
-        if (dispatchSaleOrderList == null) {
-            dispatchSaleOrderList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
-        }
+        List<Map<String, Object>> dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);
@@ -170,4 +146,15 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+    /**
+     * 批量拒绝定向派单
+     * @param mapList
+     * @return
+     */
+    @ApiOperation(value="批量拒绝定向派单")
+    @PostMapping(value = "/refuseDispatchSaleOrderList")
+    public RESTfulResult refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
+        int result = amsDispatchSaleOrderService.refuseDispatchSaleOrderList(mapList);
+        return success(result);
+    }
 }

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

@@ -168,38 +168,12 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                        Integer issueStatus,
-                                        String con){
-        int count=0;
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_truckno_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+                                        Integer issueStatus){
         if (issueStatus != null) {
             mapValue.put("issueStatus",issueStatus);
-            count++;
         }
         //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_truckno_list");
-            //添加id
-            map1.put("indexId","saleOrderMaterialId");
-            allSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allSaleOrderList);
-            //删除
-            allSaleOrderList.remove(allSaleOrderList.size()-1);
-        }
-        if(allSaleOrderList== null)
-            allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
+        List<Map<String, Object>> allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderMaterialService.getTruckNoList(mapValue);

src/main/java/com/steerinfo/dil/service/IAmsDispatchSaleOrderService.java

@@ -77,4 +77,7 @@ public interface IAmsDispatchSaleOrderService{
 
     //批量接收定向派单
     int lockDispatchSaleOrderList(Map<String, Object> mapValue);
+
+    //批量拒绝定向派单
+    int refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
 }

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

@@ -521,4 +521,22 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         return result;
     }
+
+    /**
+     * 批量拒绝定向派单
+     * @param mapList
+     * @return
+     */
+    @Override
+    public int refuseDispatchSaleOrderList(List<Map<String, Object>> mapList) {
+        int result = 0;
+        for (Map<String, Object> map : mapList) {
+            AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
+            BigDecimal dispatchId = DataChange.dataToBigDecimal(map.get("dispatchId"));
+            amsDispatchSaleOrder.setDispatchId(dispatchId);
+            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(3));
+            result += amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(amsDispatchSaleOrder);
+        }
+        return result;
+    }
 }

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

@@ -636,6 +636,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             omstruckOrder.setCapacityId(capacityId);
             // 下发时间
             omstruckOrder.setOrderIssueTime(new Date());
+            // 承运商
+            omstruckOrder.setCarrierId(carrierId);
             // 运单状态
             omstruckOrder.setOrderStatus(new BigDecimal(4));
             BigDecimal status;

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

@@ -83,7 +83,12 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         //用车单位
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
-        amstruckInwardRequirement.setDueDate(new Date(dueTime));
+        //判断截止日期是否为空
+        if (dueTime!=null) {
+            amstruckInwardRequirement.setDueDate(new Date(dueTime));
+        }else {
+            amstruckInwardRequirement.setDueDate(null);
+        }
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));