Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -474,10 +474,14 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            String consigneeSsoId){
+                                            String consigneeSsoId,
+                                            String con){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
+        if (con != null && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con",con);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
@@ -493,10 +497,14 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                 Integer apiId,
                                                 Integer pageNum,
                                                 Integer pageSize,
-                                                String consigneeSsoId){
+                                                String consigneeSsoId,
+                                                String con){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
+        if (con != null && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con",con);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
@@ -507,7 +515,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @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")
+            @ApiImplicitParam(name = "apiId", value = "409/475", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getSaleOrderListBySaleCompanyes")
     public RESTfulResult getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -673,7 +681,12 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @PostMapping("/dispatchSteelOrder")
     public RESTfulResult dispatchSteelOrder(@RequestBody List<Map<String,Object>> mapList) {
         int result = amsSaleOrderService.dispatchSteelOrder(mapList);
-        return success(result);
+        if (result == 0) {
+            return failed("匹配不到车牌号！");
+        }
+        else {
+            return success(result);
+        }
     }
 
     @ApiModelProperty(value = "根据详细地址匹配承运商")
@@ -711,7 +724,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          String carrierSsoId,
                                                          String con) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
-            mapValue.put("con", con);
+            mapValue.put("con","%" + con + "%");
         }
         if ((carrierSsoId != null && !"".equals(carrierSsoId)) && !"undefined".equals(carrierSsoId) && !"null".equals(carrierSsoId)) {
             mapValue.put("carrierSsoId",carrierSsoId);
@@ -851,7 +864,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @ApiModelProperty(value = "新增钒渣销售订单")
     @PostMapping("/addVanadiumSaleOrder")
     public RESTfulResult addVanadiumSaleOrder(@RequestBody Map<String,Object> mapValue) {
-        int result = amsSaleOrderService.addSteelSaleOrder(mapValue);
+        int result = amsSaleOrderService.addVanadiumSaleOrder(mapValue);
         return success(result);
     }
 
@@ -868,4 +881,93 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         String driverTel = amsSaleOrderService.matchingDriverTelRecently(capacityNumber);
         return success(driverTel);
     }
+
+    /**
+     * 查询内转焦炭订单
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value = "查询内转焦炭订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "查询内转焦炭订单", required = false, dataType = "java.util.Map"),
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/getCokeInwardOrderList")
+    public RESTfulResult getCokeInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderStatus,
+                                               String con) {
+        if (con != null && !con.equals("undefined") && !con.equals("null")) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        if (orderStatus != null) {
+            mapValue.put("orderStatus",orderStatus);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getCokeInwardOrderList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null, saleOrderList);
+        return success(pageList);
+    }
+
+    /**
+     * 修改收货地址
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value = "修改收货地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/修改收货地址")
+    public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) {
+        //分页数据
+        int result = amsSaleOrderService.updateCarAddress(mapValue);
+        return success(result);
+    }
+
+    /**
+     * 修改销售订单中的物资
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value = "修改销售订单中的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/修改销售订单中的物资")
+    public RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
+        //分页数据
+        int result = amsSaleOrderService.updateAllMaterialInSale(mapValue);
+        return success(result);
+    }
+
+    @ApiModelProperty(value = "展示副产品销售订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "481", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getFuSaleOrderList")
+    public RESTfulResult getFuSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String con
+    ) {
+        if (con != null && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con", con);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getFuSaleOrderList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, saleOrderList);
+        return success(pageList);
+    }
 }

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -19,4 +19,7 @@ public interface JoinFeign {
 
     @PostMapping("/api/v1/join/wsface/pushSaleOrderToEas")
     String pushSaleOrderToEas(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/join/wsface/deleteSaleOrderToEas")
+    String deleteSaleOrderToEas(@RequestBody Map<String,Object> map);
 }

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

@@ -3,6 +3,8 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmsSaleOrderCarrier;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -12,5 +14,5 @@ public interface AmsSaleOrderCarrierMapper extends IBaseMapper<AmsSaleOrderCarri
     @Select("select seq__SALE_ORDER_CARRIER.nextval from dual")
     BigDecimal selectMaxId();
 
-    AmsSaleOrderCarrier getAmsSaleOrderCarrier(BigDecimal carrierId, BigDecimal saleOrderId);
+    AmsSaleOrderCarrier getAmsSaleOrderCarrier(Map<String,Integer> map);
 }

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

@@ -114,4 +114,16 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String, Object>> getSalerByReceiveId(BigDecimal receiveId);
     // 自动匹配上一条运单的司机电话
     String matchingDriverTelRecently(String capacityNumber);
+    // 查询内转焦炭订单
+    List<Map<String,Object>> getCokeInwardOrderList(Map<String, Object> mapValue);
+    // 得到定向派单表id
+    BigDecimal getDispatchId(BigDecimal saleOrderMaterialId);
+    // 得到销售订单物资表主键
+    List<Map<String, Object>> getSaleMaterialId();
+    // 得到销售订单物资的集合
+    List<Map<String, Object>> getSaleList(Map<String,Object> truckNoMap);
+    // 副产品订单
+    List<Map<String, Object>> getFuSaleOrderList(Map<String,Object> truckNoMap);
+    // 副产品关闭未进厂的运单
+    int closeOrderNotIn(BigDecimal saleOrderId);
 }

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

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMaterial, BigDecimal> {
@@ -15,4 +17,5 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     @Select("select seq_omstruck_order_material.nextval from dual")
     BigDecimal selectMaxId();
 
+    List<Map<String, Object>> getMaterialList(BigDecimal orderId);
 }

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

@@ -141,4 +141,12 @@ public interface IAmsSaleOrderService {
     List<Map<String, Object>> matchingAddressRecently(BigDecimal receiveId);
     // 自动匹配上一条运单的司机电话
     String matchingDriverTelRecently(String capacityNumber);
+    // 查询内转焦炭订单
+    List<Map<String, Object>> getCokeInwardOrderList(Map<String, Object> mapValue);
+    // 修改车辆收货地址
+    int updateCarAddress(Map<String, Object> mapValue);
+    // 修改销售订单中的物资
+    int updateAllMaterialInSale(Map<String, Object> mapValue);
+    //获取销售公司已审核的订单
+    List<Map<String,Object>> getFuSaleOrderList(Map<String,Object> map);
 }

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

@@ -43,8 +43,9 @@ public class AmsSaleOrderCarrierServiceImpl extends BaseServiceImpl<AmsSaleOrder
         //遍历销售订单
         for (Map<String,Integer> map :saleOrderIds){
             BigDecimal saleOrderId=new BigDecimal(map.get("saleOrderId"));
-            //当前订单已经下发给该承运商
-            AmsSaleOrderCarrier saleOrderCarrier= amsSaleOrderCarrierMapper.getAmsSaleOrderCarrier(carrierId,saleOrderId);
+            // 判断订单是否已授权过
+            AmsSaleOrderCarrier saleOrderCarrier= amsSaleOrderCarrierMapper.getAmsSaleOrderCarrier(map);
+            // 未授权过
             if (saleOrderId!=null&&saleOrderCarrier==null){
                 AmsSaleOrderCarrier amsSaleOrderCarrier=new AmsSaleOrderCarrier();
                 amsSaleOrderCarrier.setSaleOrderCarrierId(amsSaleOrderCarrierMapper.selectMaxId());
@@ -54,6 +55,11 @@ public class AmsSaleOrderCarrierServiceImpl extends BaseServiceImpl<AmsSaleOrder
                 amsSaleOrderCarrier.setInsertUsername("admin");
                 count=amsSaleOrderCarrierMapper.insertSelective(amsSaleOrderCarrier);
             }
+            // 已授权过:更新授权
+            if (saleOrderId!=null&&saleOrderCarrier != null) {
+                saleOrderCarrier.setCarrierId(carrierId);
+                count = amsSaleOrderCarrierMapper.updateByPrimaryKeySelective(saleOrderCarrier);
+            }
         }
         return count;
     }

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

@@ -7,6 +7,7 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.EASDeleteUtil;
 import com.steerinfo.dil.util.EASUtil;
 import com.steerinfo.dil.util.NumberToWeightUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +62,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     TmsTruckFeign tmsTruckFeign;
     @Autowired
     EASUtil easUtil;
+    @Autowired
+    EASDeleteUtil easDeleteUtil;
 
     @Override
     public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
@@ -201,6 +204,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         AmsSaleOrder amsSaleOrder = amsSaleOrderMapper.selectByPrimaryKey(saleOrderId);
         // 调用金蝶接口，将销售订单推送到金蝶系统
         Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+        Map<String, Object> head = (Map<String, Object>) input.get("head");
+        head.put("status","");
         // 获得金蝶接口配置
         Map<String, Object> totalMap = easUtil.getTotalMap();
         // 组装报文
@@ -437,52 +442,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getSaleOrderListBySaleCompanyes(Map<String, Object> map) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListBySaleCompanyes(map);
-        for (Map<String, Object> resultMap : resultList) {
-            BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
-            Map<String,Object> loserMap = new HashMap<>();
-            BigDecimal netWeight = amsSaleOrderMapper.getNetWeight(saleOrderId);
-            BigDecimal carNum = amsSaleOrderMapper.getCarNum(saleOrderId);
-            loserMap.put("saleOrderId",saleOrderId);
-            loserMap.put("con",map.get("con"));
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getSaleMaterial(loserMap);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
-                }
-                resultMap.put("materialName",materialName);
-            }
-            resultMap.put("netWeight",netWeight);
-            resultMap.put("carNum",carNum);
-        }
         return resultList;
     }
 
     @Override
     public List<Map<String, Object>> getAmsSaleOrderApprovedes(Map<String, Object> map) {
         List<Map<String,Object>> resultList = amsSaleOrderMapper.getAmsSaleOrderApprovedes(map);
-        for (Map<String, Object> resultMap : resultList) {
-            BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
-            Map<String,Object> loserMap = new HashMap<>();
-            BigDecimal netWeight = amsSaleOrderMapper.getNetWeight(saleOrderId);
-            BigDecimal carNum = amsSaleOrderMapper.getCarNum(saleOrderId);
-            loserMap.put("saleOrderId",saleOrderId);
-            loserMap.put("con",map.get("con"));
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getSaleMaterial(loserMap);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
-                }
-                resultMap.put("materialName",materialName);
-            }
-            resultMap.put("netWeight",netWeight);
-            resultMap.put("carNum",carNum);
-        }
         return resultList;
     }
 
@@ -753,6 +718,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal isSteel = new BigDecimal(1);
             // 得到运力id
             BigDecimal capacityId = amsSaleOrderMaterialMapper.getCapacityId(capacityNumber);
+            if (capacityId == null) {
+                return 0;
+            }
             List<Map<String,Object>> materialList = amsSaleOrderMaterialMapper.getMaterial(saleOrderMaterialId);
             /*
              定向派单表
@@ -931,69 +899,50 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getSaleOrderListToCarrier(Map<String, Object> map) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListToCarrier(map);
-        for (Map<String, Object> resultMap : resultList) {
-            BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getTruckNoAndMaterial(saleOrderId);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
-                }
-                resultMap.put("materialName",materialName);
-            }
-        }
         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<>();
-            BigDecimal netWeight = amsSaleOrderMapper.getNetWeight(saleOrderId);
-            BigDecimal carNum = amsSaleOrderMapper.getCarNum(saleOrderId);
-            loserMap.put("saleOrderId",saleOrderId);
-            loserMap.put("con",map.get("con"));
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getSaleMaterial(loserMap);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
-                }
-                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);
-        }
         return resultList;
     }
 
     /**
-     *
+     * 同步金蝶删除
      * @param saleOrderId
      * @return
      */
     @Override
     public int deleteSaleOrderById(BigDecimal saleOrderId) {
+        int result = 0;
         AmsSaleOrder amsSaleOrder = new AmsSaleOrder();
         amsSaleOrder.setSaleOrderId(saleOrderId);
         amsSaleOrder.setDeleted(new BigDecimal(1));
-        int result = amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+        // 如果是已经上传金蝶的销售订单，则同步删除
+        AmsSaleOrder amsSaleOrder1 = amsSaleOrderMapper.selectByPrimaryKey(saleOrderId);
+        if (amsSaleOrder1.getSaleOrderStatus().intValue() == 2 || amsSaleOrder1.getSaleOrderStatus().intValue() == 4) {
+            Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+            Map<String, Object> head = (Map<String, Object>) input.get("head");
+            head.put("status","close");
+            // 获得金蝶接口配置
+            Map<String, Object> totalMap = easUtil.getTotalMap();
+            // 组装报文
+            totalMap.put("input",input);
+            System.out.println(totalMap);
+            String json = JSONUtils.toJSONString(totalMap);
+            System.out.println(json);
+            String s = joinFeign.pushSaleOrderToEas(totalMap);
+            System.out.println(s);
+        }
+        // 如果是副产品订单则关闭时同步关闭未进厂的运单
+        Map<String,Object> map = new HashMap<>();
+        map.put("saleOrderId",saleOrderId);
+        List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(map);
+        if (amsSaleMaterials != null && amsSaleMaterials.get(0).getSaleWarehouse().equals("副产品库")) {
+            result += amsSaleOrderMapper.closeOrderNotIn(saleOrderId);
+        }
+        result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
         return result;
     }
 
@@ -1085,8 +1034,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         amsSaleOrder.setSaleOrderIsselfMention(isSelfMention);
         amsSaleOrder.setSaleOrderId(saleOrderId);
         amsSaleOrder.setSalerId(salerId);
-        // 设置钢材订单
-        amsSaleOrder.setSaleType(new BigDecimal(1));
+        // 设置钒渣订单
+        amsSaleOrder.setSaleType(new BigDecimal(2));
         amsSaleOrder.setSaleNumber(DataChange.generateEightDigitsNumber("WXSDD",saleOrderId.intValue(),"-"));
         amsSaleOrder.setInsertTime(new Date());
         amsSaleOrder.setInsertUpdateRemark("物流新增销售订单");
@@ -1271,26 +1220,113 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     }
 
     /**
-     * 展示未匹配承运商的车序号
+     * 查询内转焦炭订单
      * @param mapValue
      * @return
      */
     @Override
-    public List<Map<String, Object>> getSteelTruckNoList(Map<String, Object> mapValue) {
-        List<Map<String, Object>> resultList = amsSaleOrderMapper.getSteelTruckNoList(mapValue);
-        for (Map<String, Object> resultMap : resultList) {
-            BigDecimal saleOrderMaterialId = (BigDecimal) resultMap.get("saleOrderMaterialId");
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getTruckNoMaterial(saleOrderMaterialId);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
+    public List<Map<String, Object>> getCokeInwardOrderList(Map<String, Object> mapValue) {
+        return amsSaleOrderMapper.getCokeInwardOrderList(mapValue);
+    }
+
+    /**
+     * 修改收货地址
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int updateCarAddress(Map<String, Object> mapValue) {
+        // 判断是否需要删除金蝶分录
+        Integer isCloseEas = (Integer) mapValue.get("isCloseEas");
+        // 判断是否需要修改派车
+        Object isNewCar = mapValue.get("isNewCar");
+        // 销售订单主键
+        BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
+        // 车序号id
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
+        int result = 0;
+        // 运输订单id
+        BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        // 是
+        if (isCloseEas == 0 && orderId != null && orderId.intValue() != 0) {
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            omstruckOrder.setOrderId(orderId);
+            omstruckOrder.setOrderStatus(new BigDecimal(7));
+            omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            // 得到销售订单物资表主键
+            List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId();
+            for (Map<String, Object> map : saleMaterialIdList) {
+                // 删除销售订单物资子表
+                BigDecimal saleMaterialId = (BigDecimal) map.get("saleMaterialId");
+                amsSaleMaterialMapper.deleteByPrimaryKey(saleMaterialId);
+            }
+            // 调用金蝶接口，将销售订单推送到金蝶系统
+            Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+            Map<String, Object> head = (Map<String, Object>) input.get("head");
+            head.put("status","update");
+            // 获得金蝶接口配置
+            Map<String, Object> totalMap = easUtil.getTotalMap();
+            // 组装报文
+            totalMap.put("input",input);
+            System.out.println(totalMap);
+            String json = JSONUtils.toJSONString(totalMap);
+            System.out.println(json);
+            String s = joinFeign.pushSaleOrderToEas(totalMap);
+            System.out.println(s);
+            return 0;
+        }
+        // 省市县ID
+        BigDecimal shippingAddressId = DataChange.dataToBigDecimal(mapValue.get("shipperAddressId"));
+        // 具体地址
+        String place = (String) mapValue.get("place");
+        AmsSaleOrderMaterial amsSaleOrderMaterial = amsSaleOrderMaterialMapper.selectByPrimaryKey(saleOrderMaterialId);
+        if (place != null && !"null".equals(place)) {
+            List<Map<String, Object>> placeIdList = amsSaleOrderMaterialMapper.getPlaceId(place,shippingAddressId);
+            if (placeIdList == null || placeIdList.size() == 0) {
+                RmsReceivePlace rmsReceivePlace = new RmsReceivePlace();
+                rmsReceivePlace.setPlaceId(rmsReceivePlaceMapper.selectMaxId());
+                rmsReceivePlace.setAddressId(shippingAddressId);
+                rmsReceivePlace.setAddressDeliveryAddress(place);
+                amsSaleOrderMaterial.setSaleShippingAddressId(rmsReceivePlace.getPlaceId());
+                rmsReceivePlaceMapper.insertSelective(rmsReceivePlace);
+            } else {
+                amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
+            }
+        }
+        result += amsSaleOrderMaterialMapper.updateByPrimaryKeySelective(amsSaleOrderMaterial);
+        // 需要换车
+        if ((Integer) isNewCar == 0) {
+            // 根据车序号得到定向派单表主键
+            BigDecimal dispatchId = amsSaleOrderMapper.getDispatchId(saleOrderMaterialId);
+            if (dispatchId != null) {
+                amsDispatchSaleOrderMapper.deleteByPrimaryKey(dispatchId);
+            }
+            if (amsSaleOrderMaterial.getSaleShippingAddressId() != null) {
+                // 自动匹配承运商
+                List<Map<String, Object>> carrierList = getCarrierByPlace(amsSaleOrderMaterial.getSaleShippingAddressId());
+                // 单一承运商才进行匹配
+                if (carrierList != null && carrierList.size() == 1) {
+                    List<Map<String, Object>> list = new ArrayList<>();
+                    Map<String, Object> map1 = carrierList.get(0);
+                    // 传入车序号主键和承运商id
+                    map1.put("saleOrderMaterialId", saleOrderMaterialId);
+                    map1.put("carrierId", map1.get("value"));
+                    list.add(map1);
+                    dispatchToCarrier(list);
                 }
-                resultMap.put("materialName",materialName);
             }
         }
+        return result;
+    }
+
+    /**
+     * 展示未匹配承运商的车序号
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSteelTruckNoList(Map<String, Object> mapValue) {
+        List<Map<String, Object>> resultList = amsSaleOrderMapper.getSteelTruckNoList(mapValue);
         return resultList;
     }
 
@@ -1320,19 +1356,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getNoCarTruckNoList(Map<String, Object> mapValue) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getCarrierTruckNoList(mapValue);
-        for (Map<String, Object> resultMap : resultList) {
-            BigDecimal saleOrderMaterialId = (BigDecimal) resultMap.get("saleOrderMaterialId");
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getTruckNoMaterial(saleOrderMaterialId);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
-                }
-                resultMap.put("materialName",materialName);
-            }
-        }
         return resultList;
     }
 
@@ -1344,21 +1367,201 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getHaveCarTruckNoList(Map<String, Object> mapValue) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getHaveCarTruckNoList(mapValue);
-        for (Map<String, Object> resultMap : resultList) {
-            BigDecimal saleOrderMaterialId = (BigDecimal) resultMap.get("saleOrderMaterialId");
-            // 物资
-            List<Map<String,Object>> materialList = amsSaleOrderMapper.getTruckNoMaterial(saleOrderMaterialId);
-            if (materialList != null && materialList.size() > 0) {
-                Map<String, Object> materialMap = materialList.get(0);
-                String materialName = (String) materialMap.get("materialName");
-                if (materialList.size() != 1) {
-                    materialName += "...";
+        return resultList;
+    }
+
+    /**
+     * 修改销售订单中的物资
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int updateAllMaterialInSale(Map<String, Object> mapValue) {
+        int result = 0;
+        // 得到销售订单主键
+        BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
+        BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        // 得到运单中的物资
+        List<Map<String, Object>> oldList = omstruckOrderMaterialMapper.getMaterialList(orderId);
+        Map<String, Object> toTmsMap = new HashMap<>();
+        Map<String, Object> truckNoMap = new HashMap<>();
+        truckNoMap.put("saleOrderMaterialId",saleOrderMaterialId);
+        toTmsMap.put("orderId", orderId);
+        toTmsMap.put("oldList", oldList);
+        // 得到所有的物资
+        List<Map<String, Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        /*
+         删除三个物资表数据
+         */
+        List<AmsSaleTrucknoMaterial> amsSaleTrucknoMaterials = amsSaleTrucknoMaterialMapper.selectByParameters(truckNoMap);
+        for (AmsSaleTrucknoMaterial amsSaleTrucknoMaterial : amsSaleTrucknoMaterials) {
+            // 销售订单物资子表
+            amsSaleMaterialMapper.deleteByPrimaryKey(amsSaleTrucknoMaterial.getMaterialId());
+            // 车序号子表
+            amsSaleTrucknoMaterialMapper.deleteByPrimaryKey(amsSaleTrucknoMaterial.getTrucknoMaterialId());
+        }
+        // 运输订单物资子表
+
+        // 新增拼数/修改拼数
+        for (Map<String, Object> map : mapList) {
+            BigDecimal saleMaterialId = DataChange.dataToBigDecimal(map.get("saleMaterialId"));
+            BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
+            BigDecimal materialNumber = DataChange.dataToBigDecimal(map.get("orderPlanWeight"));
+            BigDecimal trucknoMaterialId = DataChange.dataToBigDecimal(map.get("trucknoMaterialId"));
+            BigDecimal isPoundSale = DataChange.dataToBigDecimal(map.get("isPound"));
+            Object steelMeter = map.get("meterNumber");
+            Object easId = map.get("easId");
+            Object warehouse = map.get("warehouse");
+            // 销售订单分录表
+            AmsSaleMaterial amsSaleMaterial = new AmsSaleMaterial();
+            // 车序号子表
+            AmsSaleTrucknoMaterial amsSaleTrucknoMaterial = new AmsSaleTrucknoMaterial();
+            // 运输订单子表
+            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+//            // 判断是否要新增运输订单子表
+//            Map<String, Object> orderMap = new HashMap<>();
+//            orderMap.put("orderId", orderId);
+//            orderMap.put("materialId", materialId);
+//            List<OmstruckOrderMaterial> omstruckOrderMaterials = omstruckOrderMaterialMapper.selectByParameters(orderMap);
+//            BigDecimal orderMaterialId;
+//            if (omstruckOrderMaterials == null || omstruckOrderMaterials.size() == 0) {
+//                orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+//                omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+//                omstruckOrderMaterial.setOrderId(orderId);
+//                omstruckOrderMaterial.setInsertTime(new Date());
+//                omstruckOrderMaterial.setInsertUsername("新增拼数");
+//            } else {
+//                omstruckOrderMaterial = omstruckOrderMaterials.get(0);
+//            }
+//            omstruckOrderMaterial.setMaterialId(materialId);
+//            omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
+//            omstruckOrderMaterial.setUpdateTime(new Date());
+//            if (omstruckOrderMaterials == null || omstruckOrderMaterials.size() == 0) {
+//                result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+//            } else {
+//                result += omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
+//            }
+//            // 判断是否是新增的拼数
+//            if (saleMaterialId == null || saleMaterialId.intValue() == 0) {
+//                saleMaterialId = amsSaleMaterialMapper.selectMaxId();
+//                trucknoMaterialId = amsSaleTrucknoMaterialMapper.selectMaxId();
+//                amsSaleMaterial.setInsertTime(new Date());
+//                amsSaleMaterial.setInsertUsername("修改时加拼数");
+//                amsSaleTrucknoMaterial.setInsertTime(new Date());
+//                amsSaleTrucknoMaterial.setInsertUsername("修改时加拼数");
+//            }
+//            // 车序号子表
+//            amsSaleTrucknoMaterial.setTrucknoMaterialId(trucknoMaterialId);
+//            amsSaleTrucknoMaterial.setMaterialId(saleMaterialId);
+//            amsSaleTrucknoMaterial.setSaleOrderMaterialId(saleOrderMaterialId);
+//            amsSaleTrucknoMaterial.setUpdateTime(new Date());
+//            // 销售订单物资表
+//            amsSaleMaterial.setSaleMaterialId(saleMaterialId);
+//            amsSaleMaterial.setMaterialNumber(materialNumber);
+//            amsSaleMaterial.setSaleOrderId(saleOrderId);
+//            amsSaleMaterial.setMaterialId(materialId);
+//            amsSaleMaterial.setIsPoundSale(isPoundSale);
+//            amsSaleMaterial.setUpdateTime(new Date());
+//            if (steelMeter != null) {
+//                amsSaleMaterial.setSteelMeter(new BigDecimal(steelMeter.toString()));
+//            }
+//            if (map.get("saleOrderId") == null) {
+//                result += amsSaleMaterialMapper.insertSelective(amsSaleMaterial);
+//                result += amsSaleTrucknoMaterialMapper.insertSelective(amsSaleTrucknoMaterial);
+//            } else {
+//                result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
+//                result += amsSaleTrucknoMaterialMapper.updateByPrimaryKeySelective(amsSaleTrucknoMaterial);
+//            }
+        }
+        // 得到运单中的物资
+        List<Map<String, Object>> newList = omstruckOrderMaterialMapper.getMaterialList(orderId);
+        toTmsMap.put("newList", newList);
+        // 调用金蝶接口，将销售订单推送到金蝶系统
+        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+        Map<String, Object> head = (Map<String, Object>) input.get("head");
+        head.put("status", "update");
+        // 获得金蝶接口配置
+        Map<String, Object> totalMap = easUtil.getTotalMap();
+        // 组装报文
+        totalMap.put("input", input);
+        System.out.println(totalMap);
+        String json = JSONUtils.toJSONString(totalMap);
+        System.out.println(json);
+        String s = joinFeign.pushSaleOrderToEas(totalMap);
+        System.out.println(s);
+        return result;
+    }
+
+    /**
+     * 遍历两次物资集合，找出哪些修改哪些新增哪些删除的物资
+     * @param newMaterialMapList
+     * @param oldMaterialMapList
+     * @return
+     */
+    public static Map<String, Object> checkMaterial(List<Map<String, Object>> oldMaterialMapList, List<Map<String, Object>> newMaterialMapList){
+        Map<String, Object> returnMap = new HashMap<>();
+        List<BigDecimal> delete = new ArrayList<>(); //存放删除的物资ID
+        List<Map<String, Object>> add = new ArrayList<>(); //存放添加的物资ID及件数
+        List<Map<String, Object>> update = new ArrayList<>(); // 存放修改的物资Id及件数
+        //先遍历old中的物资 查找有没有相同的物资     找到修改和删除的物资
+        for (Map<String, Object> map : oldMaterialMapList) {
+            String materialId = String.valueOf(map.get("materialId"));//拿到key
+            //通过这个key去新物资集合中获取是否包含这个key
+            Map<String, Object> newMap = getNewMap(materialId, newMaterialMapList);
+            if(newMap == null){
+                //如果在新物资中没有找到，则代表此物资已删除
+                delete.add(DataChange.dataToBigDecimal(map.get("materialId")));
+            }else{ //如果找到了，取出件数进行对比
+                BigDecimal newNumber = DataChange.dataToBigDecimal(newMap.get("materialNumber")); //拿到新物资中的件数
+                BigDecimal oldNumber = DataChange.dataToBigDecimal(map.get("materialNumber"));
+                int i = newNumber.compareTo(oldNumber);
+                if(i != 0){ //如果件数不相等，则需要进行修改，添加进修改list中
+                    Map<String, Object> updateMap = new HashMap<>();
+                    updateMap.put("materialId", materialId);
+                    updateMap.put("materialNumber", newNumber);
+                    update.add(updateMap);
                 }
-                resultMap.put("materialName",materialName);
             }
         }
-        return resultList;
+        //再次遍历new中的物资 查找 新增 的物资
+        for (Map<String, Object> map : newMaterialMapList) {
+            String materialId = String.valueOf(map.get("materialId"));
+            Map<String, Object> oldMaps = getNewMap(materialId, oldMaterialMapList);
+            if(oldMaps == null){
+                //如果在旧map中没有找到，则代表是新增的物资，将新增的物资存放到新增列表中
+                add.add(map);
+            }
+        }
+        if(add.size() != 0)    returnMap.put("add", add);
+        if(delete.size() != 0) returnMap.put("delete", delete);
+        if(update.size() != 0) returnMap.put("update", update);
+        return returnMap;
     }
 
+    /**
+     * 遍历list查看里面的map是否包含这个值
+     * @param key
+     * @param mapList
+     * @return
+     */
+    public static Map<String, Object> getNewMap(String key, List<Map<String, Object>> mapList){
+        for (Map<String, Object> map : mapList) {
+            if(map.containsValue(key)){
+                return map;
+            }
+        }
+        return null;
+    }
 
+    /**
+     * 副产品订单
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getFuSaleOrderList(Map<String, Object> map) {
+        List<Map<String, Object>> resultList = amsSaleOrderMapper.getFuSaleOrderList(map);
+        return resultList;
+    }
 }

src/main/java/com/steerinfo/dil/util/EASDeleteUtil.java

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASDeleteUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "deleteSaleOrderHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/java/com/steerinfo/dil/util/MapToXmlUtil.java

@@ -0,0 +1,64 @@
+package com.steerinfo.dil.util;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2022/4/27 14:35
+ * @Version:V2.0
+ */
+public class MapToXmlUtil {
+
+    /**
+     * @Description:TODO(循环遍历map节点和value,拼接成xml)
+     * @param: Map<?, ?> map
+     * @param: StringBuffer
+     * @return:
+     * @auther: HuJianGuo
+     * @date: 2022/4/27 14:35
+     * @throws
+     *
+     **/
+    public static void mapToXML(Map<?, ?> map, StringBuffer sb) {
+        Set<?> set = map.keySet();
+        for (Iterator<?> it = set.iterator(); it.hasNext();) {
+            String key = (String) it.next();
+            Object value = map.get(key);
+            if (value instanceof Map) {
+                sb.append("<" + key + ">\n");
+                mapToXML((Map<?, ?>) value, sb);
+                sb.append("</" + key + ">\n");
+            } else if (value instanceof List) {
+                List<?> list = (List<?>) map.get(key);
+                for (int i = 0; i < list.size(); i++) {
+                    sb.append("<" + key + ">\n");
+                    Map<?, ?> hm = (Map<?, ?>) list.get(i);
+                    mapToXML(hm, sb);
+                    sb.append("</" + key + ">\n");
+                }
+            } else {
+                sb.append("<" + key + ">" + value + "</" + key + ">\n");
+            }
+        }
+    }
+
+    public static String getXmlByMap(Map<?, ?> headMap,Map<?, ?> bodyMap) {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n");
+        sb.append("<table>\n");
+        sb.append("<rowCount>1</rowCount>\n");
+        sb.append("<headCount>17</headCount>\n");
+        sb.append("<head>\n");
+        mapToXML(headMap, sb);
+        sb.append("</head>\n");
+        sb.append("<body>\n");
+        mapToXML(bodyMap, sb);
+        sb.append("</body>\n");
+        sb.append("</table>");
+        return sb.toString();
+    }
+}

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

@@ -316,7 +316,13 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="getAmsSaleOrderCarrier" resultMap="BaseResultMap">
-    SELECT <include refid="columns" /> FROM AMS_SALE_ORDER_CARRIER where SALE_ORDER_ID=#{saleOrderId} and CARRIER_ID=#{carrierId}
+    SELECT
+    <include refid="columns"/>
+    FROM AMS_SALE_ORDER_CARRIER
+    where SALE_ORDER_ID=#{saleOrderId}
+    <if test="carrierId != null" >
+      and CARRIER_ID=#{carrierId}
+    </if>
   </select>
   
 </mapper>

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

@@ -1510,13 +1510,24 @@
     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.INSERT_TIME "insertTime",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
     from AMS_SALE_ORDER a_s_order
     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
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0
+    <if test="con != null">
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+    </if>
     <if test="consigneeSsoId != null" >
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
@@ -1528,6 +1539,24 @@
           "saleNumber" 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="materialSpecification != null">
+        and
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        and
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
       <if test="shipperName != null">
         and
         <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
@@ -1606,14 +1635,25 @@
     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.INSERT_TIME "insertTime",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
     from AMS_SALE_ORDER a_s_order
     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
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     where a_s_order.SALE_ORDER_STATUS=1
     and a_s_order.DELETED = 0
+    <if test="con != null">
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+    </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
@@ -1625,6 +1665,24 @@
           "saleNumber" 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="materialModel != null">
+        and
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        and
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
       <if test="shipperName != null">
         and
         <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
@@ -1841,12 +1899,20 @@
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
     DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
-    a_s_order.INSERT_UPDATE_REMARK "materialName"
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    ASM.SALE_WAREHOUSE "saleWareHouse"
     from AMS_SALE_ORDER a_s_order
     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
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_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
@@ -1873,6 +1939,21 @@
           "saleNumber" like '%${item}%'
         </foreach>
       </if>
+      <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
       <if test="statusStr != null">
         <foreach collection="statusStr" item="item" open="(" separator="or" close=")">
         and "statusStr" like '%${item}%'
@@ -2092,6 +2173,7 @@
     RM.MATERIAL_NAME                               as "materialName",
     ASM.MATERIAL_NUMBER                            as "materialNumber",
     ASM.MATERIAL_WEIGHT                            as "materialWeight",
+    ASM.SALE_WAREHOUSE                             as "saleWareHouse",
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL as "specificationModel",
     RM.MATERIAL_CODE                               as "materialCode",
     nvl(sumWeight.weight,0)+nvl(sumWeight2.weight,0)             as "totalWeight",
@@ -2262,7 +2344,8 @@
 
   <select id="getSaleMaterial" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT * FROM (SELECT
-    RM.MATERIAL_NAME AS "materialName"
+    RM.MATERIAL_NAME AS "materialName",
+    ASM.SALE_WAREHOUSE AS "saleWareHouse"
     FROM AMS_SALE_MATERIAL ASM
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
@@ -2374,6 +2457,7 @@
   </select>
 
   <select id="getSaleOrderListToCarrier" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT * FROM (
     select DISTINCT * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
     a_s_order.SALE_NUMBER "saleNumber",
@@ -2391,8 +2475,11 @@
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
     DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
-    a_s_order.INSERT_UPDATE_REMARK "materialName",
-    a_s_order.UPDATE_TIME "updateTime"
+    a_s_order.UPDATE_TIME "updateTime",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
@@ -2400,23 +2487,32 @@
     on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASOM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+    ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
     ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN RMS_CARRIER RC
     ON RC.CARRIER_ID = ADSO.CARRIER_ID
     LEFT JOIN OMSTRUCK_ORDER OO
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_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
     and ADSO.DISPATCH_TYPE = 2
     and OO.ORDER_ID IS NULL
-    <if test="con != null">
-      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
-    </if>
     <if test="carrierSsoId != null" >
       and RC.CARRIER_SSO_ID = #{carrierSsoId}
     </if>
+    ) "CARRIER"
+    <where>
+      <if test="con != null">
+        "CARRIER"."consigneeCompanyName" LIKE #{con} or "CARRIER"."saleNumber" LIKE #{con} or "CARRIER"."saleRemark" LIKE #{con}
+      </if>
+    </where>
     )
     <where>
       <if test="saleNumber != null">
@@ -2424,6 +2520,21 @@
           "saleNumber" like '%${item}%'
         </foreach>
       </if>
+      <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
       <if test="shipperName != null">
         and
         <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
@@ -2518,8 +2629,11 @@
     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"
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
     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
@@ -2529,6 +2643,10 @@
     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
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_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
@@ -2545,6 +2663,24 @@
           "saleNumber" 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="materialSpecification != null">
+        and
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        and
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
       <if test="shipperName != null">
         and
         <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
@@ -2637,10 +2773,16 @@
     ASO.SALE_ORDER_ISSELF_MENTION AS "isselfMention",
     ASOM.INSERT_TIME AS "insertTime",
     ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
-    ASO.SALE_ORDER_ID AS "saleOrderId"
+    ASO.SALE_ORDER_ID AS "saleOrderId",
+    RM.MATERIAL_NAME AS "materialName",
+    RM.MATERIAL_SPECIFICATION AS "materialSpecification",
+    RM.MATERIAL_MODEL AS "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+    LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+    ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP
     ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
     LEFT JOIN RMS_RECEIVE_ADDRESS RRA
@@ -2651,10 +2793,17 @@
     ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
     LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
     ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     WHERE ASO.SALE_ORDER_STATUS IN (2,4)
     AND ASOM.ISSUE_STATUS IS NULL
     AND ADSO.CARRIER_ID IS NULL
     AND ASO.DELETED = 0
+    <if test="con != null" >
+      AND RCO.CONSIGNEE_COMPANY_NAME LIKE #{con}
+    </if>
     )
     <where>
       <if test="saleNumber != null">
@@ -2663,6 +2812,24 @@
           "saleNumber" 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="materialModel != null">
+        and
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        and
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
       <if test="truckNo != null">
         and
         <foreach collection="truckNo" item="item" open="(" separator="or" close=")">
@@ -2733,6 +2900,7 @@
   </select>
 
   <select id="getCarrierTruckNoList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT * FROM(
     SELECT DISTINCT *
     FROM (
     SELECT ASO.SALE_NUMBER AS "saleNumber",
@@ -2749,10 +2917,16 @@
     ASOM.INSERT_TIME AS "insertTime",
     ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
     ASO.SALE_ORDER_ID AS "saleOrderId",
-    RCA.CARRIER_NAME AS "carrierName"
+    RCA.CARRIER_NAME AS "carrierName",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel",
+    RM.MATERIAL_NAME AS "materialName",
+    RM.MATERIAL_SPECIFICATION AS "materialSpecification",
+    RM.MATERIAL_MODEL AS "materialModel"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+    LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+    ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP
     ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
     LEFT JOIN RMS_RECEIVE_ADDRESS RRA
@@ -2767,11 +2941,21 @@
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN RMS_CARRIER RCA
     ON RCA.CARRIER_ID = ADSO.CARRIER_ID
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     WHERE ASO.SALE_ORDER_STATUS IN (2,4)
     AND ASOM.ISSUE_STATUS IS NULL
     AND ADSO.DISPATCH_TYPE = 2
     AND OO.ORDER_ID IS NULL
     AND ASO.DELETED = 0
+    ) "NOCAR"
+    <where>
+      <if test="con != null" >
+        "NOCAR"."carrierName" LIKE #{con} or "NOCAR"."consigneeCompanyName" LIKE #{con} or "NOCAR"."addressDeliveryAddress" LIKE #{con}
+      </if>
+    </where>
     )
     <where>
       <if test="saleNumber != null">
@@ -2780,6 +2964,24 @@
           "saleNumber" 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="materialModel != null">
+      and
+      <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+        "materialModel" like '%${item}%'
+      </foreach>
+    </if>
+      <if test="materialSpecification != null">
+        and
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
       <if test="carrierName != null">
         and
         <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
@@ -2879,6 +3081,7 @@
   </select>
 
   <select id="getHaveCarTruckNoList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT * FROM (
     SELECT DISTINCT *
     FROM (
     SELECT ASO.SALE_NUMBER AS "saleNumber",
@@ -2895,10 +3098,16 @@
     ASOM.INSERT_TIME AS "insertTime",
     ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
     ASO.SALE_ORDER_ID AS "saleOrderId",
-    RCA.CARRIER_NAME AS "carrierName"
+    RCA.CARRIER_NAME AS "carrierName",
+    RM.MATERIAL_NAME AS "materialName",
+    RM.MATERIAL_SPECIFICATION AS "materialSpecification",
+    RM.MATERIAL_MODEL AS "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+    LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+    ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP
     ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
     LEFT JOIN RMS_RECEIVE_ADDRESS RRA
@@ -2913,12 +3122,22 @@
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN RMS_CARRIER RCA
     ON RCA.CARRIER_ID = ADSO.CARRIER_ID
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     WHERE OO.ORDER_TYPE = 1
     AND ASO.SALE_ORDER_STATUS IN (2,4)
     AND ASOM.ISSUE_STATUS IS NULL
     AND ADSO.DISPATCH_TYPE = 2
     AND OO.ORDER_ID IS NOT NULL
     AND OO.ORDER_STATUS IN (4,5)
+    ) "HAVECAR"
+    <where>
+      <if test="con != null" >
+        "HAVECAR"."carrierName" LIKE #{con} or "HAVECAR"."consigneeCompanyName" LIKE #{con} or "HAVECAR"."addressDeliveryAddress" LIKE #{con}
+      </if>
+    </where>
     )
     <where>
       <if test="saleNumber != null">
@@ -2927,6 +3146,30 @@
           "saleNumber" 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="materialSpecification != null">
+        and
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        and
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" 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="carrierName != null">
         and
         <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
@@ -3116,4 +3359,362 @@
     <
     ]]> 2
   </select>
+
+  <!-- 查询内转焦炭订单 -->
+  <select id="getCokeInwardOrderList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT * FROM (
+    SELECT *from(
+    select
+    OO.ORDER_NUMBER "orderNumber",
+    ASO.SALE_NUMBER "saleNumber",
+    RC.CAPACITY_NUMBER "capacityNumber",
+    RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN "addressDeliveryAddress",
+    ACTP.PRICE_VALUE "priceValue",
+    ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+    OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+    RS.SHIPPER_NAME "shipperName",
+    OO.ORDER_ID "orderId",
+    RC3.CARRIER_NAME "carrierName"
+    FROM OMSTRUCK_ORDER OO
+    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+    ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+    LEFT JOIN AMS_SALE_ORDER ASO
+    ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+    LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+    ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    LEFT JOIN RMS_CARRIER RC3
+    ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+    LEFT JOIN RMS_CONSIGNEE RC2
+    ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+    LEFT JOIN RMS_CAPACITY RC
+    ON OO.CAPACITY_ID=RC.CAPACITY_ID
+    LEFT JOIN RMS_SHIPPER RS
+    ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON OO.PRICE_ID=ACTP.PRICE_ID
+    WHERE OO.ORDER_TYPE = 2
+    AND ASO.SHIPPER_ID = 2
+    AND ASO.CLOSE_STATUS = 0
+    <where>
+      <if test="orderStatus!=null">
+        AND OO.ORDER_STATUS = #{orderStatus}
+      </if>
+    </where>
+    ) RRC
+    <if test="con != null">
+      WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con}
+    </if>
+    )
+    <where>
+      <if test="orderNumber != null">
+        <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+          "orderNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="carrierName != null">
+        <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+          "carrierName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleNumber != null">
+        and
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="capacityNumber != null">
+        and
+        <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+          "capacityNumber" 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>
+    </where>
+    <include refid="orderBy">
+    </include>
+    <if test="orderField == null  ">
+      order by "orderNumber" desc
+    </if>
+  </select>
+  
+  <select id="getDispatchId" parameterType="DECIMAL" resultType="DECIMAL" >
+    SELECT ADSO.DISPATCH_ID AS "dispatchId"
+    FROM AMS_DISPATCH_SALE_ORDER ADSO
+    WHERE ADSO.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+  </select>
+
+  <select id="getSaleMaterialId" parameterType="DECIMAL" resultType="DECIMAL" >
+    SELECT ASTM.MATERIAL_ID AS "saleMaterialId"
+    FROM AMS_SALE_ORDER_MATERIAL ASOM
+           LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                     ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+  </select>
+  
+  <select id="getSaleList" resultType="java.util.Map" >
+    SELECT ASTM.TRUCKNO_MATERIAL_ID "truckNoMaterialId",
+           ASM.SALE_MATERIAL_ID     "saleMaterialId",
+           ASM.MATERIAL_ID          "materialId"
+    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
+           LEFT JOIN AMS_SALE_MATERIAL ASM
+                     ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+    WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    AND ASM.MATERIAL_ID = #{materialId}
+  </select>
+
+  <select id="getFuSaleOrderList" parameterType="java.util.Map" 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",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    RM.MATERIAL_NAME "materialName",
+    ASM.MATERIAL_WEIGHT "materialWeight",
+    ASM.SALE_WAREHOUSE "saleWareHouse",
+    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",
+    RCA.CARRIER_NAME as "carrierName"
+    from AMS_SALE_ORDER a_s_order
+    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
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN AMS_SALE_ORDER_CARRIER ASOC
+    ON ASOC.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN RMS_CARRIER RCA
+    ON RCA.CARRIER_ID = ASOC.CARRIER_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=a_s_order.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 in (2,4,5)
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+
+    ) sumWeight2
+    on sumWeight2.SALE_ORDER_ID=a_s_order.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
+    where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+
+    ) carCount
+    on carCount.SALE_ORDER_ID=a_s_order.SALE_ORDER_ID
+    where ASM.SALE_WAREHOUSE = '副产品库'
+    and a_s_order.SALE_ORDER_STATUS in (2,4)
+    and a_s_order.CLOSE_STATUS is null
+    and a_s_order.DELETED = 0
+    and a_s_order.SHIPPER_ID = 1
+    and a_s_order.SALE_TYPE is null
+    <if test="con != null">
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+    </if>
+    <if test="consigneeSsoId != null">
+      and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+    </if>
+    ORDER BY a_s_order.UPDATE_TIME DESC
+    )
+    <where>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="statusStr != null">
+        <foreach collection="statusStr" item="item" open="(" separator="or" close=")">
+          and "statusStr" 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>
+  </select>
+
+  <!-- 关闭未进厂的运单 -->
+  <update id="closeOrderNotIn" parameterType="DECIMAL" >
+    UPDATE OMSTRUCK_ORDER OO
+    SET OO.ORDER_STATUS = 7
+    WHERE OO.ORDER_ID IN (
+      SELECT OO.ORDER_ID "orderId"
+      FROM AMS_SALE_ORDER_MATERIAL ASOM
+             LEFT JOIN OMSTRUCK_ORDER OO
+                       ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+             LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                       ON TTR.ORDER_ID = OO.ORDER_ID
+             LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                       ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+      WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+        AND OO.ORDER_ID IS NOT NULL
+        AND OO.ORDER_STATUS IN (4,5)
+    )
+  </update>
+
+  <select id="getCarMessageToEas" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
+    SELECT
+        RCA.CAPACITY_NUMBER AS "r1c1",
+           OO.ORDER_NUMBER AS "r1c2",
+            RM.EAS_MATERIAL_ID AS "r1c3",
+           RM.MATERIAL_NAME AS "r1c4",
+           RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "r1c5"
+FROM OMSTRUCK_ORDER OO
+    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
+LEFT JOIN RMS_CAPACITY RCA
+    ON OO.CAPACITY_ID = RCA.CAPACITY_ID
+LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+LEFT JOIN AMS_SALE_ORDER ASO
+ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+LEFT JOIN RMS_CONSIGNEE RC
+ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+  </select>
 </mapper>

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

@@ -111,7 +111,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -297,7 +297,7 @@
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </select>
@@ -395,4 +395,11 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
+  <select id="getMaterialList" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT OOM.MATERIAL_ID           "materialId",
+           OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+           OOM.ORDER_MATERIAL_ID     "orderMaterialId"
+    FROM OMSTRUCK_ORDER_MATERIAL OOM
+    WHERE OOM.ORDER_ID = #{orderId}
+  </select>
 </mapper>