Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -94,7 +95,22 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             mapValue.put("con","%" + con + "%");
         }
         PageHelper.startPage(pageNum,pageSize);
+        if ("materialNames".equals(mapValue.get("orderField"))){
+            mapValue.put("orderField",null);
+        }
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getInwardContractPrice(mapValue);
+        if (mapValue.get("materialNames")!=null && !"".equals(mapValue.get("materialNames"))) {
+            String materialNames = mapValue.get("materialNames").toString();
+            List<Map<String, Object>> amsContractTransportPrice2=new ArrayList<>();
+            amsContractTransportPrice1.forEach(map->{
+                if (map.get("materialNames")!=null && !"".equals(map.get("materialNames"))) {
+                    if (materialNames.equals("["+map.get("materialNames")+"]")) {
+                        amsContractTransportPrice2.add(map);
+                    }
+                }
+            });
+            amsContractTransportPrice1=amsContractTransportPrice2;
+        }
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
         return success(pageList);
     }
@@ -183,7 +199,7 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/batchUpdateTransportPriceByOilPrice1")
-    public RESTfulResult batchUpdateTransportPriceByOilPrice(@RequestBody Map<String,Object> map){
+    public RESTfulResult batchUpdateTransportPriceByOilPrice(@RequestBody Map<String,Object> map) throws ParseException {
         int i = amsContractTruckPriceService.batchUpdateTransportPriceByOilPrice(map);
         return success(i);
     }
@@ -330,10 +346,16 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     public Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String,Object> mapvalue){
         //接受结算是内转计重还是计时还是计数
         String settleMentType = (String) mapvalue.get("requirementType");
+        String insertUpdateRemark = (String) mapvalue.get("insertUpdateRemark");
         BigDecimal type = null;
         if("计重".equals(settleMentType)){
-            //在单价表里内转计重是2
-            type = new BigDecimal(2);
+            if(insertUpdateRemark!=null && !"".equals(insertUpdateRemark) && insertUpdateRemark.contains("计时且过计量")){
+                //计重且计时，走计时流程
+                type = new BigDecimal(5);
+            }else{
+                //在单价表里内转计重是2
+                type = new BigDecimal(2);
+            }
         }else if("计时".equals(settleMentType)){
             //在单价表里内转计时是5
             type = new BigDecimal(5);

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

@@ -13,10 +13,7 @@ import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -784,7 +781,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 if (s == null || s.size() == 0) {
                     throw new Exception("登录金蝶失败");
                 }
-                System.out.println(s);
+            System.out.println(s);
             return success(result);
         }
     }
@@ -805,7 +802,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "将车序号下发给承运商")
     @PostMapping("/dispatchToCarrier")
-    public RESTfulResult dispatchToCarrier(@RequestBody List<Map<String,Object>> mapList) {
+    public RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String,Object>> mapList) {
         int result = amsSaleOrderService.dispatchToCarrier(mapList);
         return success(result);
     }
@@ -1426,4 +1423,12 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         return success(count);
     }
+
+    @ApiOperation("反关闭运单")
+    @PostMapping("reverseCloseOrder")
+    public RESTfulResult reverseCloseOrder(@RequestBody(required = false) Map<String,Object> map){
+        //反关闭运单
+        int result = amsSaleOrderService.reverseCloseOrder(map);
+        return success(result);
+    }
 }

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

@@ -10,16 +10,16 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+//import org.omg.CORBA.OBJ_ADAPTER;
+
 /**
  * AmstruckInwardPlan RESTful接口：
  * @author generator
@@ -137,7 +137,8 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer planStatus,
                                           String carrierId,
-                                          Integer planId) {
+                                          Integer planId,
+                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -147,6 +148,9 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         if (planId != null && !"undefined".equals(planId.toString())) {
             mapValue.put("planId",new BigDecimal(planId));
         }
+        if(con != null && !"null".equals(con)){
+            mapValue.put("con","%" + con + "%");
+        }
         List<Map<String, Object>> columnList = null;
         PageHelper.startPage(pageNum, pageSize);
         if(planStatus == 100){

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

@@ -64,4 +64,6 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     List<Map<String, Object>> selectwz(Map<String, Object> map);
 
     Map<String, Object> getcargonameId(Map<String, Object> map);
+
+
 }

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

@@ -2,13 +2,13 @@ package com.steerinfo.dil.mapper;
 
 import com.steerinfo.dil.model.AmsSaleMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
-import java.math.*;
-import java.util.List;
-import java.util.Map;
-
 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 AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigDecimal> {
     @Select("select seq_AMS_SALE_MATERIAL.nextval from dual")
@@ -31,4 +31,9 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
     int openAllSaleMaterial(BigDecimal saleOrderId);
     // 反关闭分录
     int adverseCloseSaleMaterial(BigDecimal saleMaterialId);
+
+    int getOrderResults(BigDecimal orderId);
+
+    int updateSaleMaterial(BigDecimal saleOrderMaterialId);
+
 }

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

@@ -42,4 +42,10 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     BigDecimal getOldCapacityId(BigDecimal orderId);
 
+    int deleteSpellingList(Object listId);
+
+    int deleteQueueList(Object listId);
+
+    Map<String, Object> getSteelIsSpelling(BigDecimal orderId);
+
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service;
 import com.steerinfo.dil.model.AmsContractTransportPrice;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -41,7 +42,7 @@ public interface IAmsContractTruckPriceService {
     //获取所有的油价
     List<Map<String, Object>> getOriginAndNowOilPrice();
     //油价联动导致运价变动，批量修改运价,同时修改吨公里的数值
-    int batchUpdateTransportPriceByOilPrice(Map<String,Object> map);
+    int batchUpdateTransportPriceByOilPrice(Map<String,Object> map) throws ParseException;
     //获取货物类型
     List<Map<String,Object>> getCargoName();
     //获取油品名称

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

@@ -171,4 +171,6 @@ public interface IAmsSaleOrderService {
 
     List<Map<String, Object>> getKucunList(Map<String, Object> map);
 
+    int reverseCloseOrder(Map<String, Object> map);
+
 }

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

@@ -16,10 +16,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -206,7 +205,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
      */
     @Override
     @Transactional
-    public int batchUpdateTransportPriceByOilPrice(Map<String,Object> map) {
+    public int batchUpdateTransportPriceByOilPrice(Map<String,Object> map){
         //正数的判断条件
         String flag= (String) map.get("flag");
         //运输单价变化的条数
@@ -218,21 +217,26 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         //根据油品名称ID和非历史油价筛选出符合条件的运价合集
         List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
         for (Map<String, Object> stringObjectMap : PriceValueList) {
+            stringObjectMap.put("priceDate",map.get("priceDate"));
             //获取该条单价的原油价基准
             BigDecimal oilpriceBase = DataChange.dataToBigDecimal(stringObjectMap.get("oilpriceBase"));
             //获取该条单价的油价变化率阈值
             BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(stringObjectMap.get("oilpriceChangeThreshold"));
-            //计算油价变化率,公式：n＝（当前油价－基数）÷基数×100%
-            BigDecimal n = (newOilPrice.subtract(oilpriceBase)).divide(oilpriceBase,4,4);
+            //计算油价变化率,公式：n＝（当前油价－基数）÷基数×100%   (9.06-8.26)/8.26
+            BigDecimal n = (oilpriceBase.subtract(newOilPrice)).divide(newOilPrice,4,4);
             //若油价变化率超过该条单价的油价变化率阈值，修改原单价为历史数据，新增一条单价
             if(n.abs().doubleValue()>oilpriceChangeThreshold.doubleValue()){
                 //加一个判断（如果数据为正数则需要二次判断，如果数据为负数则直接生效）
-                if(newOilPrice.compareTo(oilpriceBase)==-1){
-                    //直接降低油价
-                    i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
-                }else if (newOilPrice.compareTo(oilpriceBase)==1 && "1".equals(flag)){
-                    //加上两个判断之后
-                    i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
+                try{
+                    if(newOilPrice.compareTo(oilpriceBase)==-1){
+                        //直接降低油价
+                        i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
+                    }else if (newOilPrice.compareTo(oilpriceBase)==1 && "1".equals(flag)){
+                        //加上两个判断之后
+                        i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
                 }
             }
         }
@@ -272,7 +276,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
      * @throws Exception
      */
     @Transactional
-    public int addANewAmsContractTransportPrice(Map<String, Object> stringObjectMap,BigDecimal n,BigDecimal newOilPrice){
+    public int addANewAmsContractTransportPrice(Map<String, Object> stringObjectMap,BigDecimal n,BigDecimal newOilPrice) throws ParseException {
         //定义将要改变的执行价
         BigDecimal nowPriceValue;
         //存储原运输单价实绩对象
@@ -291,7 +295,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         BigDecimal i = amsContractTruckPriceMapper.selectMaxId();
         amsContractTransportPrice.setPriceId(i);
         //生成执行日期
-        amsContractTransportPrice.setPriceDate(new Date());
+        amsContractTransportPrice.setPriceDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse((String) stringObjectMap.get("priceDate")));
         //常规字段
         amsContractTransportPrice.setInsertUsername("admin");
         amsContractTransportPrice.setInsertTime(new Date());
@@ -340,13 +344,14 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         try {
             nowPriceValue = UpdatePureBenzenePriceValueByOilPrice(n.toString(),amsContractTransportPrice.getPriceValue(),formulaId);
             //保留两位小数
-            nowPriceValue = nowPriceValue.divide(new BigDecimal(1),2,4);
+            nowPriceValue = nowPriceValue.divide(new BigDecimal(1),3,0);
             //调整纯苯运价
             amsContractTransportPrice.setPriceValue(nowPriceValue);
             //修改基准油价
             amsContractTransportPrice.setOilpriceBase(newOilPrice);
         } catch (Exception e) {
             e.printStackTrace();
+            return 0;
         }
         //新增数据
         int insert = amsContractTruckPriceMapper.insert(amsContractTransportPrice);
@@ -601,6 +606,11 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
 
     @Override
     public List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue) {
+        String material="";
+//        if (mapValue.get("materialNames")!=null && mapValue.get("materialNames").toString().contains("、")) {
+//            material= mapValue.get("materialNames").toString();
+//            mapValue.put("materialNames",null);
+//        }
         List<Map<String,Object>>mapList =  amsContractTruckPriceMapper.getInwardContractPrice(mapValue);
         for (Map<String,Object>map:mapList
              ) {
@@ -625,6 +635,13 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
             }else if(((BigDecimal)map.get("type")).intValue() == 6){
                 map.put("type","元/趟");
             }
+//            if (material!=null &&
+//                    material.contains("、") &&
+//                    material.equals(materialNames)) {
+//                List<Map<String, Object>> newMapList=new ArrayList<>();
+//                newMapList.add(map);
+//                return newMapList;
+//            }
         }
         return mapList;
     }

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

@@ -988,4 +988,5 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
     }
 
 
+
 }

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

@@ -69,6 +69,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     EASUtil easUtil;
     @Autowired
     EASDeleteUtil easDeleteUtil;
+
+    @Autowired
+    EASSaleOrderUtil easSaleOrderUtil;
+
     @Autowired
     EASTestUtil easTestUtil;
     @Autowired
@@ -227,9 +231,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Map<String, Object> head = (Map<String, Object>) input.get("head");
         head.put("status","");
         // 获得金蝶接口配置：正式
-//        Map<String, Object> totalMap = easUtil.getTotalMap();
-        // 获得金蝶接口配置:测试
         Map<String, Object> totalMap = easUtil.getTotalMap();
+        // 获得金蝶接口配置:测试
+        //Map<String, Object> totalMap = easSaleOrderUtil.getTotalMap();
         // 组装报文
         totalMap.put("input",input);
         System.out.println(totalMap);
@@ -1408,6 +1412,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateCarAddress(Map<String, Object> mapValue) {
         // 判断是否需要删除金蝶分录
         Integer isCloseEas = (Integer) mapValue.get("isCloseEas");
+        String operateName = (String) mapValue.get("operateName");
         int result = 0;
         // 运输订单id
         BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
@@ -1418,6 +1423,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderStatus(new BigDecimal(7));
+            if(operateName != null){
+                omstruckOrder.setOptionerCode(operateName);
+            }
             omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
             // 得到销售订单物资表主键
             List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
@@ -1459,7 +1467,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         amsSaleOrderMaterial.setShippingAddressIds(addressids);
         result += amsSaleOrderMaterialMapper.updateByPrimaryKeySelective(amsSaleOrderMaterial);
         // 需要换车
-        if ((Integer) isNewCar == 0) {
+        if (isNewCar != null && (Integer) isNewCar == 0) {
             // 根据车序号得到定向派单表主键
             BigDecimal dispatchId = amsSaleOrderMapper.getDispatchId(saleOrderMaterialId);
             if (dispatchId != null) {
@@ -1723,7 +1731,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
         BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
         if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0){
-            return 0;
+            return 1;
         }
         if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
             String capacityids="";
@@ -1734,6 +1742,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
             mapValue.put("capacityids",capacityids);
             //这是修改车牌号
+            //将排队信息删掉
+            Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+            if(isSpellingMap != null){
+                int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
+                if(isSpelling == 1){
+                    result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
+                }else{
+                    result += omstruckOrderMapper.deleteQueueList(isSpellingMap.get("listId"));
+                }
+            }
             result += amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
             //若是接单之后还需要删除实绩且将状态变为4
             //查询运输订单的状态和总实绩ID
@@ -1757,11 +1775,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public int updateConsigneeTel(Map<String, Object> mapValue) {
         String saleOrderNo= (String) mapValue.get("saleOrderNo");
-        Integer saleMaterialId= (Integer) mapValue.get("saleMaterialId");
+        Integer saleOrderMaterialId= (Integer) mapValue.get("saleOrderMaterialId");
         String consigneeTel= (String) mapValue.get("consigneeTel");
         int result = 0;
-        if (saleOrderNo!=null&&!("".equals(saleOrderNo))&&saleMaterialId!=null&&!("".equals(saleMaterialId))){
-            BigDecimal id = amsSaleOrderMapper.getId(saleOrderNo, saleMaterialId);
+        if (saleOrderNo!=null&&!("".equals(saleOrderNo)) && saleOrderMaterialId!=null && !("".equals(saleOrderMaterialId))){
+            BigDecimal id = DataChange.dataToBigDecimal(saleOrderMaterialId);
             if (id!=null&&!("".equals(id))){
                 result += amsSaleOrderMapper.updateForTel(id,consigneeTel);
             }
@@ -1986,5 +2004,64 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         return amsSaleOrderMapper.getKucunList(map);
     }
 
+    //反关闭
+    @Override
+    public int reverseCloseOrder(Map<String, Object> map) {
+        Integer isOpenEas = (Integer) map.get("isOpenEas");
+        String operateName = (String) map.get("operateName");
+        int result = 0;
+        // 运输订单id
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        // 车序号id
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
+        Map<String,Object> head = new HashMap<>();
+        Map<String,Object> input = new HashMap<>();
+        // 0：代表不关闭整单
+        String wholeOrder = "0";
+        // unClose : 代表反关闭
+        String status = "unClose";
+        if( orderId != null && orderId.intValue() != 0){
+            //根据订单id查询下面的实绩个数
+            int resultCount = amsSaleMaterialMapper.getOrderResults(orderId);
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            omstruckOrder.setOrderId(orderId);
+            if(resultCount == 0){
+                omstruckOrder.setOrderStatus(new BigDecimal(4));
+            }else{
+                omstruckOrder.setOrderStatus(new BigDecimal(5));
+            }
+            if(operateName != null){
+                omstruckOrder.setOptionerCode(operateName);
+            }
+            omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            // 根据车序号主键修改子表
+            amsSaleMaterialMapper.updateSaleMaterial(saleOrderMaterialId);
+            //查询分录ID，修改金蝶
+            List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
+            for(Map<String,Object> easMap:saleMaterialIdList){
+                // 设置反关闭分录id
+                head.put("unCloseEntryId",easMap.get("closeEntryId"));
+                // 设置是否整单
+                head.put("wholeOrder",wholeOrder);
+                // 设置销售订单号
+                head.put("number",map.get("saleNumber"));
+                // 设置状态：unClose，反关闭；close，关闭
+                head.put("status",status);
+                input.put("head",head);
+                Map<String, Object> totalMap = easUtil.getTotalMap();
+                input.put("head",head);
+                totalMap.put("input",input);
+                // 调用金蝶关闭接口
+                String json = JSONUtils.toJSONString(totalMap);
+                System.out.println(json);
+                Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+                System.out.println(resultMap);
+            }
+            return 0;
+
+        }
+        return 1;
+    }
+
 
 }

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

@@ -0,0 +1,73 @@
+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 EASSaleOrderUtil {
+    // 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 = "D002";
+    public final String dbType = "1";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到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/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -999,23 +999,27 @@
           and a_t_price.DELETED = #{deleted}
         </if>
         <if test="con != null" >
-          and RGR.TRANS_RANGE_VALUE LIKE #{con}
+          and RGR.TRANS_RANGE_VALUE LIKE #{con} or r_c_type.CAPACITY_TYPE_NAME LIKE #{con}
         </if>)
         <include refid="whereLikeForeach"/>
         <include refid="orderBy"></include>
   </select>
-    <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+    <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.LinkedHashMap">
       select * from (select
       distinct
-      actp.price_id "priceId", actp.price_value "priceValue" ,actp.PRICE_DATE "priceDate"
+      actp.price_id "priceId", actp.price_value "priceValue" ,rop.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_OIL_PRICE ROP
+      on rop.PRICE_OIL_TYPE_ID = actp.OIL_TYPE_ID
       left join rms_trans_range rtr
       on rtr.trans_range_id = actp.line_id
       where type = #{type}
       and actp.DELETED = 0
-      and acpm.DELETED = 0
+      <if test="type==2">
+        and acpm.DELETED = 0
+      </if>
       <if test="rangeId != null">
         and actp.LINE_ID = #{rangeId}
       </if>

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

@@ -529,8 +529,7 @@
       AND OO.ORDER_PLAN_ID = #{saleOrderMaterialId}
     ORDER BY TWR.TARE_SEGMENT_SQE DESC
   </select>
-  
-  <delete id="deleteLoadResult" parameterType="DECIMAL" >
+    <delete id="deleteLoadResult" parameterType="DECIMAL" >
     DELETE FROM TMSTRUCK_LOAD_RESULT WHERE RESULT_ID = #{loadId}
   </delete>
 
@@ -580,5 +579,21 @@
     SET ASM.DELETED = NULL
     WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
   </update>
+  <update id="updateSaleMaterial" parameterType="decimal">
+    UPDATE AMS_SALE_MATERIAL ASM
+    SET ASM.DELETED = null
+    WHERE ASM.SALE_MATERIAL_ID IN
+    (SELECT ASTM.MATERIAL_ID
+     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})
+  </update>
 
+  <select id="getOrderResults" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+    SELECT count(TER.RESULT_ID) FROM TMSTRUCK_TOTAL_RESULT TTR
+    LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+    ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    WHERE TTR.ORDER_ID = #{orderId}
+  </select>
 </mapper>

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

@@ -1617,7 +1617,9 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+    <include refid="orderBy1">
+
+    </include>
   </select>
 
   <select id="getSaleOrderReportedes"  parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
@@ -2502,6 +2504,7 @@
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     LEFT JOIN OMSTRUCK_ORDER OO
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
     LEFT JOIN RMS_CAPACITY RC
     ON RC.CAPACITY_ID = OO.CAPACITY_ID
     LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
@@ -2593,6 +2596,7 @@
     ON RC.CARRIER_ID = ADSO.CARRIER_ID
     LEFT JOIN OMSTRUCK_ORDER OO
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
     LEFT JOIN AMS_SALE_MATERIAL ASM
     ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     LEFT JOIN RMS_MATERIAL RM
@@ -3059,6 +3063,7 @@
     ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN OMSTRUCK_ORDER OO
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
     LEFT JOIN RMS_CARRIER RCA
     ON RCA.CARRIER_ID = ADSO.CARRIER_ID
     LEFT JOIN AMS_SALE_MATERIAL ASM
@@ -3201,6 +3206,7 @@
                      ON RM.MATERIAL_ID = ASM.MATERIAL_ID
            LEFT JOIN OMSTRUCK_ORDER OO
                      ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                     and NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
            LEFT JOIN RMS_CAPACITY RC
                      ON RC.CAPACITY_ID = OO.CAPACITY_ID
            LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
@@ -3508,7 +3514,8 @@
                             ON OO.CAPACITY_ID = RCA.CAPACITY_ID
            WHERE RCA.CAPACITY_NUMBER = #{capacityNumber}
              AND OO.ORDER_TYPE = 1
-           ORDER BY OO.ORDER_ID
+             AND OO.DRIVER_TEL IS NOT NULL
+           ORDER BY OO.ORDER_ID DESC
          )
     WHERE ROWNUM <![CDATA[
     <

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

@@ -655,6 +655,9 @@
         <if test="planStatus == 3">
             and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.DUE_DATE
         </if>
+        <if test="con != null">
+            and rm.material_name like #{con}  or AIP.PLAN_NUMBER like #{con} or  AIR.REQUIREMENT_NUMBER like #{con}
+        </if>
         )
         <where>
             <if test="planNumber != null">

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

@@ -868,6 +868,12 @@
         SELECT OO.CAPACITY_ID FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getSteelIsSpelling" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        select LIST_ID  "listId",
+               IS_SPELLING "isSpelling",
+               RESULT_ID    "resultId"
+        from QMS_QUEUE_RESULT where RESULT_TOTAL_ID = (select ttr.RESULT_TOTAL_ID from TMSTRUCK_TOTAL_RESULT ttr where ttr.ORDER_ID = #{orderId})
+    </select>
 
     <delete id="deleteWeightResult" parameterType="java.math.BigDecimal">
         delete from TMSTRUCK_WEIGHT_RESULT
@@ -890,4 +896,12 @@
         delete from TMSTRUCK_ENFACTORY_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
     </delete>
+    <delete id="deleteSpellingList" >
+        delete from QMS_QUEUE_SPELLING_LIST QQSL
+        where QQSL.SPELLING_RESULT_ID = #{listId}
+    </delete>
+    <delete id="deleteQueueList" >
+        delete from QMS_QUEUE_LIST QQL
+        where qql.LIST_ID = #{listId}
+    </delete>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout,file,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout