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

pom.xml

@@ -106,8 +106,13 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dagang</user>
+<<<<<<< HEAD
+                    <user>DAGANG</user>
                     <password>root123</password>
+=======
+                    <user>dil</user>
+                    <password>Dil123789</password>
+>>>>>>> master
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>

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

@@ -84,7 +84,9 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
                                                String con,
                                                Integer dispatchStatus,
                                                Integer sporadicStatus,
-                                               String carrierSsoId) {
+                                               String carrierSsoId,
+                                               String userId) {
+
         if (con != null && !con.equals("undefined")) {
             String index="get_sporadic_order_list";//设置要查询的索引名称
             return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
@@ -110,6 +112,10 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
             mapValue.put("carrierSsoId",carrierSsoId);
             count++;
         }
+        if (userId!=null){
+            mapValue.put("userId",userId);
+            count++;
+        }
         List<Map<String, Object>> sporadicOrderList = null;
         if (mapValue.size() == count) {
             //将查询结果存入索引中
@@ -199,5 +205,21 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiOperation(value = "停止零星订单一车多趟")
+    @PostMapping("/closeSporadicOrder")
+    public RESTfulResult closeSporadicOrder(@RequestBody Map<String,Object> map) {
+        int i=amstruckSporadicOrderService.closeSporadicOrder(map);
+        return success(i);
+    }
+
+
+    @ApiOperation(value = "内转零星运输计划")
+    @PostMapping("/addInwardSporadicOrder")
+    public RESTfulResult addInwardSporadicOrder(@RequestBody Map<String,Object> map) {
+        int i=amstruckSporadicOrderService.addInwardSporadicOrder(map);
+        return success(i);
+    }
+
+
 
 }

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

@@ -16,4 +16,8 @@ public interface AmstruckSporadicMaterialMapper extends IBaseMapper<AmstruckSpor
     BigDecimal getSporadicMaterial();
 
     List<Map<String, Object>> getSporadicOrdersList2(Map<String, Object> mapValue);
+
+     // 查询承运商不为空的零星物资
+    List<Map<String,Object>> getSporadicOrdersList3(Map<String,Object> map);
+
 }

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

@@ -20,6 +20,7 @@ public interface AmstruckSporadicOrderMapper extends IBaseMapper<AmstruckSporadi
 
     // 查询零星物资订单一车多趟列表
     List<Map<String, Object>> getSporadicOrdersList1(Map<String, Object> mapValue);
+
     // 查询物资详情
     List<Map<String, Object>> seeAllMaterials(Map<String, Object> mapValue);
 

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

@@ -92,6 +92,12 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="分派状态",required=false)
     private BigDecimal dispatchStatus;
 
+    /**
+     * 已运输趟次(SPORADIC_TRANS_TIMES,DECIMAL,0)
+     */
+    @ApiModelProperty(value="已运输趟次",required=false)
+    private BigDecimal sporadicTransTimes;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -216,6 +222,14 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
         this.dispatchStatus = dispatchStatus;
     }
 
+    public BigDecimal getSporadicTransTimes() {
+        return sporadicTransTimes;
+    }
+
+    public void setSporadicTransTimes(BigDecimal sporadicTransTimes) {
+        this.sporadicTransTimes = sporadicTransTimes;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -236,6 +250,7 @@ public class AmstruckSporadicOrder implements IBasePO<BigDecimal> {
         sb.append(", sporadicOrderNo=").append(sporadicOrderNo);
         sb.append(", sporadicOrderTimes=").append(sporadicOrderTimes);
         sb.append(", dispatchStatus=").append(dispatchStatus);
+        sb.append(", sporadicTransTimes=").append(sporadicTransTimes);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -29,9 +29,13 @@ public interface IAmstruckSporadicOrderService {
 
     //新增零星订单一车多趟
     int addSporadicOrdersForCoke(Map<String,Object> map);
+
     // 添加零星物资
     int addSporadicOrder(Map<String,Object> map);
 
+    //添加内转零星物资
+    int addInwardSporadicOrder(Map<String,Object> map);
+
     // 查询零星物资订单列表
     List<Map<String, Object>> getSporadicOrdersList(Map<String, Object> mapValue);
 
@@ -46,4 +50,12 @@ public interface IAmstruckSporadicOrderService {
 
     //一车多趟运输顶单排车
     int addSporadicOrderforTimes(Map<String,Object> map);
+
+<<<<<<< HEAD
+    //一车多趟作废订单
+    int deletedSporadicOrder(Map<String,Object> map);
+=======
+    //一车多趟停止
+    int closeSporadicOrder(Map<String,Object> map);
+>>>>>>> master
 }

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

@@ -64,15 +64,14 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             BigDecimal carrierId = new BigDecimal((Integer) mapValue.get("carrierId"));
             // 得到订单类型
             BigDecimal orderType = new BigDecimal((Integer) mapValue.get("orderType"));
-
             // 得到运输路径
             BigDecimal lineId = new BigDecimal((Integer) mapValue.get("lineId"));
+            String userId=(String) mapValue.get("userId");
             // 获取主键id
             BigDecimal sporadicOrderId = amstruckSporadicOrderMapper.selectSporadicOrderId();
             AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
             // 设置零星物流主键
             amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
-
             // 设置零星物流编号
             amstruckSporadicOrder.setSporadicOrderNo(DataChange.generateEightDigitsNumber("WLXDD", sporadicOrderId.intValue()));
             // 设置发货单位
@@ -80,7 +79,10 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             // 设置收货单位
             amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
             // 设置承运商
-            amstruckSporadicOrder.setCarrierId(carrierId);
+            // 判断承运商是否为空
+            if (carrierId!=null) {
+               amstruckSporadicOrder.setCarrierId(carrierId);
+           }
             // 设置下发状态
             amstruckSporadicOrder.setIssueStatus(new BigDecimal(0));
             amstruckSporadicOrder.setInsertTime(new Date());
@@ -96,7 +98,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue()));
             omstruckOrder.setOrderType(orderType);
             omstruckOrder.setInsertTime(new Date());
-            omstruckOrder.setInsertUsername("admin");
+            omstruckOrder.setInsertUsername(userId);
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setLineId(lineId);
             // 新增总实绩id
@@ -147,10 +149,10 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         BigDecimal sendUnit = new BigDecimal((Integer) map.get("supplierId"));
         // 收货单位
         BigDecimal receiveUnitId = new BigDecimal((Integer) map.get("receiveId"));
-        // 承运商
-        BigDecimal carrierId = new BigDecimal((Integer) map.get("carrierId"));
         // 得到订单类型
         BigDecimal orderType = new BigDecimal((Integer) map.get("orderType"));
+        // 获取用户id
+        String userId=(String) map.get("userId");
         // 得到运输路径
         BigDecimal lineId = new BigDecimal((Integer) map.get("lineId"));
         BigDecimal sporadicOrderId = amstruckSporadicOrderMapper.selectSporadicOrderId();
@@ -159,15 +161,19 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         amstruckSporadicOrder.setSporadicOrderNo(DataChange.generateEightDigitsNumber("WLXDD", sporadicOrderId.intValue()));
         amstruckSporadicOrder.setSendUnitId(sendUnit);
         amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
+        //新增初始化已运输趟次
+        amstruckSporadicOrder.setSporadicTransTimes(new BigDecimal(0));
         // 设置趟次
         BigDecimal orderTime=DataChange.dataToBigDecimal(map.get("orderTime"));
         if (orderTime!=null) {
             amstruckSporadicOrder.setSporadicOrderTimes(DataChange.dataToBigDecimal(orderTime));
         }
-        amstruckSporadicOrder.setCarrierId(carrierId);
+        if (map.get("carrierId")!=null) {
+            amstruckSporadicOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
+        }
         amstruckSporadicOrder.setIssueStatus(new BigDecimal(0));
         amstruckSporadicOrder.setInsertTime(new Date());
-        amstruckSporadicOrder.setInsertUsername("admin");
+        amstruckSporadicOrder.setInsertUsername(userId);
         amstruckSporadicOrder.setDeleted(new BigDecimal(0));
         amstruckSporadicOrder.setInsertUpdateRemark("无");
         amstruckSporadicOrder.setDispatchStatus(new BigDecimal(0));
@@ -181,7 +187,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue()));
         omstruckOrder.setOrderType(orderType);
         omstruckOrder.setInsertTime(new Date());
-        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setInsertUsername(userId);
         omstruckOrder.setInsertUpdateRemark("无");
         omstruckOrder.setLineId(lineId);
         //新增总实绩id
@@ -209,7 +215,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             }else {
                 omstruckOrderMaterial.setMaterialPriority(new BigDecimal(1));
             }
-            omstruckOrderMaterial.setInsertUsername("admin");
+            omstruckOrderMaterial.setInsertUsername(userId);
             omstruckOrderMaterial.setInsertTime(new Date());
             if (materialWeight != null) {
                 omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
@@ -226,6 +232,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             amstruckSporadicMaterial.setMaterialWeight(DataChange.dataToBigDecimal(materialWeight));
             amstruckSporadicMaterial.setMaterialNumber(DataChange.dataToBigDecimal(materialNumber));
             amstruckSporadicMaterial.setInsertTime(new Date());
+            amstruckSporadicMaterial.setInsertUsername(userId);
             result += amstruckSporadicMaterialMapper.insertSelective(amstruckSporadicMaterial);
         }
             return result;
@@ -236,18 +243,29 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
     public int addSporadicOrder(Map<String, Object> map) {
         Integer orderType =(Integer) map.get("orderType");
         switch (orderType){
-            case 12:addSporadicOrders(map);
-                     break;
-            case 13:addSporadicOrders(map);
-                     break;
-            case 15: addSporadicOrdersForCoke(map);
-                     break;
+   //      case 12:addSporadicOrders(map);
+  //               break;
+  //       case 13:addSporadicOrders(map);
+  //                break;
+            case 15:
             case 16: addSporadicOrdersForCoke(map);
                     break;
         }
         return 1;
     }
 
+    @Override
+    public int addInwardSporadicOrder(Map<String, Object> map) {
+        int result=0;
+        BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
+        //添加承运商
+        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
+        amstruckSporadicOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
+        result += amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+        return result ;
+    }
+
     /**
      * 下发零星物资订单
      * @param mapList
@@ -258,6 +276,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         int result = 0;
         // 遍历
         for (Map<String, Object> map : mapList) {
+            //零星订单修改订单状态
             OmstruckOrder omstruckOrder=new OmstruckOrder();
             omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             omstruckOrder.setOrderStatus(new BigDecimal(3));
@@ -315,14 +334,18 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 }else{
                     mapList = amstruckSporadicOrderMapper.getSporadicOrdersList1(mapValue);
                 }
+                //没有承运商状态
+                if (DataChange.dataToBigDecimal(mapValue.get("sporadicStatus")).intValue()==3) {
+                    mapList =amstruckSporadicMaterialMapper.getSporadicOrdersList3(mapValue);
+                }
                 for (Map<String, Object> map1 : mapList) {
                     BigDecimal type = (BigDecimal) map1.get("type");
                     String orderType = "";
                     if (type.intValue() == 15) {
-                        orderType += "零星物资一车多趟进厂";
+                        orderType += "内转零星进厂";
                     }
                     if (type.intValue() == 16) {
-                        orderType += "零星物资一车多趟出厂";
+                        orderType += "内转零星出厂";
                     }
                     map1.put("orderType", orderType);
                 }
@@ -353,13 +376,17 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         BigDecimal sporadicOrderId = new BigDecimal((Integer) mapValue.get("sporadicOrderId"));
         BigDecimal sendUnitId = new BigDecimal((Integer) mapValue.get("sendUnitId"));
         BigDecimal receiveUnitId = new BigDecimal((Integer) mapValue.get("receiveUnitId"));
+
         BigDecimal carrierId = new BigDecimal((Integer) mapValue.get("carrierId"));
+        String userId =(String) mapValue.get("userId");
         AmstruckSporadicOrder amstruckSporadicOrder = amstruckSporadicOrderMapper.selectByPrimaryKey(sporadicOrderId);
         amstruckSporadicOrder.setSendUnitId(sendUnitId);
         amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
-        amstruckSporadicOrder.setCarrierId(carrierId);
+        if (carrierId!=null) {
+            amstruckSporadicOrder.setCarrierId(carrierId);
+        }
         amstruckSporadicOrder.setUpdateTime(new Date());
-        amstruckSporadicOrder.setUpdateUsername("admin");
+        amstruckSporadicOrder.setUpdateUsername(userId);
         int result = amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
         return result;
     }
@@ -374,6 +401,10 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         List<Map<String, Object>> mapList = amstruckSporadicOrderMapper.selectSporadicOrder(new BigDecimal(sporadicOrderId));
         return mapList;
     }
+
+
+
+
     //一车多趟
     @Override
     public int addSporadicOrderforTimes(Map<String, Object> map) {
@@ -382,6 +413,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             for (Map<String,Object> map1:maps){
                 Integer orderId =(Integer) map.get("orderId");
                 Integer sporadicOrderId =(Integer) map.get("sporadicOrderId");
+                String userId =(String) map1.get("userId");
+                //修改零星订单下发状态
                 AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
                 amstruckSporadicOrder.setSporadicOrderId(DataChange.dataToBigDecimal(sporadicOrderId));
                 amstruckSporadicOrder.setDispatchStatus(new BigDecimal(1));
@@ -394,8 +427,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map2.get("orderPlanId")));
                 omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", orderId1.intValue()));
-                //omstruckOrder.setOrderLineSequence(DataChange.dataToBigDecimal(map2.get("lineSqe")));
+                //设置新增时间
                 omstruckOrder.setInsertTime(new Date());
+                omstruckOrder.setInsertUsername(userId);
                 omstruckOrder.setLineId(DataChange.dataToBigDecimal(map2.get("lineId")));
                 omstruckOrder.setOrderType(DataChange.dataToBigDecimal(map2.get("orderType")));
                 result += omstruckOrderMapper.insertSelective(omstruckOrder);
@@ -404,6 +438,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
                 tmstruckTotalResult.setOrderId(omstruckOrder.getOrderId());
                 tmstruckTotalResult.setInsertTime(new Date());
+                tmstruckTotalResult.setInsertUsername(userId);
                 result+=tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
                 //新增订单子表
                 OmstruckOrderMaterial omstruckOrderMaterial=new OmstruckOrderMaterial();
@@ -414,8 +449,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map2.get("materialWeight")));
                 omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map2.get("materialPriority")));
                 omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setInsertUsername(userId);
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
-                   //设置运力id
+                //设置运力id
                 Integer capacityId = (Integer) map1.get("capacityId");
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityId));
@@ -427,4 +463,28 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
 
         return result;
     }
+<<<<<<< HEAD
+   //作废零星订单
+    @Override
+    public int deletedSporadicOrder(Map<String, Object> map) {
+        BigDecimal orderId =(BigDecimal) map.get("orderId");
+        //根据运输订单id查找零星订单id
+        Map<String, Object> map1 = amstruckSporadicOrderMapper.selectOrderInfo(orderId.intValue());
+        BigDecimal orderPlanId =(BigDecimal) map1.get("orderPlanId");
+        //根据零星订单id设置趟次
+        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+        amstruckSporadicOrder.setSporadicOrderId(orderPlanId);
+=======
+
+    //关闭零星订单,将订单吗状态设置为0  无法推送新的订单。
+    @Override
+    public int closeSporadicOrder(Map<String, Object> map) {
+        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
+        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
+        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
+>>>>>>> master
+        amstruckSporadicOrder.setSporadicOrderTimes(new BigDecimal(0));
+        amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
+        return 1;
+    }
 }

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -5,5 +6,21 @@ spring:
     username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-ams-api-dev
+    name: DAL-OMS-API-DEV
 
+#feign设置
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.162:8011}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.162:8018}
+
+
+
+  #测试环境端口
+server:
+    port: 8015

src/main/resources/application-prod.yml

@@ -1,3 +1,4 @@
+#正式环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -5,4 +6,21 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-ams-api-dev
+<<<<<<< HEAD
+    name: dil-ams-api-dev
+
+ openfeign:
+#   正式环境
+   ESFeign:
+     url: ${ESFEIGN_URL:172.16.33.166:8089}
+   ColumnDataFeign:
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+   TmsTruckFeign:
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+   ImFeign:
+      url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+ #正式环境端口
+
+server:
+  port: 8079

src/main/resources/bootstrap.yml

@@ -12,27 +12,6 @@ spring:
   mvc:
     static-path-pattern:
 
-openfeign:
-  #   正式环境
-  #  ESFeign:
-  #    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  #  ColumnDataFeign:
-  #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  #  TmsTruckFeign:
-  #    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  #  ImFeign:
-  #    url: ${IMFEIGN_URL:172.16.33.166:8055}
-
-  #   测试环境
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.162:8011}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
-
 #eureka设置
 eureka:
   client:
@@ -71,8 +50,3 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 
-server:
-  #  正式
-  #  port: 8079
-  #  测试
-  port: 8015

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

@@ -370,7 +370,6 @@
 
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <select id="getSporadicOrdersList2" resultType="java.util.Map">
     select *
     from(
@@ -406,6 +405,85 @@
     <if test="dispatchStatus != null">
       AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
     </if>
+    <if test="userId!=null">
+      and aso.INSERT_USERNAME=#{userId}
+    </if>
+    )
+    <where>
+      <if test="sporadicOrderNo != null">
+        and
+        <foreach collection="sporadicOrderNo" item="item" open="(" separator="or" close=")">
+          "sporadicOrderNo" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="supplierName != null">
+        and
+        <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+          "supplierName" 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="carrierName != null">
+        and
+        <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+          "carrierName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="insertTime != null">
+        and
+        <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+          "insertTime" like to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderBy"></include>
+  </select>
+
+
+  <select id="getSporadicOrdersList3" resultType="java.util.Map">
+    select *
+    from(
+    SELECT
+    DISTINCT ASO.SPORADIC_ORDER_ID AS "sporadicOrderId",
+    ASO.SPORADIC_ORDER_NO AS "sporadicOrderNo",
+    RSU.SUPPLIER_NAME AS "supplierName",
+    RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+    RCA.CARRIER_NAME AS "carrierName",
+    ASO.INSERT_TIME AS "insertTime",
+    OO.ORDER_TYPE AS "type",
+    RM.MATERIAL_NAME AS "materialName",
+    ASO.SPORADIC_ORDER_TIMES "sporadicOrderTimes"
+    FROM AMSTRUCK_SPORADIC_ORDER ASO
+    LEFT JOIN RMS_CONSIGNEE RCO
+    ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
+    LEFT JOIN RMS_SUPPLIER RSU
+    ON ASO.SEND_UNIT_ID = RSU.SUPPLIER_ID
+    LEFT JOIN RMS_CARRIER RCA
+    ON RCA.CARRIER_ID = ASO.CARRIER_ID
+    LEFT JOIN OMSTRUCK_ORDER OO
+    ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+    LEFT JOIN
+    OMSTRUCK_ORDER_MATERIAL OOM
+    ON OOM.ORDER_ID = OO.ORDER_ID
+    LEFT JOIN
+    RMS_MATERIAL RM
+    ON
+    OOM.MATERIAL_ID = RM.MATERIAL_ID
+    WHERE OO.ORDER_TYPE in (15,16)
+    AND ASO.ISSUE_STATUS =1
+    AND ASO.DELETED = 0
+    AND  ASO.CARRIER_ID IS  NULL
+    <if test="dispatchStatus != null">
+      AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
+    </if>
+    <if test="userId!=null">
+      and aso.INSERT_USERNAME=#{userId}
+    </if>
     )
     <where>
       <if test="sporadicOrderNo != null">
@@ -441,6 +519,10 @@
     </where>
     <include refid="orderBy"></include>
   </select>
+
+
+
+
   <!-- 排序 -->
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">

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

@@ -16,16 +16,17 @@
         <result column="SPORADIC_ORDER_NO" jdbcType="VARCHAR" property="sporadicOrderNo" />
         <result column="SPORADIC_ORDER_TIMES" jdbcType="DECIMAL" property="sporadicOrderTimes" />
         <result column="DISPATCH_STATUS" jdbcType="DECIMAL" property="dispatchStatus" />
+        <result column="SPORADIC_TRANS_TIMES" jdbcType="DECIMAL" property="sporadicTransTimes" />
     </resultMap>
     <sql id="columns">
         SPORADIC_ORDER_ID, SEND_UNIT_ID, RECEIVE_UNIT_ID, CARRIER_ID, INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO,
-    SPORADIC_ORDER_TIMES, DISPATCH_STATUS
+    SPORADIC_ORDER_TIMES, DISPATCH_STATUS, SPORADIC_TRANS_TIMES
     </sql>
     <sql id="columns_alias">
         t.SPORADIC_ORDER_ID, t.SEND_UNIT_ID, t.RECEIVE_UNIT_ID, t.CARRIER_ID, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.ISSUE_STATUS, t.SPORADIC_ORDER_NO, t.SPORADIC_ORDER_TIMES, t.DISPATCH_STATUS
+    t.ISSUE_STATUS, t.SPORADIC_ORDER_NO, t.SPORADIC_ORDER_TIMES, t.DISPATCH_STATUS, t.SPORADIC_TRANS_TIMES
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_SPORADIC_ORDER
@@ -77,6 +78,9 @@
             <if test="dispatchStatus != null">
                 and DISPATCH_STATUS = #{dispatchStatus}
             </if>
+            <if test="sporadicTransTimes != null">
+                and SPORADIC_TRANS_TIMES = #{sporadicTransTimes}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -123,6 +127,9 @@
             <if test="dispatchStatus != null">
                 and DISPATCH_STATUS = #{dispatchStatus}
             </if>
+            <if test="sporadicTransTimes != null">
+                and SPORADIC_TRANS_TIMES = #{sporadicTransTimes}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -171,18 +178,23 @@
         <if test="dispatchStatus != null">
             or DISPATCH_STATUS = #{dispatchStatus}
         </if>
+        <if test="sporadicTransTimes != null">
+            or SPORADIC_TRANS_TIMES = #{sporadicTransTimes}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         insert into AMSTRUCK_SPORADIC_ORDER (SPORADIC_ORDER_ID, SEND_UNIT_ID, RECEIVE_UNIT_ID,
                                              CARRIER_ID, INSERT_USERNAME, INSERT_TIME,
                                              UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                              DELETED, ISSUE_STATUS, SPORADIC_ORDER_NO,
-                                             SPORADIC_ORDER_TIMES, DISPATCH_STATUS)
+                                             SPORADIC_ORDER_TIMES, DISPATCH_STATUS, SPORADIC_TRANS_TIMES
+        )
         values (#{sporadicOrderId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL},
                 #{carrierId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleted,jdbcType=DECIMAL}, #{issueStatus,jdbcType=DECIMAL}, #{sporadicOrderNo,jdbcType=VARCHAR},
-                #{sporadicOrderTimes,jdbcType=DECIMAL}, #{dispatchStatus,jdbcType=DECIMAL})
+                #{sporadicOrderTimes,jdbcType=DECIMAL}, #{dispatchStatus,jdbcType=DECIMAL}, #{sporadicTransTimes,jdbcType=DECIMAL}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
         insert into AMSTRUCK_SPORADIC_ORDER
@@ -229,6 +241,9 @@
             <if test="dispatchStatus != null">
                 DISPATCH_STATUS,
             </if>
+            <if test="sporadicTransTimes != null">
+                SPORADIC_TRANS_TIMES,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sporadicOrderId != null">
@@ -273,6 +288,9 @@
             <if test="dispatchStatus != null">
                 #{dispatchStatus,jdbcType=DECIMAL},
             </if>
+            <if test="sporadicTransTimes != null">
+                #{sporadicTransTimes,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
@@ -289,7 +307,8 @@
             ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL},
             SPORADIC_ORDER_NO = #{sporadicOrderNo,jdbcType=VARCHAR},
             SPORADIC_ORDER_TIMES = #{sporadicOrderTimes,jdbcType=DECIMAL},
-            DISPATCH_STATUS = #{dispatchStatus,jdbcType=DECIMAL}
+            DISPATCH_STATUS = #{dispatchStatus,jdbcType=DECIMAL},
+            SPORADIC_TRANS_TIMES = #{sporadicTransTimes,jdbcType=DECIMAL}
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckSporadicOrder">
@@ -334,6 +353,9 @@
             <if test="dispatchStatus != null">
                 DISPATCH_STATUS = #{dispatchStatus,jdbcType=DECIMAL},
             </if>
+            <if test="sporadicTransTimes != null">
+                SPORADIC_TRANS_TIMES = #{sporadicTransTimes,jdbcType=DECIMAL},
+            </if>
         </set>
         where SPORADIC_ORDER_ID = #{sporadicOrderId,jdbcType=DECIMAL}
     </update>
@@ -357,8 +379,8 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
         ISSUE_STATUS, SPORADIC_ORDER_NO,
-        SPORADIC_ORDER_TIMES, DISPATCH_STATUS
-        )
+        SPORADIC_ORDER_TIMES, DISPATCH_STATUS,
+        SPORADIC_TRANS_TIMES)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.sporadicOrderId,jdbcType=DECIMAL},
@@ -367,8 +389,8 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.issueStatus,jdbcType=DECIMAL}, #{item.sporadicOrderNo,jdbcType=VARCHAR},
-        #{item.sporadicOrderTimes,jdbcType=DECIMAL}, #{item.dispatchStatus,jdbcType=DECIMAL}
-        from dual
+        #{item.sporadicOrderTimes,jdbcType=DECIMAL}, #{item.dispatchStatus,jdbcType=DECIMAL},
+        #{item.sporadicTransTimes,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -430,6 +452,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
             when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.dispatchStatus,jdbcType=DECIMAL}
         </foreach>
+        ,SPORADIC_TRANS_TIMES=
+        <foreach close="end" collection="list" index="index" item="item" open="case SPORADIC_ORDER_ID" separator=" ">
+            when #{item.sporadicOrderId,jdbcType=DECIMAL} then #{item.sporadicTransTimes,jdbcType=DECIMAL}
+        </foreach>
         where SPORADIC_ORDER_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.sporadicOrderId,jdbcType=DECIMAL}
@@ -469,7 +495,8 @@
         ASO.INSERT_TIME AS "insertTime",
         OO.ORDER_TYPE AS "type",
         OO.ORDER_ID "orderId",
-        RM.MATERIAL_NAME "materialName"
+        RM.MATERIAL_NAME "materialName",
+        ASO.SPORADIC_TRANS_TIMES "transTimes"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
         ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -526,8 +553,8 @@
 
     <!--   查询一车多趟零星物资 -->
     <select id="getSporadicOrdersList1" parameterType="java.util.Map" resultType="java.util.Map">
-       select *
-       from(
+        select *
+        from(
         SELECT
         ASO.SPORADIC_ORDER_ID AS "sporadicOrderId",
         ASO.SPORADIC_ORDER_NO AS "sporadicOrderNo",
@@ -538,7 +565,8 @@
         OO.ORDER_TYPE AS "type",
         OO.ORDER_ID "orderId",
         RM.MATERIAL_NAME AS "materialName",
-        ASO.SPORADIC_ORDER_TIMES "sporadicOrderTimes"
+        ASO.SPORADIC_ORDER_TIMES "sporadicOrderTimes",
+        ASO.SPORADIC_TRANS_TIMES "tranTimes"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
         ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -555,19 +583,22 @@
         RMS_MATERIAL RM
         ON
         OOM.MATERIAL_ID = RM.MATERIAL_ID
-            WHERE OO.ORDER_TYPE in (15,16)
-            AND ASO.ISSUE_STATUS = #{issueStatus}
-            AND ASO.DELETED = 0
-            <if test="dispatchStatus != null">
-                AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
-            </if>
-            <if test="carrierSsoId != null">
-                and aso.carrier_id =
-                (select rce.carrier_id
-                from rms_carrier rce
-                where rce.carrier_sso_id = #{carrierSsoId})
-            </if>
-            )
+        WHERE OO.ORDER_TYPE in (15,16)
+        AND ASO.ISSUE_STATUS = #{issueStatus}
+        AND ASO.DELETED = 0
+        <if test="dispatchStatus != null">
+            AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
+        </if>
+        <if test="carrierSsoId != null">
+            and aso.carrier_id =
+            (select rce.carrier_id
+            from rms_carrier rce
+            where rce.carrier_sso_id = #{carrierSsoId})
+        </if>
+        <if test="userId != null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        )
         <where>
             <if test="sporadicOrderNo != null">
                 and
@@ -650,7 +681,7 @@
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         WHERE SPORADIC_ORDER_ID = #{sporadicOrderId}
     </select>
-<!--  根基运输订单id查找运输订单信息  -->
+    <!--  根基运输订单id查找运输订单信息  -->
     <select id="selectOrderInfo" parameterType="java.lang.Integer" resultType="java.util.Map">
         select OO.ORDER_PLAN_ID "orderPlanId",
                OO.ORDER_NUMBER "orderNumber",
@@ -662,9 +693,11 @@
                OOM.MATERIAL_PRIORITY "materialPriority",
                OO.ORDER_TYPE "orderType"
         from OMSTRUCK_ORDER OO
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on OO.ORDER_ID=OOM.ORDER_ID
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OO.ORDER_ID=OOM.ORDER_ID
         where OO.ORDER_ID=#{orderId}
     </select>
 
+
+
 </mapper>