'销售钢材'

pom.xml

@@ -118,6 +118,7 @@
 <!--                        <param>RMS_RECEIVE_PLACE</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
 <!--                            <param>AMS_CONTRACT_TRANSPORT_PRICE</param>-->
+                        <param>AMSTRUCK_INWARD_REQUIREMENT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -57,37 +57,10 @@ public class AmsContractBreachController extends BaseRESTfulController {
                                           Integer apiId,
                                           String con) {
 
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_breach_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> allBreachList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            allBreachList = amsContractBreachService.getBreachList(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_breach_list");
-            //添加id
-            map.put("indexId","breachListId");
-            allBreachList.add(map);
-            //新建索引
-            esFeign.insertIndex(allBreachList);
-            //删除
-            allBreachList.remove(allBreachList.size()-1);
-        }
-        if(allBreachList == null)
-            allBreachList = amsContractBreachService.getBreachList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> enFactoryResult = amsContractBreachService.getBreachList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allBreachList,enFactoryResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,enFactoryResult);
         return success(pageList);
     }
 

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

@@ -51,11 +51,11 @@ public class AmsContractOtherPriceController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> list = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -51,11 +51,10 @@ public class AmsContractTrainPriceController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> list = amsContractTrainPriceService.getTrainPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTrainPriceService.getTrainPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -52,11 +52,10 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId) {
-        List<Map<String, Object>> list = amsContractTransportPriceService.getShipPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTransportPriceService.getShipPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -141,11 +140,10 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> list = amsContractTransportPriceService.getAmsContractTransportPrice(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTransportPriceService.getAmsContractTransportPrice(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -168,11 +166,10 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer apiId) {
-        List<Map<String, Object>> list = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -61,13 +61,34 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer deleted){
-        if(deleted != null) mapValue.put("deleted", deleted);
+        if(deleted != null) {
+            mapValue.put("deleted", deleted);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
         return success(pageList);
     }
 
+    @ApiOperation(value="查询内转汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getInwardContractPrice")
+    public RESTfulResult getInwardContractPrice(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer deleted){
+        if(deleted != null) {
+            mapValue.put("deleted", deleted);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getInwardContractPrice(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
+        return success(pageList);
+    }
+
     /**
      * 新增汽运单价
      * @param mapValue
@@ -83,6 +104,21 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         return success(i);
     }
 
+    /**
+     * 新增内转汽运单价
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value="新增内转汽运单价")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsContractTransportPrice", value = "销售订单对象", required = false, dataType = "AmsContractTransportPrice")
+    })
+    @PostMapping(value = "/insertInwardPrice")
+    public RESTfulResult insertInwardPrice(@RequestBody(required = false) Map<String,Object> mapValue){
+        int i = amsContractTruckPriceService.insertInwardPrice(mapValue);
+        return success(i);
+    }
+
     /**
      * 通过主键删除汽运单价
      * @param priceId
@@ -200,11 +236,10 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             mapValue.put("con","%" + con + "%");
         }
         //不分页筛选数据
-        List<Map<String, Object>>  allSaleOrderList =  amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
 
 
@@ -253,4 +288,28 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amsContractTruckPriceService.getRealAddressByLike(map);
         return success(mapList);
     }
+
+    @ApiOperation("通过物资，车型，承运起止范围匹配运输单价")
+    @PostMapping("/getInwardPriceBy")
+    public Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String,Object> mapvalue){
+        //接受结算是内转计重还是计时还是计数
+        String settleMentType = (String) mapvalue.get("requirementType");
+        BigDecimal type = null;
+        if("计重".equals(settleMentType)){
+            type = new BigDecimal(2);
+        }else if("计时".equals(settleMentType)){
+            type = new BigDecimal(5);
+        }else if("计次".equals(settleMentType)){
+            type = new BigDecimal(6);
+        }
+        mapvalue.put("type",type);
+        List<Map<String,Object>> mapList = amsContractTruckPriceService.selectInwardPrice(mapvalue);
+        if(mapList.size()!=0){
+            return mapList.get(0);
+        }
+        else{
+            return null;
+        }
+
+    }
 }

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

@@ -85,10 +85,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder);
         return success(pageList);
     }
 
@@ -108,10 +107,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        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);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 

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

@@ -61,11 +61,10 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("dayplanId",dayplanId);
-        List<Map<String, Object>> list = amsRailOffsetDayplanService.getMaterialMesByDayPlanId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getMaterialMesByDayPlanId(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -124,11 +123,10 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
             mapValue.put("carrierId", new BigDecimal(carrierId));
         }
         mapValue.put("dayplanReceiveStatus",new BigDecimal(dayplanReceiveStatus));
-        List<Map<String, Object>> list = amsRailOffsetDayplanService.getRailOffsetDayplan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getRailOffsetDayplan(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -144,11 +142,10 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
         }
 
         mapValue.put("dayPlanId",new BigDecimal(dayPlanId));
-        List<Map<String, Object>> list = amsRailOffsetDayplanService.getRailOffsetDayplanId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getRailOffsetDayplanId(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -0,0 +1,110 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.AmsSaleOrderCarrier;
+import com.steerinfo.dil.service.IAmsSaleOrderCarrierService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * AmsSaleOrderCarrier RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-04 04:50
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-04
+ * 作者：generator
+ * 参考：
+ * 描述：AmsSaleOrderCarrier RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/amssaleordercarriers")
+public class AmsSaleOrderCarrierController extends BaseRESTfulController {
+
+    @Autowired
+    IAmsSaleOrderCarrierService amsSaleOrderCarrierService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("amssaleordercarrier:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<AmsSaleOrderCarrier> list = amsSaleOrderCarrierService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("amssaleordercarrier:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<AmsSaleOrderCarrier> list = amsSaleOrderCarrierService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据AmsSaleOrderCarrier对象创建")
+    @ApiImplicitParam(name = "amsSaleOrderCarrier", value = "详细实体amsSaleOrderCarrier", required = true, dataType = "AmsSaleOrderCarrier")
+    //@RequiresPermissions("amssaleordercarrier:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute AmsSaleOrderCarrier model){
+        AmsSaleOrderCarrier amsSaleOrderCarrier = amsSaleOrderCarrierService.add(model);
+        return success(amsSaleOrderCarrier);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("amssaleordercarrier:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        AmsSaleOrderCarrier amsSaleOrderCarrier = amsSaleOrderCarrierService.getById(id);
+        return success(amsSaleOrderCarrier);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amsSaleOrderCarrier信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "amsSaleOrderCarrier", value = "详细实体amsSaleOrderCarrier", required = true, dataType = "AmsSaleOrderCarrier")
+    })
+    //@RequiresPermissions("amssaleordercarrier:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody AmsSaleOrderCarrier model){
+        model.setId(id);
+        AmsSaleOrderCarrier amsSaleOrderCarrier = amsSaleOrderCarrierService.modify(model);
+        return success(amsSaleOrderCarrier);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("amssaleordercarrier:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  amsSaleOrderCarrierService.delete(ids);
+    	}
+      return success();
+    }
+}

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

@@ -6,9 +6,11 @@ import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
 import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
 import com.steerinfo.dil.model.AmsSaleOrder;
+import com.steerinfo.dil.model.AmsSaleOrderCarrier;
 import com.steerinfo.dil.model.AmsSaleOrderMaterial;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
+import com.steerinfo.dil.service.impl.AmsSaleOrderCarrierServiceImpl;
 import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -64,6 +66,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     ColumnDataUtil columnDataUtil;
     @Autowired
     ESFeign esFeign;
+    @Autowired
+    AmsSaleOrderCarrierServiceImpl  amsSaleOrderCarrierService;
 
     @ApiOperation(value="查询未上报销售订单信息")
     @ApiImplicitParams({
@@ -75,10 +79,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderInfo(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -92,10 +95,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderReported(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReported(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -109,10 +111,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -129,10 +130,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderId",saleOrderId);
-        List<Map<String, Object>> amsSaleOrderDetail = amsSaleOrderService.getSaleOrderDetail(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrderDetail1 = amsSaleOrderService.getSaleOrderDetail(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderDetail,amsSaleOrderDetail1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrderDetail1);
         return success(pageList);
     }
 
@@ -233,10 +233,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderId",saleOrderId);
-        List<Map<String, Object>> amsSaleOrderUpdate = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrderUpdate1 = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderUpdate,amsSaleOrderUpdate1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrderUpdate1);
         return success(pageList);
     }
 
@@ -299,40 +298,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer status,
                                           String con) {
-        int count=0;
         if (status!=null){
             mapValue.put("status",status);
-            count++;
-        }
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_sale_orderlist";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            allSaleOrderList =  amsSaleOrderService.getSaleOrderList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_sale_orderlist");
-            //添加id
-            map1.put("indexId","saleOrderId");
-            allSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allSaleOrderList);
-            //删除
-            allSaleOrderList.remove(allSaleOrderList.size()-1);
-        }
-        if(allSaleOrderList== null)
-            allSaleOrderList =  amsSaleOrderService.getSaleOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
 
     }
@@ -352,11 +324,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> saleCompanyList =  amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
 
     }
@@ -419,11 +390,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer status) {
         mapValue.put("status",status);
-        List<Map<String, Object>> list = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -473,11 +443,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId) {
-        List<Map<String, Object>> list = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -602,10 +571,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderId",saleOrderId);
-        List<Map<String,Object>> mapList = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columndata = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, mapList,columndata);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columndata);
         return success(pageList);
     }
 
@@ -625,11 +593,53 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("con","%" + con + "%");
         }
         //不分页筛选数据
-        List<Map<String, Object>> saleCompanyList =  amsSaleOrderService.getCokeSaleOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getCokeSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
+        return success(pageList);
+    }
+
+    @ApiModelProperty(value = "销售订单批量授权给承运商")
+    @PostMapping("/saleOrderEmpowerCarrier")
+    public RESTfulResult saleOrderEmpowerCarrier(@RequestBody(required = false) Map<String,Object> mapValue) {
+        //获得订单ID集合 saleOrderIds
+        List<Map<String,Integer>> saleOrderIds= (List<Map<String, Integer>>) mapValue.get("saleOrderIds");
+        //获得承运商 carrierId
+        BigDecimal carrierId=  new BigDecimal(mapValue.get("carrierId").toString());
+        //销售订单授权承运商中间表
+        int i= amsSaleOrderCarrierService.addAmsSaleOrderCarrier(carrierId,saleOrderIds);
+
+        return success(i);
+    }
+
+    @ApiModelProperty(value = "展示销售公司下发给承运商的销售订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListByCarrierSsoId")
+    public RESTfulResult getSaleOrderListByCarrierSsoId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        String carrierSsoId,
+                                                         Integer pageNum,
+
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con) {
+        if (con != null  && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con", con);
+
+        }
+        if (carrierSsoId!=null){
+            mapValue.put("carrierSsoId",carrierSsoId);
+        }
+
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListByCarrierSsoId(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
 

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

@@ -173,11 +173,10 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
             mapValue.put("issueStatus",issueStatus);
         }
         //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderMaterialService.getTruckNoList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
 

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

@@ -61,10 +61,9 @@ public class AmsSalePlanController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize){
 
-        List<Map<String, Object>> amsSalePlan = amsSalePlanService.getSalePlanInfo(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSalePlan1 = amsSalePlanService.getSalePlanInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSalePlan,amsSalePlan1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSalePlan1);
         return success(pageList);
     }
 

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

@@ -62,10 +62,9 @@ public class AmsSalePlanMaterialController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("planId",planId);
-        List<Map<String, Object>> amsSalePlanMaterial = amsSalePlanMaterialService.getSalePlanMaterialInfo(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSalePlanMaterial1 = amsSalePlanMaterialService.getSalePlanMaterialInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSalePlanMaterial,amsSalePlanMaterial1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSalePlanMaterial1);
         return success(pageList);
     }
 

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

@@ -62,10 +62,9 @@ public class AmsSaleTrucknoMaterialController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderMaterialId",saleOrderMaterialId);
-        List<Map<String, Object>> amsTruckNoDetail = amsSaleTrucknoMaterialService.getTruckNoDetail(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsTruckNoDetail1 = amsSaleTrucknoMaterialService.getTruckNoDetail(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsTruckNoDetail,amsTruckNoDetail1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsTruckNoDetail1);
         return success(pageList);
     }
 

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

@@ -10,7 +10,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
-import org.omg.CORBA.OBJ_ADAPTER;
+//import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -147,12 +147,16 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         if (planId != null && !"undefined".equals(planId.toString())) {
             mapValue.put("planId",new BigDecimal(planId));
         }
-        mapValue.put("planStatus",new BigDecimal(planStatus));
-        List<Map<String, Object>> list = amstruckInwardPlanService.getTruckPlanList(mapValue);
+        List<Map<String, Object>> columnList = null;
         PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = amstruckInwardPlanService.getTruckPlanList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        if(planStatus == 100){
+            columnList = amstruckInwardPlanService.getTruckPlanList2(mapValue);
+        }else {
+            mapValue.put("planStatus",new BigDecimal(planStatus));
+            //分页查询数据
+            columnList =  amstruckInwardPlanService.getTruckPlanList(mapValue);
+        }
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -166,4 +170,26 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amstruckInwardPlanService.getCarrierList();
         return success(mapList);
     }
+
+    @PostMapping("/getPlanOrder")
+    public RESTfulResult getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                      Integer pageNum,
+                                      Integer pageSize,
+                                      Integer apiId,
+                                      Integer planId,
+                                      Integer orderStatus,
+                                      Integer requirementId) {
+        if(planId !=null){
+            mapValue.put("planId",planId);
+        }
+        if(requirementId !=null){
+            mapValue.put("requirementId",requirementId);
+        }
+        mapValue.put("orderStatus",orderStatus);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amstruckInwardPlanService.getPlanOrder(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
 }

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

@@ -146,14 +146,15 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if (orgCode != null && !orgCode.equals("null")) {
-            mapValue.put("orgCode",orgCode);
+            String con = "%"+orgCode+"%";
+            mapValue.put("con",con);
         }
         mapValue.put("requirementStatus",requirementStatus);
-        List<Map<String, Object>> truckRequirementList  = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+        List<Map<String, Object>> list = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
     //展示采购内转需求
@@ -185,13 +186,10 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue.put("planStatus",planStatus);
         }
         mapValue.put("requirementStatus",requirementStatus);
-        List<Map<String, Object>> truckRequirementList = null;
-        //将查询结果存入索引中
-        truckRequirementList =  amstruckInwardRequirementService.getPurRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -208,38 +206,11 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  String  con) {
-//        if (con != null) {
-//            if (!con.equals("undefined")) {
-//                String index="get_purchase_batch";//设置要查询的索引名称
-//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-//            }
-//        }
-//        if (mapValue == null) {
-//            mapValue = new HashMap<>();
-//        }
-//        List<Map<String, Object>> truckRequirementList = null;
-//        if (mapValue.size() == 0) {
-//            //将查询结果存入索引中
-//            truckRequirementList =  amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-//            Map<String, Object> map1 = new HashMap<>();
-//            //添加索引
-//            map1.put("index","get_purchase_batch");
-//            //添加id
-//            map1.put("indexId","purchaseOrderId");
-//            truckRequirementList.add(map1);
-//            //新建索引
-//            esFeign.insertIndex(truckRequirementList);
-//            //删除
-//            truckRequirementList.remove(truckRequirementList.size()-1);
-//        }
-//        if (truckRequirementList == null) {
-//            truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-//        }
-        List<Map<String,Object>> truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -264,37 +235,11 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                               Integer pageSize,
                                               Integer apiId,
                                               String con) {
-        if (con != null) {
-            if (!con.equals("undefined")) {
-                String index="get_ware_house";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        List<Map<String, Object>> truckRequirementList = null;
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            truckRequirementList =  amstruckInwardRequirementService.getWareHouse(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_ware_house");
-            //添加id
-            map1.put("indexId","wareHouseId");
-            truckRequirementList.add(map1);
-            //新建索引
-            esFeign.insertIndex(truckRequirementList);
-            //删除
-            truckRequirementList.remove(truckRequirementList.size()-1);
-        }
-        if (truckRequirementList == null) {
-            truckRequirementList = amstruckInwardRequirementService.getWareHouse(mapValue);
-        }
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getWareHouse(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -67,39 +67,11 @@ public class AmstruckPurplanController extends BaseRESTfulController {
                                            Integer status,String con){
 
         mapValue.put("planStatus", status);
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_pur_plan_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> allPurPlan = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
-            //将查询结果存入索引中
-            allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_pur_plan_list");
-            //添加id
-            map.put("indexId","purPlanId");
-            allPurPlan.add(map);
-            //新建索引
-            esFeign.insertIndex(allPurPlan);
-            //删除
-            allPurPlan.remove(allPurPlan.size()-1);
-        }
-        if(allPurPlan == null) {
-            allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        }
+
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPurPlan,purPlan);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,purPlan);
         return success(pageList);
     }
 
@@ -190,51 +162,11 @@ public class AmstruckPurplanController extends BaseRESTfulController {
                                                Integer status,
                                                Integer planStatus,
                                                String con){
-        int count = 0;
         if(planId != null){
             mapValue.put("planId", planId);
-            count++;
         }
         if(status != null){
             mapValue.put("planStatus", status);
-            count++;
-        }
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_decomposed_list";    //设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allPlan = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            if (planStatus != 0) {
-                allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-            }
-            else {
-                allPlan = amstruckPurplanMaterialService.getUnStartDecomposedPlan(mapValue);
-            }
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_decomposed_list");
-            //添加id
-            map.put("indexId","decomposedPlanId");
-            allPlan.add(map);
-            //新建索引
-            esFeign.insertIndex(allPlan);
-            //删除
-            allPlan.remove(allPlan.size()-1);
-        }
-        if(allPlan == null) {
-            if (planStatus != 0) {
-                allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-            }
-            else {
-                allPlan = amstruckPurplanMaterialService.getUnStartDecomposedPlan(mapValue);
-            }
         }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
@@ -245,7 +177,7 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         else {
             plan = amstruckPurplanMaterialService.getUnStartDecomposedPlan(mapValue);
         }
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, plan);
         return success(pageList);
     }
 }

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

@@ -127,11 +127,10 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer status) {
         mapValue.put("status", status);
-        List<Map<String, Object>> list = amstruckRailDayplanService.getTruckRailDayPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckRailDayplanService.getTruckRailDayPlan(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
     /**
@@ -150,11 +149,10 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer status) {
         mapValue.put("status", status);
-        List<Map<String, Object>> list = amstruckRailDayplanService.getSzTruckRailDayPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckRailDayplanService.getSzTruckRailDayPlan(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -110,11 +110,9 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
         if (userIds!=null){
             mapValue.put("userIds",userIds);
         }
-        List<Map<String, Object>> sporadicOrderList = null;
-        sporadicOrderList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, sporadicOrderList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 
@@ -133,44 +131,18 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
                                          String con,
                                          String userId,
                                          String userIds) {
-        int count=0;
-        if (con != null && !con.equals("undefined")) {
-            String index="see_all_materials";//设置要查询的索引名称
-            return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-        }
         if (userId!=null){
             mapValue.put("userId",userId);
-            count++;
         }
         if (userIds!=null){
             mapValue.put("userIds",userIds);
-            count++;
         }
         if (sporadicOrderId!=null) {
             mapValue.put("sporadicOrderId", sporadicOrderId);
-            count++;
-        }
-        List<Map<String, Object>> mapList = null;
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            mapList =  amstruckSporadicOrderService.seeAllMaterials(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","see_all_materials");
-            //添加id
-            map1.put("indexId","materialId");
-            mapList.add(map1);
-            //新建索引
-            esFeign.insertIndex(mapList);
-            //删除
-            mapList.remove(mapList.size()-1);
-        }
-        if (mapList == null) {
-            mapList = amstruckSporadicOrderService.seeAllMaterials(mapValue);
         }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = amstruckSporadicOrderService.seeAllMaterials(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, mapList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 
@@ -212,6 +184,25 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiOperation(value = "查运输订单物资详情")
+    @PostMapping("/getSporadic")
+    public RESTfulResult getSporadic(Integer sporadicId) {
+        return success(amstruckSporadicOrderService.getSporadic(sporadicId));
+    }
 
+    @ApiOperation(value = "查零星订单物资详情")
+    @PostMapping("/getSporadicOfOrder")
+    public RESTfulResult getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer sporadicId
+                                            ) {
+        mapValue.put("sporadicId",sporadicId);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> columnList = amstruckSporadicOrderService.getSporadicOfOrder(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
+        return success(pageList);
+    }
 
 }

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

@@ -66,11 +66,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize,
                                          Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -87,11 +86,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getMarketingNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getMarketingNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -108,11 +106,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getCarrierNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getCarrierNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -128,11 +125,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getClientNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getClientNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -228,40 +224,10 @@ public class DilNoticeController extends BaseRESTfulController {
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_notice_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = dilNoticeService.getNoticeList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_notice_list");
-            //添加id
-            map.put("indexId", "noticeId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = dilNoticeService.getNoticeList(mapValue);
-        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getNoticeList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/mapper/AmsContaactPriceMaterialMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsContaactPriceMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsContaactPriceMaterialMapper extends IBaseMapper<AmsContaactPriceMaterial, BigDecimal> {
+    List<Map<String, Object>> getMaterialName(BigDecimal priceId);
+
+
+}

src/main/java/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.java

@@ -14,6 +14,10 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     //查询主键最大值
     @Select("select seq_truck_price.nextval from dual")
     BigDecimal selectMaxId();
+
+    //查询物资价格中间表主键最大值
+    @Select("select seq__ams_price_material.nextval from dual")
+    BigDecimal selectPriceMaterialMaxId();
     //获取汽运单价信息
     List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
     //获取承运商名称
@@ -50,4 +54,10 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     List<Map<String, Object>> getRealAddressByLike(Map<String, Object> map);
 
     BigDecimal selectFormulaId(BigDecimal priceId);
+
+    List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
+
+
 }

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderCarrierMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsSaleOrderCarrier;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface AmsSaleOrderCarrierMapper extends IBaseMapper<AmsSaleOrderCarrier, BigDecimal> {
+    //查询主键最大值
+    @Select("select seq__SALE_ORDER_CARRIER.nextval from dual")
+    BigDecimal selectMaxId();
+
+    AmsSaleOrderCarrier getAmsSaleOrderCarrier(BigDecimal carrierId, BigDecimal saleOrderId);
+}

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -96,4 +96,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String, Object>> getTruckNoMaterialAndCarrier(BigDecimal saleOrderMaterialId);
     // 展示已派车的车序号
     List<Map<String, Object>> getHaveCarTruckNoList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getSaleOrderListByCarrierSsoId(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/AmstruckInwardPlanMapper.java

@@ -22,4 +22,9 @@ public interface AmstruckInwardPlanMapper extends IBaseMapper<AmstruckInwardPlan
     List<Map<String, Object>> getCarrierList();
 
     List<Map<String, Object>> getIssuedPlanList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getIssuedPlanList2(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
+
 }

src/main/java/com/steerinfo/dil/mapper/AmstruckSporadicMaterialMapper.java

@@ -22,4 +22,8 @@ public interface AmstruckSporadicMaterialMapper extends IBaseMapper<AmstruckSpor
 
     List<Map<String,Object>> getSporadicOrdersList4(Map<String,Object> mapValue);
 
+    List<Map<String,Object>> getSporadic(Integer sporadicId);
+
+    List<Map<String, Object>> getSporadicOfOrder(Map<String,Object> mapValue);
+
 }

src/main/java/com/steerinfo/dil/mapper/AmstruckSporadicOrderMapper.java

@@ -31,4 +31,7 @@ public interface AmstruckSporadicOrderMapper extends IBaseMapper<AmstruckSporadi
     Map<String,Object> selectOrderInfo(Integer orderId);
 
     List<Map<String,Object>> selectOrderIdbySporadicOrderid(Integer sporadicOrderId);
+
+    List<Map<String, Object>> selectOrderMaterial(Integer orderId);
+
 }

src/main/java/com/steerinfo/dil/model/AmsContaactPriceMaterial.java

@@ -0,0 +1,77 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+
+@ApiModel(value="单价与物资中间表")
+public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRICE_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal priceMaterialId;
+
+    /**
+     * 单价ID(PRICE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.priceMaterialId;
+    }
+
+    @Override
+    public void setId(BigDecimal priceMaterialId) {
+        this.priceMaterialId = priceMaterialId;
+    }
+
+    public BigDecimal getPriceMaterialId() {
+        return priceMaterialId;
+    }
+
+    public void setPriceMaterialId(BigDecimal priceMaterialId) {
+        this.priceMaterialId = priceMaterialId;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", priceMaterialId=").append(priceMaterialId);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/AmsSaleOrderCarrier.java

@@ -0,0 +1,168 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="销售订单授权承运商中间表")
+public class AmsSaleOrderCarrier implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(SALE_ORDER_CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal saleOrderCarrierId;
+
+    /**
+     * 销售订单ID(SALE_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="销售订单ID",required=false)
+    private BigDecimal saleOrderId;
+
+    /**
+     * 承运商ID(CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运商ID",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除0：未删除；1：已删除(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除0：未删除；1：已删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.saleOrderCarrierId;
+    }
+
+    @Override
+    public void setId(BigDecimal saleOrderCarrierId) {
+        this.saleOrderCarrierId = saleOrderCarrierId;
+    }
+
+    public BigDecimal getSaleOrderCarrierId() {
+        return saleOrderCarrierId;
+    }
+
+    public void setSaleOrderCarrierId(BigDecimal saleOrderCarrierId) {
+        this.saleOrderCarrierId = saleOrderCarrierId;
+    }
+
+    public BigDecimal getSaleOrderId() {
+        return saleOrderId;
+    }
+
+    public void setSaleOrderId(BigDecimal saleOrderId) {
+        this.saleOrderId = saleOrderId;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", saleOrderCarrierId=").append(saleOrderCarrierId);
+        sb.append(", saleOrderId=").append(saleOrderId);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/AmstruckInwardRequirement.java

@@ -14,6 +14,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal requirementId;
+    
 
     /**
      * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,0)
@@ -159,6 +160,12 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="截止日期",required=false)
     private Date dueDate;
 
+    /**
+     * 矿石备注(IS_MINERAL,VARCHAR,255)
+     */
+    @ApiModelProperty(value="矿石备注",required=false)
+    private String isMineral;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -371,6 +378,14 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.dueDate = dueDate;
     }
 
+    public String getIsMineral() {
+        return isMineral;
+    }
+
+    public void setIsMineral(String isMineral) {
+        this.isMineral = isMineral == null ? null : isMineral.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -402,6 +417,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", requirementPlatformId=").append(requirementPlatformId);
         sb.append(", requirementLinkType=").append(requirementLinkType);
         sb.append(", dueDate=").append(dueDate);
+        sb.append(", isMineral=").append(isMineral);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -48,4 +48,12 @@ public interface IAmsContractTruckPriceService {
     List<Map<String,Object>> getOilTypeName();
     // 边输边查具体地址
     List<Map<String, Object>> getRealAddressByLike(Map<String, Object> map);
+
+    //新增内转汽运单价
+    int insertInwardPrice(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
+
 }

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

@@ -0,0 +1,26 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.AmsSaleOrderCarrier;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsSaleOrderCarrier服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-04 04:50
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-04
+ * 作者：generator
+ * 参考：
+ * 描述：AmsSaleOrderCarrier服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IAmsSaleOrderCarrierService extends IBaseService<AmsSaleOrderCarrier, BigDecimal>{
+
+    int addAmsSaleOrderCarrier(BigDecimal carrierId,List<Map<String,Integer>> saleOrderIds);
+}

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

@@ -125,4 +125,6 @@ public interface IAmsSaleOrderService {
     List<Map<String, Object>> getNoCarTruckNoList(Map<String, Object> mapValue);
     // 展示已但未派车的车序号
     List<Map<String, Object>> getHaveCarTruckNoList(Map<String, Object> mapValue);
+    //展示销售公司下发给承运商的销售订单列表
+    List<Map<String, Object>> getSaleOrderListByCarrierSsoId(Map<String, Object> mapValue);
 }

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

@@ -26,6 +26,8 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
 
     List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getTruckPlanList2(Map<String, Object> mapValue);
+
     int deleteTruckPlan(BigDecimal planId);
 
     int updateTruckPlan(AmstruckInwardPlan amstruckInwardPlan);
@@ -40,4 +42,6 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
 
     int changePlanStatus(BigDecimal planId);
 
+    List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
+
 }

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -59,4 +61,9 @@ public interface IAmstruckSporadicOrderService {
 
     //停止
     int closeSporadic(Map<String,Object> map);
+
+    List<Map<String,Object>> getSporadic(Integer sporadicId);
+
+    List<Map<String,Object>> getSporadicOfOrder(Map<String,Object> mapValue);
+
 }

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

@@ -1,7 +1,9 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.AmsContaactPriceMaterialMapper;
 import com.steerinfo.dil.mapper.AmsContractTruckPriceMapper;
 import com.steerinfo.dil.mapper.RmsReceivePlaceMapper;
+import com.steerinfo.dil.model.AmsContaactPriceMaterial;
 import com.steerinfo.dil.model.AmsContractTransportPrice;
 import com.steerinfo.dil.model.RmsReceivePlace;
 import com.steerinfo.dil.service.IAmsContractTruckPriceService;
@@ -39,6 +41,9 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     @Autowired
     RmsReceivePlaceMapper rmsReceivePlaceMapper;
 
+    @Autowired
+    AmsContaactPriceMaterialMapper amsContaactPriceMaterialMapper;
+
     /**
      * 新增汽运单价
      * @Author zzd
@@ -525,4 +530,86 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     public List<Map<String, Object>> getRealAddressByLike(Map<String, Object> map) {
         return amsContractTruckPriceMapper.getRealAddressByLike(map);
     }
+
+    @Override
+    public int insertInwardPrice(Map<String, Object> mapValue) {
+        int i = 0;
+        BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
+        BigDecimal formulaId = DataChange.dataToBigDecimal(mapValue.get("formulaId"));
+        BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
+        Date priceDate = new Date((Long)mapValue.get("priceDate"));
+        BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
+        BigDecimal oilpriceBase = DataChange.dataToBigDecimal(mapValue.get("oilpriceBase"));
+        BigDecimal oilTypeId = DataChange.dataToBigDecimal(mapValue.get("oilTypeId"));
+        BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(mapValue.get("oilpriceChangeThreshold"));
+        List<Map<String,Object>>mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        AmsContractTransportPrice amsContractTransportPrice = new AmsContractTransportPrice();
+        amsContractTransportPrice.setType(type);
+        amsContractTransportPrice.setOilpriceBase(oilpriceBase);
+        //承运起止点ID
+        amsContractTransportPrice.setLineId(lineId);
+        amsContractTransportPrice.setOilpriceChangeThreshold(oilpriceChangeThreshold);
+        amsContractTransportPrice.setOilTypeId(oilTypeId);
+        amsContractTransportPrice.setPriceValue(priceValue);
+        amsContractTransportPrice.setPriceDate(priceDate);
+        amsContractTransportPrice.setCapacityTypeId(capacityTypeId);
+        amsContractTransportPrice.setCargonameId(formulaId);
+        //生成主键id
+        amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
+        amsContractTransportPrice.setInsertUsername("admin");
+        amsContractTransportPrice.setInsertTime(new Date());
+        amsContractTransportPrice.setUpdateUsername("admin");
+        amsContractTransportPrice.setUpdateTime(new Date());
+        amsContractTransportPrice.setInsertUpdateRemark("无");
+        amsContractTransportPrice.setDeleted(new BigDecimal(0));
+        i =  amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
+        for (Map<String,Object>map:mapList
+             ) {
+            map.get("materialId");
+            AmsContaactPriceMaterial amsContaactPriceMaterial = new AmsContaactPriceMaterial();
+            //设置最大主键ID
+            amsContaactPriceMaterial.setId(amsContractTruckPriceMapper.selectPriceMaterialMaxId());
+            amsContaactPriceMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+            amsContaactPriceMaterial.setPriceId(amsContractTransportPrice.getPriceId());
+            i = amsContaactPriceMaterialMapper.insertSelective(amsContaactPriceMaterial);
+        }
+        return i;
+    }
+
+    @Override
+    public List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue) {
+        List<Map<String,Object>>mapList =  amsContractTruckPriceMapper.getInwardContractPrice(mapValue);
+        for (Map<String,Object>map:mapList
+             ) {
+            List<Map<String,Object>> materialList = amsContaactPriceMaterialMapper.getMaterialName(DataChange.dataToBigDecimal(map.get("priceId")));
+            String materialNames = "";
+            int i = 1;
+            for (Map<String,Object>materialMap:materialList
+                 ) {
+                if(i==materialList.size()){
+                    materialNames = materialNames + materialMap.get("materialName") ;
+                }
+                else{
+                    materialNames = materialNames + materialMap.get("materialName") + "、";
+                }
+                i++;
+            }
+            map.put("materialNames",materialNames);
+            if(((BigDecimal)map.get("type")).intValue() == 2){
+                map.put("type","元/吨");
+            }else if(((BigDecimal)map.get("type")).intValue() == 5){
+                map.put("type","元/小时");
+            }else if(((BigDecimal)map.get("type")).intValue() == 6){
+                map.put("type","元/趟");
+            }
+
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue) {
+            return amsContractTruckPriceMapper.selectInwardPrice(mapvalue);
+    }
 }

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

@@ -0,0 +1,61 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.AmsSaleOrderCarrier;
+import com.steerinfo.dil.mapper.AmsSaleOrderCarrierMapper;
+import com.steerinfo.dil.service.IAmsSaleOrderCarrierService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsSaleOrderCarrier服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-04 04:50
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-04
+ * 作者：generator
+ * 参考：
+ * 描述：AmsSaleOrderCarrier服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "amsSaleOrderCarrierService")
+public class AmsSaleOrderCarrierServiceImpl extends BaseServiceImpl<AmsSaleOrderCarrier, BigDecimal> implements IAmsSaleOrderCarrierService {
+
+    @Autowired
+    private AmsSaleOrderCarrierMapper amsSaleOrderCarrierMapper;
+
+    @Override
+    protected IBaseMapper<AmsSaleOrderCarrier, BigDecimal> getMapper() {
+        return amsSaleOrderCarrierMapper;
+    }
+
+
+    @Override
+    public int addAmsSaleOrderCarrier(BigDecimal carrierId, List<Map<String,Integer>> saleOrderIds) {
+        int count=0;
+        //遍历销售订单
+        for (Map<String,Integer> map :saleOrderIds){
+            BigDecimal saleOrderId=new BigDecimal(map.get("saleOrderId"));
+            //当前订单已经下发给该承运商
+            AmsSaleOrderCarrier saleOrderCarrier= amsSaleOrderCarrierMapper.getAmsSaleOrderCarrier(carrierId,saleOrderId);
+            if (saleOrderId!=null&&saleOrderCarrier==null){
+
+                AmsSaleOrderCarrier amsSaleOrderCarrier=new AmsSaleOrderCarrier();
+                amsSaleOrderCarrier.setSaleOrderCarrierId(amsSaleOrderCarrierMapper.selectMaxId());
+                amsSaleOrderCarrier.setCarrierId(carrierId);
+                amsSaleOrderCarrier.setSaleOrderId(saleOrderId);
+                amsSaleOrderCarrier.setInsertTime(new Date());
+                amsSaleOrderCarrier.setInsertUsername("admin");
+                count=amsSaleOrderCarrierMapper.insertSelective(amsSaleOrderCarrier);
+            }
+        }
+        return count;
+    }
+}

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

@@ -897,6 +897,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getSaleOrderListToCarrier(Map<String, Object> map) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListToCarrier(map);
+        return resultList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getSaleOrderListByCarrierSsoId(Map<String, Object> map) {
+        List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListByCarrierSsoId(map);
+        String statusStr;
         for (Map<String, Object> resultMap : resultList) {
             BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
             Map<String,Object> loserMap = new HashMap<>();
@@ -914,6 +921,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 }
                 resultMap.put("materialName",materialName);
             }
+            BigDecimal saleOrderStatus = (BigDecimal) resultMap.get("saleOrderStatus");
+//            if (saleOrderStatus.intValue() == 2) {
+//                statusStr = "销售公司已审核";
+//            }
+//            else {
+//                statusStr = "财务已审核";
+//            }
+            statusStr = saleOrderStatus.intValue() == 2 ? "销售公司已审批" : "财务已审批";
+            resultMap.put("statusStr",statusStr);
             resultMap.put("netWeight",netWeight);
             resultMap.put("carNum",carNum);
         }
@@ -1007,5 +1023,4 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }
         return resultList;
     }
-
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -57,9 +58,11 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         amstruckInwardPlan.setPlanId(planId);
         //获取承运商id，车数
         BigDecimal carrierId=new BigDecimal(mapValue.get("carrierId").toString());
-        BigDecimal planTruckNumber=new BigDecimal(mapValue.get("planTruckNumber").toString());
+        BigDecimal planTruckNumber = DataChange.dataToBigDecimal(mapValue.get("planTruckNumber"));
+        if(planTruckNumber.intValue() != 0){
+            amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
+        }
         amstruckInwardPlan.setCarrierId(carrierId);
-        amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
         amstruckInwardPlan.setPlanNumber(DataChange.generateEightDigitsNumber("YSJH",planId.intValue()));
         //设置计划状态为未下发
         amstruckInwardPlan.setPlanStatus(new BigDecimal(0));
@@ -89,6 +92,9 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     @Override
     public List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue) {
         BigDecimal planStatus = (BigDecimal)mapValue.get("planStatus");
+//        在mapValue中存储当前时间
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        mapValue.put("newTime",format.format(new Date()));
         List<Map<String,Object>> mapList;
         if (planStatus.intValue() == 0) {
             mapList = amstruckInwardPlanMapper.getTruckPlanList(mapValue);
@@ -99,6 +105,10 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         return mapList;
     }
 
+    public List<Map<String, Object>> getTruckPlanList2(Map<String, Object> mapValue) {
+        return amstruckInwardPlanMapper.getIssuedPlanList2(mapValue);
+    }
+
     /**
      * 删除计划
      * @param planId
@@ -184,4 +194,9 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         int result = amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
         return result;
     }
+
+    @Override
+    public List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue) {
+        return amstruckInwardPlanMapper.getPlanOrder(mapValue);
+    }
 }

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

@@ -52,6 +52,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         return amstruckInwardRequirementMapper;
     }
 
+    //新增用车需求
     @Transactional
     @Override
     public int  insert(Map<String,Object> mapValue) {
@@ -64,30 +65,54 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
+        //提取车型
+        BigDecimal capacityTypeId=DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+        String InsertUpdateRemark = (String) mapValue.get("remark");
+        String isMineral    = (String)mapValue.get("isMineral");
         Long dueTime =(Long) mapValue.get("DueTime");
+
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
         amstruckInwardRequirement.setRequirementId(requirementId);
+        if(mapValue.get("rangeId") != null){
+            //承运起止范围
+            BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
+            amstruckInwardRequirement.setLineId(lineId);
+        }
         amstruckInwardRequirement.setRequirementNumber(DataChange.generateEightDigitsNumber("YSXQ",amstruckInwardRequirementMapper.selectOtherId().intValue()));
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(0));
+        //新增车型
+        amstruckInwardRequirement.setCapacityTypeId(capacityTypeId);
         if(purchaseOrderId != null){
             amstruckInwardRequirement.setPurchaseOrderId(new BigDecimal(purchaseOrderId));
         }
         amstruckInwardRequirement.setRequirementType(requirementType);
         amstruckInwardRequirement.setRequirementTruckTime(new Date(requirementTruckTime));
-        amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
+        if(requirementWorkType != null){
+            amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
+        }
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
-        amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
+
+        if (requirementEstimatedDuration!=null) {
+
+            amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
+        }
         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.setIsMineral(isMineral);
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
-        amstruckInwardRequirement.setInsertUpdateRemark("无");
+        amstruckInwardRequirement.setInsertUpdateRemark(InsertUpdateRemark);
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
@@ -123,7 +148,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckRequirementMaterial.setMaterialId(materialId);
             amstruckRequirementMaterial.setInsertTime(new Date());
             amstruckRequirementMaterial.setInsertUsername("admin");
-            amstruckRequirementMaterial.setInsertUpdateRemark("无");
+            amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
             result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
         }
         return result;
@@ -155,7 +180,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
      */
     @Override
     public int deleteTruckRequirement(BigDecimal requirementId) {
-        AmstruckInwardRequirement amstruckInwardRequirement = amstruckInwardRequirementMapper.selectByPrimaryKey(requirementId);
+        AmstruckInwardRequirement amstruckInwardRequirement=new AmstruckInwardRequirement();
+        amstruckInwardRequirement.setRequirementId(requirementId);
         amstruckInwardRequirement.setDeleted(new BigDecimal(1));
         int result = amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
         return result;
@@ -282,6 +308,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     public int insertPurInwardRequirement(Map<String, Object> mapValue) {
         BigDecimal purchaseOrderId = DataChange.dataToBigDecimal(mapValue.get("purchaseOrderId"));
         BigDecimal unloadPointId = DataChange.dataToBigDecimal(mapValue.get("unloadPointId"));
+        //承运起止范围ID
+        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
         String userId = (String)mapValue.get("userId");
         BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierId"));
         BigDecimal materialId = DataChange.dataToBigDecimal(mapValue.get("materialId"));
@@ -289,6 +317,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
         amstruckInwardRequirement.setRequirementId(requirementId);
+        amstruckInwardRequirement.setLineId(lineId);
         amstruckInwardRequirement.setRequirementNumber(DataChange.generateEightDigitsNumber("YSXQ",amstruckInwardRequirementMapper.selectOtherId().intValue()));
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(0));
         amstruckInwardRequirement.setPurchaseOrderId(purchaseOrderId);

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

@@ -168,8 +168,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         if (orderTime!=null) {
             amstruckSporadicOrder.setSporadicOrderTimes(DataChange.dataToBigDecimal(orderTime));
         }
-        //设置运输状态默认为启用
-        amstruckSporadicOrder.setTransStatus(new BigDecimal(1));
+        //设置运输状态
+        amstruckSporadicOrder.setTransStatus(DataChange.dataToBigDecimal(map.get("isMoreTrips")));
         if (map.get("carrierId")!=null) {
             amstruckSporadicOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
         }
@@ -250,9 +250,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         switch (orderType){
             case 12:
             case 13:
-            case 15:
-            case 16:
-            case 20:
+            case 14:
+            case 19:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -319,68 +318,31 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
      */
     @Override
     public List<Map<String, Object>> getSporadicOrdersList(Map<String, Object> mapValue) {
-        Integer orderType1 = (Integer) mapValue.get("orderType");
         List<Map<String, Object>> mapList=null;
-        switch (orderType1) {
-            case 12:
-                //apiId：439
-                if (mapValue.get("sporadicStatus") != null) {
-                    //走查询订单id的接口
-                    mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
-                }else {
-                    //不查询订单id的接口
-                    mapList=amstruckSporadicMaterialMapper.getSporadicOrdersList4(mapValue);
-                }
-                for (Map<String, Object> map : mapList) {
-                    BigDecimal type = (BigDecimal) map.get("type");
-                    BigDecimal tranStatus =(BigDecimal) map.get("transStatus");
-                    String orderType = "";
-                    String Status = "";
-                    if (type.intValue() == 12) {
-                        orderType += "内转零星进厂";
-                    }
-                    if (type.intValue() == 13) {
-                        orderType += "内转零星出厂";
-                    }
-                    if (type.intValue() == 20) {
-                        orderType += "内转零星(新区-老区)进厂";
-                    }
-                    if (tranStatus.intValue() == 0){
-                        Status += "禁用";
-                    }
-                    if (tranStatus.intValue() == 1){
-                        Status += "启用";
-                    }
-                    map.put("orderType", orderType);
-                    map.put("Status",Status);
-                }
-            case 13:
-                break;
-            case 15:
-                if(mapValue.get("sporadicStatus") != null){
-                    //不查询订单id
-                    mapList = amstruckSporadicMaterialMapper.getSporadicOrdersList2(mapValue);
-                }else{
-                    //查询订单id
-                    mapList = amstruckSporadicOrderMapper.getSporadicOrdersList1(mapValue);
-                }
-                //没有承运商状态为3
-                if (DataChange.dataToBigDecimal(mapValue.get("sporadicStatus")).intValue()==3) {
-                    mapList =amstruckSporadicMaterialMapper.getSporadicOrdersList3(mapValue);
-                }
-                for (Map<String, Object> map1 : mapList) {
-                    BigDecimal type = (BigDecimal) map1.get("type");
-                    String orderType = "";
-                    if (type.intValue() == 15) {
-                        orderType += "普通零星进厂";
-                    }
-                    if (type.intValue() == 16) {
-                        orderType += "普通零星出厂";
-                    }
-                    map1.put("orderType", orderType);
-                }
-            case 16:
-                break;
+        //apiId：439
+        if (mapValue.get("sporadicStatus") != null) {
+            //走查询订单id的接口
+            mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
+        } else {
+            //不查询订单id的接口
+            mapList = amstruckSporadicMaterialMapper.getSporadicOrdersList4(mapValue);
+        }
+        for (Map<String, Object> map : mapList) {
+            BigDecimal type = (BigDecimal) map.get("type");
+            String orderType = "";
+            if (type.intValue() == 12) {
+                orderType += "零星进厂";
+            }
+            if (type.intValue() == 13) {
+                orderType += "零星出厂";
+            }
+            if (type.intValue() == 14) {
+                orderType += "中转";
+            }
+            if (type.intValue() == 19) {
+                orderType += "退货";
+            }
+            map.put("orderType", orderType);
         }
         return mapList;
     }
@@ -454,7 +416,10 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 //根据运输订单id查找订单信息
                 //生成新的订单
                 OmstruckOrder omstruckOrder=new OmstruckOrder();
+                //查找订单主表数据
                 Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
+                //查找订单子表数据
+                List<Map<String,Object>>materialList =amstruckSporadicOrderMapper.selectOrderMaterial(orderId);
                 BigDecimal carrierId =(BigDecimal) map2.get("carrierId");
                 if (carrierId!=null){
                     omstruckOrder.setCarrierId(carrierId);
@@ -477,16 +442,20 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 tmstruckTotalResult.setInsertUsername(userId);
                 result+=tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
                 //新增订单子表
-                OmstruckOrderMaterial omstruckOrderMaterial=new OmstruckOrderMaterial();
-                omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
-                omstruckOrderMaterial.setOrderId(omstruckOrder.getOrderId());
-                omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map2.get("materialId")));
-                omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map2.get("materialNumber")));
-                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map2.get("materialWeight")));
-                omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map2.get("materialPriority")));
-                omstruckOrderMaterial.setInsertTime(new Date());
-                omstruckOrderMaterial.setInsertUsername(userId);
-                omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+                for (Map<String,Object>materialMap:materialList
+                     ) {
+                    OmstruckOrderMaterial omstruckOrderMaterial=new OmstruckOrderMaterial();
+                    omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
+                    omstruckOrderMaterial.setOrderId(omstruckOrder.getOrderId());
+                    omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(materialMap.get("materialId")));
+                    omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(materialMap.get("materialNumber")));
+                    omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialMap.get("materialWeight")));
+                    omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(materialMap.get("materialPriority")));
+                    omstruckOrderMaterial.setInsertTime(new Date());
+                    omstruckOrderMaterial.setInsertUsername(userId);
+                    omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+                }
+
                 //设置运力id
                 Integer capacityId = (Integer) map1.get("capacityId");
                 omstruckOrder.setOrderId(orderId1);
@@ -501,28 +470,6 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
     }
 
 
-//    //内转零星停止
-//    @Override
-//    public int closeSporadicOrderInward(Map<String, Object> map) {
-//        int result=0;
-//        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
-//        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
-//        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
-//
-//        result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
-//        //查找零星订单下的所有未接收的运输订单
-//        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
-//        for (Map<String,Object> map1:stringObjectMap) {
-//            //获取零星订单关联的未接收的订单
-//            BigDecimal orderId =(BigDecimal) map1.get("orderId");
-//            OmstruckOrder omstruckOrder=new OmstruckOrder();
-//            omstruckOrder.setOrderId(orderId);
-//            omstruckOrder.setOrderStatus(new BigDecimal(8));
-//            result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-//        }
-//        return result;
-//
-//    }
 
 
     @Override
@@ -534,20 +481,19 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         amstruckSporadicOrder.setSporadicOrderTimes(new BigDecimal(0));
         amstruckSporadicOrder.setTransStatus(new BigDecimal(0));
         result += amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
-        //查找零星订单下的所有未接收的运输订单
-        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
-        for (Map<String, Object> map1 : stringObjectMap) {
-            //获取零星订单关联的未接收的订单
-            BigDecimal orderId = (BigDecimal) map1.get("orderId");
-            //获取零星订单关联的未接收的订单
-            OmstruckOrder omstruckOrder = new OmstruckOrder();
-            omstruckOrder.setOrderId(orderId);
-            omstruckOrder.setOrderStatus(new BigDecimal(8));
-            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-
-        }
         return result;
     }
+    //查看物资详情
+    @Override
+    public List<Map<String,Object>> getSporadic(Integer sporadicId) {
+        return amstruckSporadicMaterialMapper.getSporadic(sporadicId);
+    }
+
+    //查询零星订单下的运输订单
+    @Override
+    public List<Map<String, Object>> getSporadicOfOrder(Map<String, Object> mapValue) {
+        return amstruckSporadicMaterialMapper.getSporadicOfOrder(mapValue);
+    }
 }
 
 

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

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsContaactPriceMaterialMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    <id column="PRICE_MATERIAL_ID" jdbcType="DECIMAL" property="priceMaterialId" />
+    <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+  </resultMap>
+  <sql id="columns">
+    PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
+  </sql>
+  <sql id="columns_alias">
+    t.PRICE_MATERIAL_ID, t.PRICE_ID, t.MATERIAL_ID
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM AMS_CONTAACT_PRICE_MATERIAL
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM AMS_CONTAACT_PRICE_MATERIAL t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="priceMaterialId != null">
+        and PRICE_MATERIAL_ID = #{priceMaterialId}
+      </if>
+      <if test="priceId != null">
+        and PRICE_ID = #{priceId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="priceMaterialId != null">
+        and PRICE_MATERIAL_ID = #{priceMaterialId}
+      </if>
+      <if test="priceId != null">
+        and PRICE_ID = #{priceId}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMS_CONTAACT_PRICE_MATERIAL
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMS_CONTAACT_PRICE_MATERIAL
+    where 1!=1
+      <if test="priceId != null">
+        or PRICE_ID = #{priceId}
+      </if>
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    insert into AMS_CONTAACT_PRICE_MATERIAL (PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
+      )
+    values (#{priceMaterialId,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    insert into AMS_CONTAACT_PRICE_MATERIAL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="priceMaterialId != null">
+        PRICE_MATERIAL_ID,
+      </if>
+      <if test="priceId != null">
+        PRICE_ID,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="priceMaterialId != null">
+        #{priceMaterialId,jdbcType=DECIMAL},
+      </if>
+      <if test="priceId != null">
+        #{priceId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    update AMS_CONTAACT_PRICE_MATERIAL
+    set PRICE_ID = #{priceId,jdbcType=DECIMAL},
+      MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
+    update AMS_CONTAACT_PRICE_MATERIAL
+    <set>
+      <if test="priceId != null">
+        PRICE_ID = #{priceId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMS_CONTAACT_PRICE_MATERIAL
+      (PRICE_MATERIAL_ID,
+      PRICE_ID, MATERIAL_ID)
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.priceMaterialId,jdbcType=DECIMAL},
+      #{item.priceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update AMS_CONTAACT_PRICE_MATERIAL
+     set
+       PRICE_MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceMaterialId,jdbcType=DECIMAL}
+       </foreach>
+       ,PRICE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+     where PRICE_MATERIAL_ID in
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.priceMaterialId,jdbcType=DECIMAL}
+     </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMS_CONTAACT_PRICE_MATERIAL
+    where PRICE_MATERIAL_ID in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="getMaterialName" resultType="java.util.Map" parameterType="decimal">
+    select
+    rm.MATERIAL_NAME "materialName",
+    rm.MATERIAL_ID "materialId"
+    from AMS_CONTAACT_PRICE_MATERIAL acpr
+    left join RMS_MATERIAL RM
+    on rm.MATERIAL_ID = acpr.MATERIAL_ID
+    where PRICE_ID = #{priceId}
+  </select>
+</mapper>

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

@@ -878,4 +878,54 @@
     FROM AMS_CONTRACT_TRANSPORT_PRICE ACTP
     WHERE ACTP.PRICE_ID = #{priceId}
   </select>
+  <select id="getInwardContractPrice" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT *
+    FROM (SELECT a_t_price.PRICE_ID                  "priceId",
+                 r_o_type.OIL_TYPE_NAME              "oilTypeName",
+                 r_c_type.CAPACITY_TYPE_NAME         "capacityTypeName",
+                 a_t_price.PRICE_VALUE               "priceValue",
+                 a_t_price.PRICE_DATE                "priceDate",
+                 a_t_price.OILPRICE_BASE             "oilpriceBase",
+                 a_t_price.INSERT_TIME               "insertTime",
+                 a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
+                 RGR.TRANS_RANGE_VALUE               "transRange",
+                 a_t_price.TYPE                       "type"
+          FROM AMS_CONTRACT_TRANSPORT_PRICE a_t_price
+                 LEFT JOIN RMS_RECEIVE_PLACE rrp
+                           ON a_t_price.PLACE_ID = rrp.PLACE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS r_r_address
+                           ON rrp.ADDRESS_ID = r_r_address.ADDRESS_ID
+                 LEFT JOIN RMS_CAPACITY_TYPE r_c_type
+                           ON a_t_price.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
+                 LEFT JOIN RMS_CARRIER r_carrier
+                           ON a_t_price.CARRIER_ID = r_carrier.CARRIER_ID
+                 LEFT JOIN RMS_TRANS_RANGE RGR
+                           ON a_t_price.LINE_ID = RGR.TRANS_RANGE_ID
+                 LEFT JOIN RMS_OIL_TYPE r_o_type
+                           ON a_t_price.OIL_TYPE_ID = r_o_type.OIL_TYPE_ID
+        where TYPE in (2,5,6))
+  </select>
+    <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+      select * from (select
+      distinct
+      actp.price_id "priceId", actp.price_value "priceValue" ,actp.PRICE_DATE "priceDate"
+      from ams_contract_transport_price actp
+      left join ams_contaact_price_material acpm
+      on acpm.price_id = actp.price_id
+      left join rms_trans_range rtr
+      on rtr.trans_range_id = actp.line_id
+      where type = #{type}
+      and actp.DELETED = 0
+      <if test="rangeId != null">
+        and actp.LINE_ID = #{rangeId}
+      </if>
+      <if test="materialId != null">
+        and acpm.MATERIAL_ID = #{materialId}
+      </if>
+      <if test="capacityTypeId != null">
+        and actp.CAPACITY_TYPE_ID = #{capacityTypeId}
+      </if>
+      )
+      Order by "priceDate" desc
+    </select>
 </mapper>

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

@@ -507,7 +507,8 @@
     rsr.SHIPPER_ID   as   "receiverUnitId",
     apo.PUCHASE_ORDER_DELIVERY_DATE as "purchaseOrderDeliveryDate",
     apo.INSERT_UPDATE_REMARK as "insertUpdateRemark",
-    apo.PURCHASE_ORDER_ID as "purchaseOrderId"
+    apo.PURCHASE_ORDER_ID as "purchaseOrderId",
+    apo.PURCHASING_ORGANIZATION_ID  "orgId"
     FROM AMS_PURCHASE_ORDER apo
     LEFT JOIN DIL_BATCH db
     ON apo.BATCH_ID = db.BATCH_ID

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

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsSaleOrderCarrierMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsSaleOrderCarrier">
+    <id column="SALE_ORDER_CARRIER_ID" jdbcType="DECIMAL" property="saleOrderCarrierId" />
+    <result column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId" />
+    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+  </resultMap>
+  <sql id="columns">
+    SALE_ORDER_CARRIER_ID, SALE_ORDER_ID, CARRIER_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.SALE_ORDER_CARRIER_ID, t.SALE_ORDER_ID, t.CARRIER_ID, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM AMS_SALE_ORDER_CARRIER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM AMS_SALE_ORDER_CARRIER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="saleOrderCarrierId != null">
+        and SALE_ORDER_CARRIER_ID = #{saleOrderCarrierId}
+      </if>
+      <if test="saleOrderId != null">
+        and SALE_ORDER_ID = #{saleOrderId}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="saleOrderCarrierId != null">
+        and SALE_ORDER_CARRIER_ID = #{saleOrderCarrierId}
+      </if>
+      <if test="saleOrderId != null">
+        and SALE_ORDER_ID = #{saleOrderId}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMS_SALE_ORDER_CARRIER
+    where SALE_ORDER_CARRIER_ID = #{saleOrderCarrierId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMS_SALE_ORDER_CARRIER
+    where 1!=1 
+      <if test="saleOrderId != null">
+        or SALE_ORDER_ID = #{saleOrderId}
+      </if>
+      <if test="carrierId != null">
+        or CARRIER_ID = #{carrierId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrderCarrier">
+    insert into AMS_SALE_ORDER_CARRIER (SALE_ORDER_CARRIER_ID, SALE_ORDER_ID, 
+      CARRIER_ID, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    values (#{saleOrderCarrierId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, 
+      #{carrierId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{deleted,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrderCarrier">
+    insert into AMS_SALE_ORDER_CARRIER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="saleOrderCarrierId != null">
+        SALE_ORDER_CARRIER_ID,
+      </if>
+      <if test="saleOrderId != null">
+        SALE_ORDER_ID,
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="saleOrderCarrierId != null">
+        #{saleOrderCarrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="saleOrderId != null">
+        #{saleOrderId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrderCarrier">
+    update AMS_SALE_ORDER_CARRIER
+    set SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL},
+      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL}
+    where SALE_ORDER_CARRIER_ID = #{saleOrderCarrierId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrderCarrier">
+    update AMS_SALE_ORDER_CARRIER
+    <set>
+      <if test="saleOrderId != null">
+        SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where SALE_ORDER_CARRIER_ID = #{saleOrderCarrierId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where SALE_ORDER_CARRIER_ID = #{saleOrderCarrierId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMS_SALE_ORDER_CARRIER 
+      (SALE_ORDER_CARRIER_ID, 
+      SALE_ORDER_ID, CARRIER_ID, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.saleOrderCarrierId,jdbcType=DECIMAL}, 
+      #{item.saleOrderId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update AMS_SALE_ORDER_CARRIER
+     set
+       SALE_ORDER_CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.saleOrderCarrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,SALE_ORDER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_CARRIER_ID" separator=" ">
+          when #{item.saleOrderCarrierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+     where SALE_ORDER_CARRIER_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.saleOrderCarrierId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMS_SALE_ORDER_CARRIER
+    where SALE_ORDER_CARRIER_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="getAmsSaleOrderCarrier" resultMap="BaseResultMap">
+    SELECT <include refid="columns" /> FROM AMS_SALE_ORDER_CARRIER where SALE_ORDER_ID=#{saleOrderId} and CARRIER_ID=#{carrierId}
+  </select>
+  
+</mapper>

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

@@ -665,6 +665,18 @@
       order by "insertTime" desc
     </if>
   </sql>
+  <!--根据销售订单号排序-->
+  <sql id="orderBy1">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "saleNumber" desc
+    </if>
+  </sql>
   <select id="getSaleOrderInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -1905,7 +1917,7 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+    <include refid="orderBy1"></include>
   </select>
 
   <select id="getAmsSaleOrderApprovedes" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
@@ -2027,6 +2039,120 @@
   </select>
 
   <select id="getSaleOrderAndMaterialById" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT *
+    FROM (
+    select ASO.SALE_ORDER_ID                              as "saleOrderId",
+    ASM.SALE_MATERIAL_ID                           as "saleMaterialId",
+    RM.MATERIAL_ID                                 as "materialId",
+    ASO.SALE_NUMBER                                as "saleNumber",
+    ASO.SALE_ORDER_ISSELF_MENTION                  as "saleOrderIsselfMention",
+    RS.SHIPPER_NAME                                as "shipperName",
+    RC.CONSIGNEE_COMPANY_NAME                      as "consigneeCompanyName",
+    RM.MATERIAL_NAME                               as "materialName",
+    ASM.MATERIAL_NUMBER                            as "materialNumber",
+    ASM.MATERIAL_WEIGHT                            as "materialWeight",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL as "specificationModel",
+    RM.MATERIAL_CODE                               as "materialCode",
+    nvl(sumWeight.weight,0)+nvl(sumWeight2.weight,0)             as "totalWeight",
+    nvl(sumWeight.weight ,0)                              as "netWeight",
+    nvl(sumWeight2.weight ,0)                              as "weight",
+    nvl(carCount.coun ,0)                                   as "carCount"
+    from AMS_SALE_ORDER ASO
+    left join RMS_SHIPPER RS
+    on ASO.SHIPPER_ID = RS.SHIPPER_ID
+    left join RMS_CONSIGNEE RC
+    on ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+    left join AMS_SALE_MATERIAL ASM
+    on ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+    left join RMS_MATERIAL RM
+    on RM.MATERIAL_ID = ASM.MATERIAL_ID
+    left join (
+    select sum( t_w_result.RESULT_NET_WEIGHT)  weight,a_s_o_material.SALE_ORDER_ID SALE_ORDER_ID
+    from AMS_SALE_ORDER_MATERIAL a_s_o_material
+    left join Omstruck_Order o_order
+    on a_s_o_material.SALE_ORDER_MATERIAL_ID=o_order.order_plan_id
+    left join Tmstruck_Total_Result t_t_result
+    on o_order.order_id=t_t_result.order_id
+    left join Tmstruck_Weight_Result t_w_result
+    on t_t_result.result_total_id=t_w_result.result_total_id
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+  
+    ) sumWeight
+    on sumWeight.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+    left join (
+    select sum( o_o_material.ORDER_MATERIAL_WEIGHT)  weight,a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
+    from AMS_SALE_ORDER_MATERIAL a_s_o_material
+    left join Omstruck_Order o_order
+    on a_s_o_material.SALE_ORDER_MATERIAL_ID=o_order.order_plan_id
+    left join Tmstruck_Total_Result t_t_result
+    on o_order.order_id=t_t_result.order_id
+    left join Tmstruck_Weight_Result t_w_result
+    on t_t_result.result_total_id=t_w_result.result_total_id
+    left join OMSTRUCK_ORDER_MATERIAL o_o_material
+    on o_order.order_id=o_o_material.ORDER_ID
+    where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status !=8
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+  
+    ) sumWeight2
+    on sumWeight2.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+    left join (
+    select count(o_order.order_id)  coun ,a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
+    from AMS_SALE_ORDER_MATERIAL a_s_o_material
+    left join Omstruck_Order o_order
+    on a_s_o_material.SALE_ORDER_MATERIAL_ID=o_order.order_plan_id
+    left join Tmstruck_Total_Result t_t_result
+    on o_order.order_id=t_t_result.order_id
+    left join Tmstruck_Weight_Result t_w_result
+    on t_t_result.result_total_id=t_w_result.result_total_id
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+  
+    ) carCount
+    on carCount.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+    where ASO.SALE_ORDER_ID = #{saleOrderId}
+    )
+    <where>
+      <if test="saleNumber != null">
+        and
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="shipperName != null">
+        and
+        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+          "shipperName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeCompanyName != null">
+        and
+        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+          "consigneeCompanyName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialName != null">
+        and
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="specificationModel != null">
+        and
+        <foreach collection="specificationModel" item="item" open="(" separator="or" close=")">
+          "specificationModel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialCode != null">
+        and
+        <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+          "materialCode" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+  </select>
+  <select id="getSaleOrderAndMaterialById2" resultType="java.util.Map" parameterType="java.util.Map">
     SELECT *
     FROM (
     select ASO.SALE_ORDER_ID                              as "saleOrderId",
@@ -2324,6 +2450,127 @@
     order by "updateTime" DESC
   </select>
 
+  <select id="getSaleOrderListByCarrierSsoId" resultType="java.util.Map">
+    select * from(
+    select a_s_order.SALE_ORDER_ID "saleOrderId",
+    a_s_order.SALE_NUMBER "saleNumber",
+    r_shipper.SHIPPER_NAME "shipperName",
+    r_consignee.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+    r_consignee.CONSIGNEE_WARRANTY_AMOUNT "consigneeWarrantyAmount",
+    r_consignee.CONSIGNEE_WARRANTY_WEIGHT "consigneeWarrantyWeight",
+    a_s_order.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
+    a_s_order.SALE_ACCOUNT_BALANCE "saleAccountBalance",
+    a_s_order.SALE_CURRENT_ORDER_AMOUNT "saleCurrentOrderAmount",
+    a_s_order.SALE_HISTORICAL_ORDER_AMOUNT "saleHistoricalOrderAmout",
+    a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
+    a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
+    a_s_order.SALE_ORDER_TAX "saleOrderTax",
+    a_s_order.SALE_REMARK "saleRemark",
+    a_s_order.INSERT_TIME "insertTime",
+    a_s_order.SALE_ORDER_STATUS "saleOrderStatus",
+    a_s_order.SALE_ORDER_STATUS "statusStr",
+    a_s_order.INSERT_UPDATE_REMARK "materialName"
+    from AMS_SALE_ORDER_CARRIER a_s_o_carrier
+    left join RMS_CARRIER r_carrier
+    on r_carrier.CARRIER_ID=a_s_o_carrier.CARRIER_ID
+    left join AMS_SALE_ORDER a_s_order
+    on a_s_o_carrier.SALE_ORDER_ID=a_s_order.SALE_ORDER_ID
+    left join RMS_SHIPPER r_shipper
+    on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
+    left join RMS_CONSIGNEE r_consignee
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
+    where a_s_order.SALE_ORDER_STATUS in (2,4)
+    and a_s_order.CLOSE_STATUS is null
+    and a_s_order.DELETED = 0
+    <if test="carrierSsoId != null">
+      and r_carrier.CARRIER_SSO_ID=#{carrierSsoId}
+    </if>
+    <if test="con != null">
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+    </if>
+    )
+    <where>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="shipperName != null">
+        and
+        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+          "shipperName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeCompanyName != null">
+        and
+        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+          "consigneeCompanyName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        and
+        <foreach collection="consigneeWarrantyAmount" item="item" open="(" separator="or" close=")">
+          "consigneeWarrantyAmount" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeWarrantyWeight != null">
+        and
+        <foreach collection="consigneeWarrantyWeight" item="item" open="(" separator="or" close=")">
+          "consigneeWarrantyWeight" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderIsselfMention != null">
+        and
+        <foreach collection="saleOrderIsselfMention" item="item" open="(" separator="or" close=")">
+          "saleOrderIsselfMention" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleAccountBalance != null">
+        and
+        <foreach collection="saleAccountBalance" item="item" open="(" separator="or" close=")">
+          "saleAccountBalance" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleCurrentOrderAmount != null">
+        and
+        <foreach collection="saleCurrentOrderAmount" item="item" open="(" separator="or" close=")">
+          "saleCurrentOrderAmount" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleHistoricalOrderAmout != null">
+        and
+        <foreach collection="saleHistoricalOrderAmout" item="item" open="(" separator="or" close=")">
+          "saleHistoricalOrderAmout" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderReceiveCustomer != null">
+        and
+        <foreach collection="saleOrderReceiveCustomer" item="item" open="(" separator="or" close=")">
+          "saleOrderReceiveCustomer" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleUnitPrice != null">
+        and
+        <foreach collection="saleUnitPrice" item="item" open="(" separator="or" close=")">
+          "saleUnitPrice" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderTax != null">
+        and
+        <foreach collection="saleOrderTax" item="item" open="(" separator="or" close=")">
+          "saleOrderTax" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleRemark != null">
+        and
+        <foreach collection="saleRemark" item="item" open="(" separator="or" close=")">
+          "saleRemark" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderBy1"></include>
+  </select>
+
   <select id="getSteelTruckNoList" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT *
     FROM (
@@ -2681,5 +2928,8 @@
       </if>
     </where>
     <include refid="orderBy"></include>
+=======
+    <include refid="orderBy1"></include>
+>>>>>>> f36fb0a3f2cae1d4e5eaad238e97387b5a8882a2
   </select>
 </mapper>

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

@@ -457,6 +457,7 @@
         AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
         AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        RTR.TRANS_RANGE_VALUE              AS "rangeValue",
         AIP.PLAN_ID                        AS "planId",
         AIP.INSERT_TIME                    AS "insertTime",
         RS.SHIPPER_NAME                    AS "shipperName"
@@ -469,13 +470,14 @@
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
         LEFT JOIN RMS_SHIPPER RS
         ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE AIP.PLAN_STATUS = #{planStatus}
         AND AIP.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         )
         <where>
             <if test="purchaseOrderNo != null">
-                and
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
                     "purchaseOrderNo" like '%${item}%'
                 </foreach>
@@ -576,24 +578,37 @@
 
     <!-- 展示运输计划 -->
     <select id="getIssuedPlanList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT *
-        FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
-        RCA.CARRIER_NAME                   AS "carrierName",
-        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
-        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
-        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
-        AIR.REQUIREMENT_TYPE               AS "requirementType",
-        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        select *
+        from (SELECT AIP.PLAN_NUMBER AS "planNumber",
+        RCA.CARRIER_NAME AS "carrierName",
+        RTR.TRANS_RANGE_VALUE  AS "rangeValue",
+        AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME AS "planIssueName",
+        AIR.REQUIREMENT_TYPE AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIR.REQUIREMENT_ID                 AS "requirementId",
-        AIP.PLAN_ID                        AS "planId",
-        AIP.CARRIER_ID                     AS "carrierId",
-        AIP.INSERT_TIME                    AS "insertTime",
-        RS.SHIPPER_NAME                    AS "shipperName"
+        AIR.REQUIREMENT_ID AS "requirementId",
+        AIP.PLAN_ID AS "planId",
+        AIP.CARRIER_ID AS "carrierId",
+        AIP.INSERT_TIME AS "insertTime",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.DUE_DATE AS "dueDate",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        rw1.warehouse_name "unloadName",
+        rw1.WAREHOUSE_ID "unloadId",
+        rw2.warehouse_name "loadName",
+        rw2.WAREHOUSE_ID "loadId",
+        arm.material_weight "materialWeight",
+        arm.material_count "materialCount",
+        arm.MATERIAL_ID "materialId",
+        rm.material_name || rm.material_specification || '(' ||
+        rm.material_model || ')' "materialName",
+        AIR.INSERT_UPDATE_REMARK "Tel"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID
@@ -603,7 +618,17 @@
         ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
-        WHERE  AIP.DELETED = 0
+        LEFT JOIN amstruck_requirement_material arm
+        ON air.requirement_id = arm.requirement_id
+        LEFT JOIN rms_warehouse rw1
+        ON rw1.warehouse_id = arm.requirement_unload_unit_id
+        LEFT JOIN rms_warehouse rw2
+        ON rw2.warehouse_id = arm.requirement_platform_id
+        LEFT JOIN rms_material rm
+        ON rm.material_id = arm.material_id
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        WHERE AIP.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="planId != null">
             and AIP.PLAN_ID = #{planId}
@@ -620,44 +645,46 @@
             and AIP.PLAN_STATUS in (1,2)
         </if>
         <if test="planStatus == 4">
-            and AIP.PLAN_STATUS = 4
+            and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.DUE_DATE
         </if>
         <if test="planStatus == 2">
             and AIP.PLAN_STATUS = 2
         </if>
         <if test="planStatus == 3">
-            and AIP.PLAN_STATUS = 3
+            and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.DUE_DATE
         </if>
         )
         <where>
-            <if test="purchaseOrderNo != null">
-                and
-                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                    "purchaseOrderNo" like '%${item}%'
+            <if test="planNumber != null">
+                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
+                    "planNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="materialName != null">
-                and
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">
                     "materialName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="materialNumber != null">
-                and
-                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
-                    "materialNumber" like '%${item}%'
+            <if test="loadName != null">
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="materialWeight != null">
+            <if test="unloadName != null">
+                <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
+                    "unloadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
                 and
-                <foreach collection="materialWeight" item="item" open="(" separator="or" close=")">
-                    "materialWeight" like '%${item}%'
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultForeignShipName != null">
+            <if test="planTruckNumber != null">
                 and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" like '%${item}%'
+                <foreach collection="planTruckNumber" item="item" open="(" separator="or" close=")">
+                    "planTruckNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="requirementNumber != null">
@@ -666,28 +693,16 @@
                     "requirementNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="requirementType != null">
-                and
-                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
-                    "requirementType" like '%${item}%'
-                </foreach>
-            </if>
             <if test="planIssueTime != null">
                 and
                 <foreach collection="planIssueTime" item="item" open="(" separator="or" close=")">
                     "planIssueTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="planIssueName != null">
-                and
-                <foreach collection="planIssueName" item="item" open="(" separator="or" close=")">
-                    "planIssueName" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="capacityTypeName != null">
+            <if test="requirementType != null">
                 and
-                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
-                    "capacityTypeName" like '%${item}%'
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
                 </foreach>
             </if>
             <if test="requirementTruckTime != null">
@@ -696,58 +711,61 @@
                     "requirementTruckTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="requirementWorkType != null">
-                and
-                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
-                    "requirementWorkType" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementWorkContent != null">
-                and
-                <foreach collection="requirementWorkContent" item="item" open="(" separator="or" close=")">
-                    "requirementWorkContent" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementWorkEnvironment != null">
-                and
-                <foreach collection="requirementWorkEnvironment" item="item" open="(" separator="or" close=")">
-                    "requirementWorkEnvironment" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementEstimatedDuration != null">
-                and
-                <foreach collection="requirementEstimatedDuration" item="item" open="(" separator="or" close=")">
-                    "requirementEstimatedDuration" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="planNumber != null">
-                and
-                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
-                    "planNumber" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="carrierName != null">
+            <if test="insertTime != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="planTruckNumber != null">
+            <if test="shipperName != null">
                 and
-                <foreach collection="planTruckNumber" item="item" open="(" separator="or" close=")">
-                    "planTruckNumber" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="wareHouseName != null">
-                and
-                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
-                    "wareHouseName" like '%${item}%'
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
                 </foreach>
             </if>
         </where>
         <include refid="orderBy"></include>
     </select>
 
+    <select id="getIssuedPlanList2" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        RTR.TRANS_RANGE_VALUE              AS "rangeValue",
+        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
+        AIP.PLAN_ID                        AS "planId",
+        AIP.CARRIER_ID                     AS "carrierId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        RS.SHIPPER_NAME                    AS "shipperName"
+        FROM AMSTRUCK_INWARD_PLAN AIP
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        WHERE  AIP.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
+        <if test="planId != null">
+            and AIP.PLAN_ID = #{planId}
+        </if>
+        )
+    </select>
+
     <sql id="orderBy">
         <if test="orderField != null and orderField != ''">
             order by "${orderField}"
@@ -779,4 +797,26 @@
                RC.CARRIER_NAME AS "label"
         FROM RMS_CARRIER RC
     </select>
+    <select id="getPlanOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select RC.CAPACITY_ID     "capacityId",
+               rc.capacity_number "capacityNumber",
+               oo.order_number    "orderNumber",
+               oo.order_id        "orderId"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join amstruck_inward_plan aip
+                           on aip.plan_id = oo.order_plan_id
+                 left join amstruck_requirement_plan arp
+                           on arp.plan_id = aip.plan_id
+                 left join amstruck_inward_requirement air
+                           on air.requirement_id = arp.requirement_id
+        where    oo.order_status = #{orderStatus}
+        <if test="planId != null  ">
+            and aip.plan_id = #{planId}
+        </if>
+        <if test="requirementId != null  ">
+            and air.requirement_id = #{requirementId}
+        </if>
+    </select>
 </mapper>

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

@@ -27,23 +27,24 @@
         <result column="REQUIREMENT_PLATFORM_ID" jdbcType="DECIMAL" property="requirementPlatformId" />
         <result column="REQUIREMENT_LINK_TYPE" jdbcType="DECIMAL" property="requirementLinkType" />
         <result column="DUE_DATE" jdbcType="TIMESTAMP" property="dueDate" />
+        <result column="IS_MINERAL" jdbcType="VARCHAR" property="isMineral" />
     </resultMap>
     <sql id="columns">
-        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID,
-    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT,
-    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT,
-    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
-    REQUIREMENT_LINK_TYPE, DUE_DATE
+        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID, 
+    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT, 
+    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT, 
+    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID, 
+    REQUIREMENT_LINK_TYPE, DUE_DATE, IS_MINERAL
     </sql>
     <sql id="columns_alias">
-        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE,
-    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE,
-    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION,
-    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE,
-    t.DUE_DATE
+        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE, 
+    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE, 
+    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION, 
+    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
+    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE, 
+    t.DUE_DATE, t.IS_MINERAL
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_INWARD_REQUIREMENT
@@ -128,6 +129,9 @@
             <if test="dueDate != null">
                 and TO_CHAR(DUE_DATE,'yyyy-MM-dd') = #{dueDate}
             </if>
+            <if test="isMineral != null and isMineral != ''">
+                and IS_MINERAL = #{isMineral}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -207,9 +211,12 @@
             <if test="dueDate != null">
                 and TO_CHAR(DUE_DATE,'yyyy-MM-dd') = #{dueDate}
             </if>
+            <if test="isMineral != null and isMineral != ''">
+                and IS_MINERAL LIKE '%${isMineral}%'
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="decimal">
         delete from AMSTRUCK_INWARD_REQUIREMENT
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </delete>
@@ -288,6 +295,9 @@
         <if test="dueDate != null">
             or TO_CHAR(DUE_DATE,'yyyy-MM-dd') = '#{dueDate}'
         </if>
+        <if test="isMineral != null and isMineral != ''">
+            or IS_MINERAL = #{isMineral}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT (REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER,
@@ -299,7 +309,7 @@
                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                  INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID,
                                                  REQUIREMENT_PLATFORM_ID, REQUIREMENT_LINK_TYPE,
-                                                 DUE_DATE)
+                                                 DUE_DATE, IS_MINERAL)
         values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{requirementNumber,jdbcType=VARCHAR},
                 #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL}, #{requirementTruckTime,jdbcType=TIMESTAMP},
                 #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=VARCHAR},
@@ -309,7 +319,7 @@
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{requirementUnloadUnitId,jdbcType=DECIMAL},
                 #{requirementPlatformId,jdbcType=DECIMAL}, #{requirementLinkType,jdbcType=DECIMAL},
-                #{dueDate,jdbcType=TIMESTAMP})
+                #{dueDate,jdbcType=TIMESTAMP}, #{isMineral,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT
@@ -389,6 +399,9 @@
             <if test="dueDate != null">
                 DUE_DATE,
             </if>
+            <if test="isMineral != null">
+                IS_MINERAL,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="requirementId != null">
@@ -466,6 +479,9 @@
             <if test="dueDate != null">
                 #{dueDate,jdbcType=TIMESTAMP},
             </if>
+            <if test="isMineral != null">
+                #{isMineral,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -493,7 +509,8 @@
             REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
             REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
             REQUIREMENT_LINK_TYPE = #{requirementLinkType,jdbcType=DECIMAL},
-            DUE_DATE = #{dueDate,jdbcType=TIMESTAMP}
+            DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
+            IS_MINERAL = #{isMineral,jdbcType=VARCHAR}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -571,10 +588,13 @@
             <if test="dueDate != null">
                 DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
             </if>
+            <if test="isMineral != null">
+                IS_MINERAL = #{isMineral,jdbcType=VARCHAR},
+            </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
         <include refid="select" />
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </select>
@@ -600,8 +620,8 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
         REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
-        REQUIREMENT_LINK_TYPE, DUE_DATE
-        )
+        REQUIREMENT_LINK_TYPE, DUE_DATE,
+        IS_MINERAL)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.requirementId,jdbcType=DECIMAL},
@@ -616,8 +636,8 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL},
-        #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP}
-        from dual
+        #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP},
+        #{item.isMineral,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -723,6 +743,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.dueDate,jdbcType=TIMESTAMP}
         </foreach>
+        ,IS_MINERAL=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.isMineral,jdbcType=VARCHAR}
+        </foreach>
         where REQUIREMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.requirementId,jdbcType=DECIMAL}
@@ -735,32 +759,52 @@
             #{id}
         </foreach>
     </delete>
-    <!-- 友情提示！！！-->
-
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT * FROM
-        (SELECT AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        AIR.REQUIREMENT_TYPE               AS "requirementType",
-        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        RTR.TRANS_RANGE_VALUE   AS "rangeValue",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
-        RS.SHIPPER_NAME                    AS "shipperName",
-        AIR.INSERT_TIME                    AS "insertTime",
-        AIR.INSERT_USERNAME                AS "insertUsername",
-        AIR.REQUIREMENT_ID                 AS "requirementId"
-        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        WHERE  AIR.DELETED = 0
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.DUE_DATE AS "dueDate",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        rw1.warehouse_name "unloadName",
+        rw1.WAREHOUSE_ID "unloadId",
+        rw2.warehouse_name "loadName",
+        rw2.WAREHOUSE_ID "loadId",
+        arm.material_weight "materialWeight",
+        arm.material_count "materialCount",
+        arm.MATERIAL_ID "materialId",
+        rm.material_name || rm.material_specification || '(' || rm.material_model || ')' "materialName",
+        AIR.INSERT_UPDATE_REMARK "Tel"
+        FROM
+        AMSTRUCK_INWARD_REQUIREMENT AIR
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id
+        LEFT JOIN rms_warehouse rw1 ON rw1.warehouse_id = arm.requirement_unload_unit_id
+        LEFT JOIN rms_warehouse rw2 ON rw2.warehouse_id = arm.requirement_platform_id
+        LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
+        LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        WHERE
+        AIR.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
-        <if test="orgCode !=null ">
-            AND AIR.INSERT_USERNAME = #{orgCode}
+        <if test="con !=null ">
+            AND AIR.INSERT_USERNAME LIKE #{con}
         </if>
         <if test="requirementStatus ==0 ">
             AND AIR.REQUIREMENT_STATUS = 0
@@ -824,6 +868,12 @@
                     "wareHouseName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="dueDate != null">
+                and
+                <foreach collection="dueDate" item="item" open="(" separator="or" close=")">
+                    "dueDate" like '%${item}%'
+                </foreach>
+            </if>
             <if test="insertTime != null">
                 and
                 <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
@@ -841,34 +891,51 @@
     </select>
     <!-- 展示用车需求 -->
     <select id="getFinishTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT * FROM
-        (SELECT AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        AIR.REQUIREMENT_TYPE               AS "requirementType",
-        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE AS "requirementType",
+        RTR.TRANS_RANGE_VALUE AS "rangeValue",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
-        RS.SHIPPER_NAME                    AS "shipperName",
-        AIR.INSERT_TIME                    AS "insertTime",
-        AIR.INSERT_USERNAME                AS "insertUsername",
-        AIR.REQUIREMENT_ID                 AS "requirementId",
-        AIR.UPDATE_TIME                    AS "updateTime",
-        AIR.UPDATE_USERNAME                AS "updateUserName"
-        FROM (SELECT AIR2.REQUIREMENT_ID
-        FROM AMSTRUCK_INWARD_REQUIREMENT AIR2
-        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-        ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-        WHERE ARP.PLAN_ID IS NULL) AIRP
-        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-        ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        AIR.UPDATE_TIME AS "updateTime",
+        AIR.DUE_DATE AS "dueDate",
+        AIR.UPDATE_USERNAME AS "updateUserName",
+        rw1.warehouse_name "unloadName",
+        rw1.WAREHOUSE_ID "unloadId",
+        rw2.warehouse_name "loadName",
+        rw2.WAREHOUSE_ID "loadId",
+        arm.material_weight "materialWeight",
+        arm.material_count "materialCount",
+        arm.MATERIAL_ID "materialId",
+        rm.material_name || rm.material_specification || '(' || rm.material_model || ')' "materialName",
+        AIR.INSERT_UPDATE_REMARK "Tel"
+        FROM
+        ( SELECT AIR2.REQUIREMENT_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id
+        LEFT JOIN rms_warehouse rw1 ON rw1.warehouse_id = arm.requirement_unload_unit_id
+        LEFT JOIN rms_warehouse rw2 ON rw2.warehouse_id = arm.requirement_platform_id
+        LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
+        LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        WHERE
+        AIR.REQUIREMENT_STATUS = #{ requirementStatus }
         AND AIR.DELETED = 0
-        <if test="orgCode !=null ">
-            AND AIR.INSERT_USERNAME = #{orgCode}
+        <if test="con !=null ">
+            AND AIR.INSERT_USERNAME LIKE #{con}
         </if>
         )
         <where>
@@ -950,6 +1017,12 @@
                     "insertTime" like '%${item}%'
                 </foreach>
             </if>
+            <if test="dueDate != null">
+                and
+                <foreach collection="dueDate" item="item" open="(" separator="or" close=")">
+                    "dueDate" like '%${item}%'
+                </foreach>
+            </if>
             <if test="insertUsername != null">
                 and
                 <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
@@ -1158,6 +1231,7 @@
         SELECT
         AIR.REQUIREMENT_ID "requirementId",
         AIP.PLAN_ID "planId",
+        RTR.TRANS_RANGE_VALUE "rangeValue",
         APO.PURCHASE_ORDER_ID "purchaseOrderId",
         AIR.REQUIREMENT_NUMBER    "requirementNo",
         APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
@@ -1189,6 +1263,8 @@
         ON AIP.PLAN_ID = ARP.PLAN_ID
         LEFT JOIN RMS_CARRIER RCR
         ON RCR.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE AIR.PURCHASE_ORDER_ID IS NOT NULL
         AND AIR.REQUIREMENT_STATUS = #{requirementStatus}
         AND AIR.DELETED = 0

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

@@ -400,7 +400,7 @@
     RMS_MATERIAL RM
     ON
     OOM.MATERIAL_ID = RM.MATERIAL_ID
-    WHERE OO.ORDER_TYPE in (15,16)
+    WHERE OO.ORDER_TYPE in (15,16,19)
     AND ASO.ISSUE_STATUS =1
     AND ASO.DELETED = 0
     <if test="dispatchStatus != null">
@@ -459,8 +459,9 @@
   RCA.CARRIER_NAME AS "carrierName",
   ASO.INSERT_TIME AS "insertTime",
   OO.ORDER_TYPE AS "type",
-  RM.MATERIAL_NAME "materialName",
-  ASO.TRANS_STATUS "transStatus"
+  ASO.TRANS_STATUS "transStatus",
+  ASO.SPORADIC_ORDER_TIMES "orderTimes",
+  ASO.SPORADIC_TRANS_TIMES "transTimes"
   FROM AMSTRUCK_SPORADIC_ORDER ASO
   LEFT JOIN RMS_CONSIGNEE RCO
   ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -470,15 +471,9 @@
   ON RCA.CARRIER_ID = ASO.CARRIER_ID
   LEFT JOIN OMSTRUCK_ORDER OO
   ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-  LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-  ON
-  OOM.ORDER_ID = OO.ORDER_ID
-  LEFT JOIN RMS_MATERIAL RM
-  ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-  WHERE OO.ORDER_TYPE in (12,13)
+  WHERE OO.ORDER_TYPE in (12,13,14,19)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
-  AND ASO.TRANS_STATUS=1
   <if test="userId!=null">
     and ASO.INSERT_USERNAME=#{userId}
   </if>
@@ -553,7 +548,7 @@
     RMS_MATERIAL RM
     ON
     OOM.MATERIAL_ID = RM.MATERIAL_ID
-    WHERE OO.ORDER_TYPE in (15,16)
+    WHERE OO.ORDER_TYPE in (15,16,19)
     AND ASO.ISSUE_STATUS =1
     AND ASO.DELETED = 0
     AND  ASO.CARRIER_ID IS  NULL
@@ -601,8 +596,37 @@
     </where>
     <include refid="orderBy"></include>
   </select>
-
-
+  <select id="getSporadic" resultType="java.util.LinkedHashMap" parameterType="java.lang.Integer">
+    select RM.MATERIAL_NAME "materialName",
+           RM.MATERIAL_ID "materialId",
+           OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+           RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+           OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+           OOM.MATERIAL_PRIORITY "materialPriority"
+    from AMSTRUCK_SPORADIC_ORDER ASO
+           LEFT JOIN OMSTRUCK_ORDER OO
+                     ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+           LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                     ON OOM.ORDER_ID = OO.ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+    WHERE ASO.SPORADIC_ORDER_ID = #{sporadicId}
+      AND OO.CAPACITY_ID IS NULL
+    ORDER BY OOM.MATERIAL_PRIORITY
+  </select>
+  <select id="getSporadicOfOrder" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+    select OO.ORDER_NUMBER              "orderNum",
+           RC.CAPACITY_NUMBER           "capacityNum",
+           OO.ORDER_LINE_SEQUENCE       "orderLineSqe",
+           OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveTime"
+    from OMSTRUCK_ORDER OO
+           LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
+                     ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+           LEFT JOIN RMS_CAPACITY RC
+                     ON RC.CAPACITY_ID = OO.CAPACITY_ID
+    WHERE OO.CAPACITY_ID IS NOT NULL
+      AND ASO.SPORADIC_ORDER_ID = #{sporadicId}
+  </select>
 
 
   <!-- 排序 -->

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

@@ -526,7 +526,6 @@
         OO.ORDER_TYPE AS "type",
         OO.ORDER_ID "orderId",
         OO.ORDER_STATUS "orderStatus",
-        RM.MATERIAL_NAME "materialName",
         ASO.TRANS_STATUS "transStatus"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
@@ -537,15 +536,9 @@
         ON RCA.CARRIER_ID = ASO.CARRIER_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
-        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-        ON
-        OOM.ORDER_ID = OO.ORDER_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-        WHERE OO.ORDER_TYPE in (12,13)
+        WHERE OO.ORDER_TYPE in (12,13,14,19)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
-        and   ASO.TRANS_STATUS =1
         <if test="userId!=null">
             and ASO.INSERT_USERNAME=#{userId}
         </if>
@@ -624,7 +617,7 @@
         RMS_MATERIAL RM
         ON
         OOM.MATERIAL_ID = RM.MATERIAL_ID
-        WHERE OO.ORDER_TYPE in (15,16)
+        WHERE OO.ORDER_TYPE in (15,16,19)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
         <if test="dispatchStatus != null">
@@ -737,15 +730,9 @@
                OO.ORDER_NUMBER "orderNumber",
                OO.LINE_ID "lineId",
                OO.ORDER_LINE_SEQUENCE "lineSqe",
-               OOM.MATERIAL_ID "materialId",
-               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
-               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
-               OOM.MATERIAL_PRIORITY "materialPriority",
                OO.ORDER_TYPE "orderType",
                OO.CARRIER_ID "carrierId"
         from OMSTRUCK_ORDER OO
-                 left join OMSTRUCK_ORDER_MATERIAL OOM
-                           on OO.ORDER_ID=OOM.ORDER_ID
         where OO.ORDER_ID=#{orderId}
     </select>
 
@@ -755,5 +742,16 @@
         from OMSTRUCK_ORDER OO
         where OO.ORDER_STATUS=4 AND OO.ORDER_PLAN_ID=#{sporadicOrderId}
     </select>
+    <select id="selectOrderMaterial" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select
+               OOM.MATERIAL_ID "materialId",
+               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               OOM.MATERIAL_PRIORITY "materialPriority"
+        from OMSTRUCK_ORDER OO
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OO.ORDER_ID=OOM.ORDER_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
 
 </mapper>