Merge branch 'dev'

pom.xml

@@ -48,6 +48,29 @@
     </distributionManagement>
 
     <dependencies>
+        <!--minio-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.2.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--Redis-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!--中交新路的包这个问杨-->
+        <dependency>
+            <groupId>com.ZhongJiaoXingLu</groupId>
+            <artifactId>openapi-sdk</artifactId>
+            <version>6.0</version>
+        </dependency>
         <!--websocket-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -94,6 +117,19 @@
             <artifactId>framework</artifactId>
             <version>1.0</version>
         </dependency>
+        <!-- httpClient远程调用接口 -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <!-- fastJson转换-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.75</version>
+        </dependency>
+
 
 
     </dependencies>
@@ -105,13 +141,18 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@192.168.1.51:1521:steerinfo</connUrl>
-                    <user>DIL0901</user>
-                    <password>st#0901</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TMSTRUCK_LOAD_RESULT</param>
+<!--                        <param>TMSTRUCK_MEASURE_COMMISSION</param>-->
+<!--                        <param>TMSTRUCK_LOAD_RESULT</param>-->
+<!--                        <param>TMSTRUCK_LEAVE_FACTORY_RESULT</param>-->
+<!--                        <param>TMSTRUCK_UNLOAD_RESULT</param>-->
+<!--                        <param>TMSTRUCK_WEIGHT_RESULT</param>-->
+
                     </tables>
                 </configuration>
                 <executions>
@@ -123,6 +164,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <resources>
             <resource>

src/main/java/com/steerinfo/dil/config/AsyncConfiguration.java

@@ -0,0 +1,35 @@
+package com.steerinfo.dil.config;
+
+import io.swagger.annotations.Api;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+@EnableAsync
+@Api("多线程配置")
+public class AsyncConfiguration {
+    @Bean("doSomethingExecutor")
+    public Executor doSomeThingExecutor(){
+        ThreadPoolTaskExecutor executor=new ThreadPoolTaskExecutor();
+        //创建时候线程数量
+        executor.setCorePoolSize(10);
+        //最大时候的线程数量
+        executor.setMaxPoolSize(20);
+        //缓冲队列：用来缓冲执行任务的队列
+        executor.setQueueCapacity(500);
+        //允许线程空闲时间
+        executor.setKeepAliveSeconds(60);
+        //线程池前缀
+        executor.setThreadNamePrefix("do-something-");
+        //缓冲队列满了之后的拒绝策略
+        // 缓冲队列满了之后的拒绝策略：由调用线程处理（一般是主线程）
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy());
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/steerinfo/dil/config/RedisConfiguration.java

@@ -0,0 +1,46 @@
+package com.steerinfo.dil.config;
+
+
+import com.steerinfo.route.config.KeyExpiredListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * @program: SpringCloud * @description: redis配置类 * @author: zhang yi * @create: 2020-03-24 14:17
+ */
+@Configuration
+public class RedisConfiguration {
+    @Autowired
+    private RedisConnectionFactory redisConnectionFactory;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Bean
+    public RedisTemplate<String, Object> stringSerializerRedisTemplate() {
+        RedisSerializer<String> stringSerializer = new StringRedisSerializer();
+        redisTemplate.setKeySerializer(stringSerializer);
+        redisTemplate.setValueSerializer(stringSerializer);
+        redisTemplate.setHashKeySerializer(stringSerializer);
+        redisTemplate.setHashValueSerializer(stringSerializer);
+        return redisTemplate;
+    }
+
+    @Bean
+    public RedisMessageListenerContainer redisMessageListenerContainer() {
+        RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
+        redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
+        return redisMessageListenerContainer;
+    }
+
+    @Bean
+    public KeyExpiredListener keyExpiredListener() {
+        return new KeyExpiredListener(this.redisMessageListenerContainer());
+    }
+}

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

@@ -1,221 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.steerinfo.dil.feign.ESFeign;
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.dil.service.IAmstruckPurplanMaterialService;
-import com.steerinfo.dil.service.IAmstruckPurplanService;
-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.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-import com.steerinfo.dil.util.ColumnDataUtil;
-
-/**
- * AmstruckPurplan RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-02 10:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-02
- * 作者：TXF
- * 参考：
- * 描述：AmstruckPurplan RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/amstruckpurplans")
-public class AmstruckPurplanController extends BaseRESTfulController {
-
-    @Autowired
-    IAmstruckPurplanMaterialService amstruckPurplanMaterialService;
-
-    @Autowired
-    IAmstruckPurplanService amstruckPurplanService;
-
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    @Autowired
-    ESFeign esFeign;
-
-    @ApiOperation(value="查询运输预约")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(79)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllPurPlan")
-    public RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer status){
-        //初始化过滤
-        List<Map<String, Object>> detailListTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue==null){
-            mapValue = new HashMap<>();
-            mapValue.put("planStatus", status);
-            //将查询结果存入索引中
-            detailListTotal = amstruckPurplanService.getAllPurPlan(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_pur_plan_list");
-            //添加id
-            map.put("indexId","planId");
-            detailListTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(detailListTotal);
-            esFeign.insertIndex(detailListTotal);
-            //删除
-            detailListTotal.remove(detailListTotal.size()-1);
-        }else {
-            mapValue.put("planStatus", status);
-        }
-        if(detailListTotal == null){
-            detailListTotal = amstruckPurplanService.getAllPurPlan(mapValue);
-        }
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, detailListTotal,purPlan);
-        return success(pageList);
-    }
-    //框计算查询
-    @PostMapping("/getAllPurPlan/{apiId}")
-    public RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       @PathVariable("apiId") Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer status,
-                                       String con){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        //设置要查询的索引名称
-        String index="get_pur_plan_list";
-        mapValue.put("planStatus", status);
-        //获取查询结果
-        PageListAdd pageList = esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con);
-        return success(pageList);
-    }
-
-
-
-    @ApiOperation(value="通过Id查询请车作业")
-    @PostMapping ("/getPurPlanById/{planId}")
-    public RESTfulResult getWagonPleaseById(@PathVariable("planId")Integer planId){
-        List<Map<String, Object>> purPlanById = amstruckPurplanService.getPurPlanById(planId);
-        return success(purPlanById);
-    }
-
-    @ApiOperation(value="新增运输计划 状态：0")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/addPurPlan")
-    public RESTfulResult addPurPlan(@RequestBody AmstruckPurplan amstruckPurplan){
-        int i = amstruckPurplanService.addPurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="修改运输计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "请车作业实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/updatePurPlan")
-    public RESTfulResult updatePurPlan(@RequestBody AmstruckPurplan amstruckPurplan){
-        amstruckPurplan.setUpdateTime(new Date()); //设置更新时间
-        int i = amstruckPurplanService.updatePurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="下发运输计划 状态：1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/sendPurPlan/{planId}")
-    public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId){
-        AmstruckPurplan amstruckPurplan = new AmstruckPurplan();
-        amstruckPurplan.setPlanId(new BigDecimal(planId));
-        amstruckPurplan.setPlanStatus(new BigDecimal(1));
-        int i = amstruckPurplanService.sendPurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="接收运输计划 状态：2")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/receptionPurPlan/{planId}")
-    public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId){
-        AmstruckPurplan amstruckPurplan = new AmstruckPurplan();
-        amstruckPurplan.setPlanId(new BigDecimal(planId));
-        amstruckPurplan.setPlanStatus(new BigDecimal(2));
-        int i = amstruckPurplanService.receptionPurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="逻辑删除运输计划 状态：3")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deletePurPlan/{planId}")
-    public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId){
-        AmstruckPurplan amstruckPurplan = new AmstruckPurplan();
-        amstruckPurplan.setPlanId(new BigDecimal(planId));
-        amstruckPurplan.setPlanStatus(new BigDecimal(3));
-        int i = amstruckPurplanService.deletePurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-//    ******************************************************************************************************************
-
-    @ApiOperation(value="查询要分派的计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(82)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getDecomposedPlan")
-    public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer planId,
-                                               Integer status){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(planId != null){
-            mapValue.put("planId", planId);
-        }
-        if(status != null){
-            mapValue.put("planStatus", status);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> plan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
-        return success(pageList);
-    }
-
-
-
-}

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

@@ -26,7 +26,6 @@ import java.util.Map;
 public class DropDownController extends BaseRESTfulController {
 
     //********************************运输计划下拉框接口******************************************
-
     @Autowired
     DropDownServiceImpl dropDownService;
 
@@ -96,4 +95,46 @@ public class DropDownController extends BaseRESTfulController {
         List<Map<String, Object>> port = dropDownService.getPort();
         return success(port);
     }
+
+    @ApiOperation(value="查询所有的月台")
+    @GetMapping("/getPlatformId")
+    public RESTfulResult getPlatformId(){
+        List<Map<String, Object>> port = dropDownService.getPlatformId();
+        return success(port);
+    }
+    //内转物流下拉框
+    @ApiOperation(value="查询装货地点")
+    @GetMapping("/getLoadedPlace")
+    public RESTfulResult getLoadedPlace(){
+        List<Map<String, Object>> loadedPlace = dropDownService.getLoadedPlace();
+        return success(loadedPlace);
+    }
+
+    @ApiOperation(value="查询外轮船名")
+    @GetMapping("/getForeignName")
+    public RESTfulResult getForeignName(){
+        List<Map<String, Object>> foreignName = dropDownService.getForeignName();
+        return success(foreignName);
+    }
+
+    @ApiOperation(value="查询卸货点")
+    @GetMapping("/getUnloadPoint/{type}")
+    public RESTfulResult getUnloadPoint(@PathVariable("type") Integer type){
+        List<Map<String, Object>> mes = dropDownService.getUnloadPoint(type);
+        return success(mes);
+    }
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("/getOrderMaterial/{orderId}")
+    public RESTfulResult getOrderMaterial(@PathVariable("orderId") Integer orderId){
+        List<Map<String, Object>> mes = dropDownService.getOrderMaterial(orderId);
+        return success(mes);
+    }
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("/getPlatformIdByWarehouse/{warehouseId}")
+    public RESTfulResult getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId){
+        List<Map<String, Object>> mes = dropDownService.getPlatformIdByWarehouse(warehouseId);
+        return success(mes);
+    }
 }

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

@@ -1,333 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.IOmstruckOrderService;
-
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.PageListAdd;
-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.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * OmstruckOrder RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 03:47
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：TXF
- * 参考：
- * 描述：OmstruckOrder RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/omstruckorders")
-public class OmstruckOrderController extends BaseRESTfulController {
-
-    @Autowired
-    IOmstruckOrderService omstruckOrderService;
-
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    @ApiOperation(value="查询所有运输订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(86)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllTruckOrder")
-    public RESTfulResult getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer orderStatus,
-                                       Integer planId,
-                                       Integer orderType){
-
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderStatus != null){
-            mapValue.put("orderStatus", orderStatus);
-        }
-        if(planId != null){
-            mapValue.put("planId", planId);
-        }
-        if(orderType != null){
-            mapValue.put("orderType", orderType);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allTruckOrder = omstruckOrderService.getAllTruckOrder(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> truckOrder = omstruckOrderService.getAllTruckOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allTruckOrder,truckOrder);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="不适用表头返回数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getAllTruckOrderReturnListMap")
-    public RESTfulResult getAllTruckOrder(
-                                          Integer orderStatus,
-                                          Integer planId,
-                                          Integer orderType){
-        Map<String, Object> map = new HashMap<>();
-        if(orderStatus != null){
-            map.put("orderStatus", orderStatus);
-        }
-        if(planId != null){
-            map.put("planId", planId);
-        }
-        if(orderType != null){
-            map.put("orderType", orderType);
-        }
-        List<Map<String, Object>> truckOrder = omstruckOrderService.getAllTruckOrder(map);
-        return success(truckOrder);
-    }
-
-    @ApiOperation(value="查询所有空闲的运力信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllCapacity")
-    public RESTfulResult getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer carrierId
-                                               ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(carrierId != null){
-            mapValue.put("carrierId", carrierId);
-        }
-        mapValue.put("capacityTypeId", 1);
-        mapValue.put("capacityStatus", 0);
-        //不分页筛选数据
-        List<Map<String, Object>> allCapacity = omstruckOrderService.getAllCapacity(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> capacity = omstruckOrderService.getAllCapacity(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="分解运输计划后 新增订单  或者直接新增订单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/addPurOrder")
-    public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = omstruckOrderService.addPurOrder(mapValue);
-        return success(i);
-    }
-
-    @ApiOperation(value="修改分派计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/updateOrder")
-    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map){
-        int i = omstruckOrderService.updateOrder(map);
-        return success(i);
-    }
-
-    @ApiOperation(value="派单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/dispatchOrder/{orderId}")
-    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId){
-        int i = omstruckOrderService.dispatchOrder(orderId);
-        return success(i);
-    }
-
-    @ApiOperation(value="逻辑删除运单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deleteOrder")
-    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
-                                     Integer planId){
-        if(planId != null){
-            map.put("planId", planId);
-        }
-        Object orderMaterialWeight = map.get("orderMaterialWeight");
-        if(orderMaterialWeight != null){
-            if(orderMaterialWeight instanceof  Integer){
-                map.put("orderMaterialWeight", -((Integer)orderMaterialWeight));
-            }else if(orderMaterialWeight instanceof Double){
-                map.put("orderMaterialWeight", -((Double)orderMaterialWeight));
-            }
-            //模拟前端传来新重量 复用
-            map.put("weight", 0);
-        }
-        int i = omstruckOrderService.deleteOrder(map);
-        return success(i);
-    }
-
-    @ApiOperation(value="司机接收、拒绝接单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/driverReceiveOrRefuse/{orderId}")
-    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus){
-        Map<String, Object> map = new HashMap<>();
-        map.put("orderId", orderId);
-        map.put("orderReceiveStatus", orderReceiveStatus);
-        int i = omstruckOrderService.driverReceiveOrRefuse(map);
-        return success(i);
-    }
-
-    @ApiOperation(value="司机接单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        @PathVariable Integer orderReceiveStatus,
-                                        Integer orderType,
-                                        Integer orderStatus
-    ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
-        }
-        if(orderReceiveStatus != null){
-            mapValue.put("orderReceiveStatus", orderReceiveStatus);
-        }
-        if(orderStatus != null){
-            mapValue.put("orderStatus", orderStatus);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allOrder = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> order = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrder,order);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "运输计划Id", required = false, dataType = "String"),
-    })
-    @PostMapping("/sendMesToDriver")
-    public RESTfulResult sendMesToDriver(String capacityNumber, Integer orderStatus){
-        HashMap<String, Object> map = new HashMap<>();
-        if(orderStatus != null)
-        map.put("orderStatus", orderStatus);
-        if(capacityNumber != null)
-        map.put("capacityNumber", capacityNumber);
-        List<Map<String, Object>> mesToDriver = omstruckOrderService.sendMesToDriver(map);
-        return success(mesToDriver);
-    }
-
-    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
-    @ApiImplicitParams({
-                @ApiImplicitParam(name = "capacityNumber", value = "运输计划Id", required = false, dataType = "String"),
-    })
-    @PostMapping("/getRefuseOrderByCapacityNum")
-    public RESTfulResult sendMesToDriver(String capacityNumber){
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("capacityNumber", capacityNumber);
-        List<Map<String, Object>> receiveRefuseOrderByCapacityId = omstruckOrderService.getReceiveRefuseOrderByCapacityId(map);
-        return success(receiveRefuseOrderByCapacityId);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "运输计划Id", required = false, dataType = "String"),
-    })
-    @PostMapping("/getOrderMesByOrderNum/{orderId}")
-    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("orderId", orderId);
-        List<Map<String, Object>> mesToDriver = omstruckOrderService.getOrderMesByOrderNum(map);
-        return success(mesToDriver);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/selectPlaceAndTime/{orderId}")
-    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
-        List<Map<String, Object>> placeAndTime = omstruckOrderService.selectPlaceAndTime(new BigDecimal(orderId));
-        return success(placeAndTime);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息")
-    @PostMapping("/selectOrderByOrderId/{orderId}")
-    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
-        List<Map<String, Object>> mapList = omstruckOrderService.getOrderByOrderId(new BigDecimal(orderId));
-        return  success(mapList);
-    }
-
-    @ApiOperation(value="查看运输派单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
-    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               @PathVariable Integer orderReceiveStatus,
-                                               Integer orderType,
-                                               Integer orderStatus
-    ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
-        }
-        if(orderReceiveStatus != null){
-            mapValue.put("orderReceiveStatus", orderReceiveStatus);
-        }
-        if(orderStatus != null){
-            mapValue.put("orderStatus", orderStatus);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allOrder = omstruckOrderService.getTransportDispatch(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> order = omstruckOrderService.getTransportDispatch(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrder, order);
-        return success(pageList);
-    }
-}

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

@@ -0,0 +1,55 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
+import com.steerinfo.dil.service.impl.TmstruckMeasureCommissionServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.route.service.impl.RouteServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class TestController extends BaseRESTfulController {
+
+    @Autowired
+    private RouteServiceImpl routeService;
+    @Autowired
+    private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
+
+    @Autowired
+    TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+    @PostMapping("/savePath")
+    public String savePath() throws Exception {
+
+        Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult("WYSDD2021091000000002");
+        parem.put("turnOf","0");
+        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
+        //初始化请求参数
+//        HashMap<String,Object> mapValue=new HashMap<>();
+//        mapValue.put("orderNumber","WYSDD2021091000000001");
+//        mapValue.put("capacityNumber","豫SB6238");
+//        mapValue.put("resultOutGateTime","2021-11-17 14:20:19");
+//        mapValue.put("turnOf","0");
+//        mapValue.put("shipperName","四川达州钢铁集团有限");
+//        mapValue.put("receiveAddress","长沙市");
+        return routeService.saveRoute(parem).toString();
+    }
+    @PostMapping("/fullPath")
+    public Object fullPath(String orderNumber) throws Exception {
+        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
+        //初始化请求参数
+        HashMap<String,Object> mapValue=new HashMap<>();
+        mapValue.put("orderNumber",orderNumber);
+        return routeService.fullPathVisualization(mapValue);
+    }
+
+    @PostMapping("/addMao")
+    public int addMaoMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        return tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,13 +37,16 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckEnfactoryResultService tmstruckEnfactoryResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
     @ApiOperation(value="查询所有的进厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(99)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(220)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -50,10 +55,38 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                        Integer apiId,
                                        Integer pageNum,
-                                       Integer pageSize
+                                       Integer pageSize,
+                                       Integer orderType,
+                                       String con
                                        ){
-        //不分页筛选数据
-        List<Map<String, Object>> allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_enfactory_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> allEnFactoryResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_enfactory_list");
+            //添加id
+            map.put("indexId","enFactoryId");
+            allEnFactoryResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allEnFactoryResult);
+            //删除
+            allEnFactoryResult.remove(allEnFactoryResult.size()-1);
+        }
+        if(allEnFactoryResult == null)
+            allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> enFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
@@ -61,9 +94,33 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
+
+
+
+    @ApiOperation(value="通过PDA添加进厂实绩")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "mapValue", value = "门岗名称 运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/enFactoryResultByPDA")
+    public RESTfulResult enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckEnfactoryResultService.enFactoryResultByPDA(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="通过门禁进厂")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "门岗名称 运输订单号 车牌号 进厂时间", required = false, dataType = "Map"),
+    })
+    @PostMapping("/enFactoryResultByMJ")
+    public RESTfulResult enFactoryResultByMJ(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckEnfactoryResultService.enFactoryResultByMJ(mapValue);
+        return success(i);
+    }
+
+
+    @ApiOperation(value="新增进厂作业实绩：oms远程调用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩Id、线路起点", required = false, dataType = "Map"),
     })
     @PostMapping("/addEnFactoryResult")
     public RESTfulResult addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
@@ -71,18 +128,28 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value="PDA扫描更新进厂作业实绩")
+    @ApiOperation(value="通过运输订单id查询物资信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderId", value = "运输订单id", required = false, dataType = "Integer"),
     })
-    @PostMapping("/updateEnactoryResult")
-    public RESTfulResult updateEnactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
-//        String orderNumber= mapValue.get("orderNumber").toString();
-//        int nodeNumber = tmstruckEnfactoryResultService.selectNodeNumber(orderNumber);
-//        if (nodeNumber == 1) {
-            int i = tmstruckEnfactoryResultService.updateEnFactoryByPDA(mapValue);
-            return success(i);
-//        }
-//        return failed();
+    @GetMapping("/getMaterial")
+    public RESTfulResult getMaterial(Integer orderId){
+        List<Map<String, Object>> material = tmstruckEnfactoryResultService.getMaterial(orderId);
+        return success(material);
     }
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("/getEnfactoryResultList")
+    public RESTfulResult getEnfactoryResultList() {
+        List<Map<String,Object>> mapList = tmstruckEnfactoryResultService.getEnfactoryResultList();
+        return success(mapList);
+    }
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("/getEnfactoryMessageByOrderId")
+    public RESTfulResult getEnfactoryMessageByOrderId(@RequestParam String orderNumber) {
+        List<Map<String,Object>> mapList = tmstruckEnfactoryResultService.getEnfactoryMessageByOrderId(orderNumber);
+        return success(mapList);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -7,6 +8,7 @@ import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.route.service.impl.RouteServiceImpl;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -39,19 +41,23 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
 
     @Autowired
     ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
+    @Autowired
+    private RouteServiceImpl routeService;
+    @Autowired
+    ESFeign esFeign;
 
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-//    @ApiOperation(value="新增汽车出厂实绩")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-//    })
-//    @PostMapping("/addLeaveFactoryResult")
-//    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
-//        int i = tmstruckLeaveFactoryResultService.addLeaveFactoryResult(mapValue);
-//        return success(i);
-//    }
+    @ApiOperation(value="新增汽车出厂实绩：oms远程调用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩ID、线路终点", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLeaveFactory")
+    public RESTfulResult addLeaveFactory(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckLeaveFactoryResultService.addLeaveFactory(mapValue);
+        return success(i);
+    }
 
     @ApiOperation(value="查询出厂实绩")
     @ApiImplicitParams({
@@ -65,10 +71,35 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
     public RESTfulResult getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
-    ){
-        //不分页筛选数据
-        List<Map<String, Object>> allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
+                                          Integer pageSize,
+                                          Integer orderType,
+                                          String con){
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_leavefactory_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allLeaveFactoryResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_leavefactory_list");
+            //添加id
+            map.put("indexId","leaveFactoryId");
+            allLeaveFactoryResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allLeaveFactoryResult);
+            //删除
+            allLeaveFactoryResult.remove(allLeaveFactoryResult.size()-1);
+        }
+        if(allLeaveFactoryResult == null)
+            allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> leaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
@@ -79,16 +110,30 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
     @ApiOperation(value="PAD扫描汽车出厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderNumber", value = "", required = false, dataType = "String"),
     })
     @PostMapping("/addLeaveFactoryResult")
-    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
+    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue) throws Exception {
         String nu=mapValue.get("orderNumber").toString();
         //执行查询语句找出运输类型进行判断，是否为出厂 4 已完成计皮
         Integer i = tmstruckLeaveFactoryResultService.selectTransportRoute(nu);
+       //中交新路接口
+//        Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult("WYSDD2021091000000002");
+//        parem.put("turnOf","0");
+//        routeService.saveRoute(parem);
 //        if (i == 4) {
-            int leaveFactory=tmstruckLeaveFactoryResultService.updateLeaveFactoryByPDA(mapValue);
-            return  success(leaveFactory);
+        int leaveFactory=tmstruckLeaveFactoryResultService.leaveFactoryByPDA(mapValue);
+        return  success(leaveFactory);
 //        }else
 //            return  failed();
+
+    }
+
+    @ApiOperation(value="APP查询汽车出厂实绩")
+    @PostMapping("/getLeaveFactoryList")
+    public RESTfulResult getLeaveFactoryList(@RequestParam String orderNumber) {
+        List<Map<String,Object>> mapList = tmstruckLeaveFactoryResultService.getLeaveFactoryList(orderNumber);
+        return success(mapList);
     }
+
 }

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

@@ -1,11 +1,13 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.BaseRESTfulController;
+
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
@@ -38,9 +40,78 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckLoadResultService tmstruckLoadResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    @ApiOperation(value="生成装车实绩 ：远程调用专用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/addLoadResult")
+    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> map){
+        int i = tmstruckLoadResultService.addLoadResult(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询所有正在排队的销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(227)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSaleOrderOnQueue")
+    public RESTfulResult getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_sale_queue_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allQueueSaleOrder = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allQueueSaleOrder = tmstruckLoadResultService.getSaleOrderOnQueue(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_sale_queue_list");
+            //添加id
+            map.put("indexId","saleOrderQueueId");
+            allQueueSaleOrder.add(map);
+            //新建索引
+            esFeign.insertIndex(allQueueSaleOrder);
+            //删除
+            allQueueSaleOrder.remove(allQueueSaleOrder.size()-1);
+        }
+        if(allQueueSaleOrder == null)
+            allQueueSaleOrder = tmstruckLoadResultService.getSaleOrderOnQueue(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> queueSaleOrder = tmstruckLoadResultService.getSaleOrderOnQueue(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueSaleOrder,queueSaleOrder);
+        return success(pageList);
+    }
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateLoadingIdAndLoadSq")
+    public RESTfulResult updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map){
+        int i = tmstruckLoadResultService.updateLoadingIdAndLoadSq(map);
+        return success(i);
+    }
+
     @ApiOperation(value="查询所有装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -53,33 +124,75 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                          Integer status ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(status != null){
-            mapValue.put("status", status);
+                                        Integer status,
+                                        Integer orderType,
+                                        String con){
+        mapValue.put("status", status);
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_truck_load_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
         }
         //不分页筛选数据
-        List<Map<String, Object>> allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
+        List<Map<String, Object>> allLoadResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 2){
+            //将查询结果存入索引中
+            allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_truck_load_list");
+            //添加id
+            map.put("indexId","truckLoadId");
+            allLoadResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allLoadResult);
+            //删除
+            allLoadResult.remove(allLoadResult.size()-1);
+        }
+        if(allLoadResult == null)
+            allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> loadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
-        DataChange.changeDateToDayDate(loadResult, "resultLoadStartTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLoadResult,loadResult);
         return success(pageList);
     }
 
-    @ApiOperation(value="新增汽车装车实绩")
+    @ApiOperation(value="新增CG汽车装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
-    @PostMapping("/addLoadResult")
-    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = tmstruckLoadResultService.addLoadResult(mapValue);
+    @PostMapping("/addCGLoadResult")
+    public RESTfulResult addCGLoadResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckLoadResultService.addCGLoadResult(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="销售新增钢材装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addSaleLoadResult")
+    public RESTfulResult addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map){
+        int i = tmstruckLoadResultService.addXSLoadResult(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="销售新增钢渣、水渣、危化品装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addSale2LoadResult")
+    public RESTfulResult addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map){
+        int i = tmstruckLoadResultService.addXS2LoadResult(map);
         return success(i);
     }
 
+
     @ApiOperation(value="修改汽车装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
@@ -112,8 +225,142 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         tmstruckLoadResult.setDeleteName("admin");
         tmstruckLoadResult.setDeleteTime(new Date());
         tmstruckLoadResult.setResultId(new BigDecimal(resultId));
-        tmstruckLoadResult.setStatus(new BigDecimal(1));
+        tmstruckLoadResult.setStatus(new BigDecimal(1)); 
         int i = tmstruckLoadResultService.updateLoadResult(tmstruckLoadResult);
         return success(i);
     }
+
+    @ApiOperation(value="修改n个装车点 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/updateLoadResultList")
+    public RESTfulResult updateLoadResultList(@RequestBody(required = false) List<Map<String, Object>> mapList){
+        int i = tmstruckLoadResultService.updateLoadingIds(mapList);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "173", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllLoadResultForSale")
+    public RESTfulResult getAllLoadResultForSale(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer status ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(status != null){
+            mapValue.put("status", status);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allLoadResult = tmstruckLoadResultService.selectLoadResultForSale(mapValue);
+        for (int j=0;j<allLoadResult.size();j++){
+            Map<String,Object> map= allLoadResult.get(j);
+            Integer loadDuration = Integer.parseInt(map.get("loadDuration").toString());
+            String min=loadDuration/60+"分"+loadDuration%60+"秒";
+            map.put("min",min);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> loadResult = tmstruckLoadResultService.selectLoadResultForSale(mapValue);
+        for (int j=0;j<loadResult.size();j++){
+            Map<String,Object> map= loadResult.get(j);
+            Integer loadDuration = Integer.parseInt(map.get("loadDuration").toString());
+            String min=loadDuration/60+"分"+loadDuration%60+"秒";
+            map.put("min",min);
+        }
+        //DataChange.changeDateToDayDate(loadResult, "resultLoadStartTime");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLoadResult,loadResult);
+        return success(pageList);
+    }
+
+    //内转物流新增装车实绩
+    @ApiOperation(value="内转物流新增装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addLoadResultForconverted")
+    public RESTfulResult addLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map){
+        String orderNumber=(String)map.get("orderNumber");
+        Map<String,Object> loadResultIdForOrderNumber = tmstruckLoadResultService.getLoadResultIdForOrderNumber(orderNumber);
+        Integer loadResultId =(Integer) loadResultIdForOrderNumber.get("loadResultId");
+        //通过运输订单号查找实绩是否存在
+        int i=0;
+        int i1=0;
+        int i2=0;
+        if (loadResultId==null){
+            //执行新增
+            i=tmstruckLoadResultService.addLoadResultForconverted(map);
+            //然后执行更新
+            i1=tmstruckLoadResultService.updateLoadResultForconverted(map);
+        }
+        else {
+            i2=tmstruckLoadResultService.updateLoadResultForconverted(map);
+        }
+        return  success(i+i1+i2);
+    }
+    //***********************************内转物流*************************************************
+    /**
+     * 新增汽车装货实绩
+     */
+    @ApiOperation(value="新增汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLoadResultForConverted")
+    public RESTfulResult addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map){
+        int i = tmstruckLoadResultService.addLoadResultForConverted(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(206)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectLoadResultForConverted")
+    public RESTfulResult selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize
+    ){
+
+        //不分页筛选数据
+        List<Map<String, Object>> allLoadResult = tmstruckLoadResultService.selectLoadResultForConverted(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> loadResult = tmstruckLoadResultService.selectLoadResultForConverted(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLoadResult,loadResult);
+        return success(pageList);
+    }
+
+    //根据实绩id渲染数据
+    @ApiOperation(value="通过ID查询装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoadResultByResultId/{resultId}")
+    public RESTfulResult getLoadResultByResultId(@PathVariable("resultId") Integer resultId){
+        List<Map<String, Object>> date = tmstruckLoadResultService.selectLoadResultByResultId(resultId);
+        return success(date);
+    }
+
+    @ApiOperation(value="新增达州站-厂内装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/addDaZhouToDaGangLoadResult")
+    public RESTfulResult addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map){
+        int i = tmstruckLoadResultService.addDaZhouToDaGangLoadResult(map);
+        return success(i);
+    }
 }

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

@@ -40,10 +40,21 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllMeasureCommission/{type}")
-    public RESTfulResult getAllMeasureCommission(@PathVariable("type") Integer type){
+    public RESTfulResult getAllMeasureCommission(@PathVariable("type") Integer type, Integer orderType){
         HashMap<String, Object> mapValue = new HashMap<>();
         mapValue.put("type", type);
+        mapValue.put("orderType", orderType);
         List<Map<String, Object>> allMeasureCommission = tmstruckMeasureCommissionService.getAllMeasureCommission(mapValue);
         return success(allMeasureCommission);
     }
+
+    @ApiOperation(value="查询计量委托 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendMesToDXMeasure")
+    public RESTfulResult sendMesToDXMeasure(@RequestBody(required = false) Map<String, Object> map){
+        int i = tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+        return success(i);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmstruckQualityResult;
 import com.steerinfo.dil.service.ITmstruckQualityResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -42,6 +43,9 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckQualityResultService tmstruckQualityResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -57,10 +61,38 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
     public RESTfulResult getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,
+                                          Integer orderType,
+                                          String con
     ){
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_quality_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
         //不分页筛选数据
-        List<Map<String, Object>> allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
+        List<Map<String, Object>> allQualityResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
+            DataChange.dataTo2Number(allQualityResult, "resultDeduction");
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_quality_list");
+            //添加id
+            map.put("indexId","qualityId");
+            allQualityResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allQualityResult);
+            //删除
+            allQualityResult.remove(allQualityResult.size()-1);
+        }
+        if(allQualityResult == null)
+            allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> qualityResult = tmstruckQualityResultService.getQualityResult(mapValue);

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckReceiptResultService;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -13,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +38,9 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckReceiptResultService tmstruckReceiptResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -51,14 +56,48 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
     public RESTfulResult getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,
+                                          Integer orderType,
+                                          String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_receivee_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allReceiveResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_receivee_list");
+            //添加id
+            map.put("indexId","receiveId");
+            allReceiveResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allReceiveResult);
+            //删除
+            allReceiveResult.remove(allReceiveResult.size()-1);
+        }
+        if(allReceiveResult == null)
+            allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> receiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allReceiveResult,receiveResult);
         return success(pageList);
     }
+
+
+    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
+    @PostMapping("/addSteelNzReceiptResult")
+    public RESTfulResult addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
+        int i = tmstruckReceiptResultService.addSteelNzReceiptResult(map);
+        return success(i);
+    }
 }

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

@@ -0,0 +1,104 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.service.ITmstruckReturnResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckReturnResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-18 09:17
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckReturnResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstruckreturnresults")
+public class TmstruckReturnResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmstruckReturnResultService tmstruckReturnResultService;
+
+    @Autowired
+    ESFeign esFeign;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "新增退货实绩", notes = "需要运输订单号")
+    @PostMapping(value = "/addReturnGoodsResult")
+    public RESTfulResult addReturnGoodsResult(@RequestBody(required = false) Map<String, Object> map) {
+        int i = tmstruckReturnResultService.addReturnGoodsResult(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询所有的退货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllReturnResult")
+    public RESTfulResult getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con
+    ){
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_return_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllReturnResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            AllReturnResult = tmstruckReturnResultService.getAllReturnResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_return_list");
+            //添加id
+            map.put("indexId","returnId");
+            AllReturnResult.add(map);
+            //新建索引
+            esFeign.insertIndex(AllReturnResult);
+            //删除
+            AllReturnResult.remove(AllReturnResult.size()-1);
+        }
+        if(AllReturnResult == null)
+            AllReturnResult = tmstruckReturnResultService.getAllReturnResult(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> returnResult = tmstruckReturnResultService.getAllReturnResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllReturnResult,returnResult);
+        return success(pageList);
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmstruckSelfMachineService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-11-17 20:32
+ */
+@RestController
+@RequestMapping("/${api.version}/selfMachine")
+public class TmstruckSelfMachineController extends BaseRESTfulController {
+
+    @Autowired
+    TmstruckSelfMachineService tmstruckSelfMachineService;
+
+    /**
+     * 提货单
+     * @param orderNumber
+     * @return
+     */
+    @PostMapping("/getBillOrder")
+    public Map<String, Object> getBILLOrder(@RequestParam String orderNumber){
+       Map<String,Object>map= tmstruckSelfMachineService.getBillOrder(orderNumber);
+       return map;
+    }
+
+    @PostMapping("/getDeliveryOrder")
+    public Map<String,Object>getDeliveryOrder(String orderNumber){
+        Map<String,Object>map=tmstruckSelfMachineService.getDeliveryOrder(orderNumber);
+        return map;
+    }
+//    public static void main(String[] args) {
+//            TmstruckSelfMachineController tmstruckSelfMachineController = new TmstruckSelfMachineController();
+//        Map<String, Object> wysdd2021091000000002 = tmstruckSelfMachineController.getBILLOrder("WYSDD2021091000000002");
+//        System.out.println(wysdd2021091000000002);
+//    }
+}

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

@@ -0,0 +1,97 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.service.ITmstruckSmsRusultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckSmsRusult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-18 09:19
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckSmsRusult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstrucksmsrusults")
+public class TmstruckSmsRusultController extends BaseRESTfulController{
+
+    @Autowired
+    ITmstruckSmsRusultService tmstruckSmsRusultService;
+    @Autowired
+    ESFeign esFeign;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+    @ApiOperation(value = "新增短信实绩", notes = "通过人工稽核判断点击新增短信实绩")
+    @PostMapping(value = "/insertSmsResult")//BigDecimal
+    public RESTfulResult insertSmsResult(@RequestBody(required = false) Map<String, Object> map) {
+        int i = tmstruckSmsRusultService.addSmsResult(map);
+        return success(i);
+    }
+    //查询短信实绩
+    @ApiOperation(value="查询短信实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(175)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSmsResult")
+    public RESTfulResult getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      String con
+    ){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_sms_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allSmsResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allSmsResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_sms_list");
+            //添加id
+            map.put("indexId","smsId");
+            allSmsResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allSmsResult);
+            //删除
+            allSmsResult.remove(allSmsResult.size()-1);
+        }
+        if(allSmsResult == null){
+            allSmsResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> smsResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSmsResult,smsResult);
+        return success(pageList);
+    }
+
+}

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

@@ -0,0 +1,175 @@
+package com.steerinfo.dil.controller;
+import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.service.ITmstruckTimeTaskResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckTimeTskResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 07:28
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-22
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckTimeTskResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstrucktimetaskresults")
+public class TmstruckTimeTaskResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmstruckTimeTaskResultService tmstruckTimeTaskResultService;
+
+    @Autowired
+    ESFeign esFeign;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value="司机申请开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyStartTime")
+    public RESTfulResult applyStartTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyStartTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureStartTime")
+    public RESTfulResult unitSureStartTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureStartTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="司机申请暂停开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyStartTimeout")
+    public RESTfulResult applyStartTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyStartTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认暂停申请开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureStartTimeout")
+    public RESTfulResult unitSureStartTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureStartTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="司机申请暂停结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyEndTimeout")
+    public RESTfulResult applyEndTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyEndTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认暂停结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureEndTimeout")
+    public RESTfulResult unitSureEndTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureEndTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="司机申请结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyEndTime")
+    public RESTfulResult applyEndTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyEndTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureEndTime")
+    public RESTfulResult unitSureEndTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureEndTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(363)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String con
+    ){
+
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_time_task_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allResult = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_time_task_list");
+            //添加id
+            map.put("indexId","timeTaskId");
+            allResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allResult);
+            //删除
+            allResult.remove(allResult.size()-1);
+        }
+        if(allResult == null){
+            allResult = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> result = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allResult,result);
+        return success(pageList);
+    }
+
+}

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

@@ -0,0 +1,96 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.ITmstruckTotalResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 10:24
+ */
+
+@RestController
+@RequestMapping("/${api.version}/tmstrucktotalresults")
+public class TmstruckTotalResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmstruckTotalResultService tmstruckTotalResultService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+    @ApiOperation(value="添加总实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "订单Id", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addTotalResult")
+    public int addTotalResult(@RequestBody(required=false) Map<String, Object> map){
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        int i = tmstruckTotalResultService.addTotalResult(orderId);
+        return i;
+    }
+    /**
+     * 展示计数实绩列表
+     *
+     */
+
+    @ApiOperation(value="查询计数实绩列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(364)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectCountList")
+    public RESTfulResult selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allCountList = tmstruckTotalResultService.selectCountList(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> countList = tmstruckTotalResultService.selectCountList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCountList,countList);
+        return success(pageList);
+    }
+
+    @ApiOperation(value="查询所有的包月作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(365)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTmstruckMonthResult")
+    public RESTfulResult getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allQualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> qualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQualityResult,qualityResult);
+        return success(pageList);
+    }
+}

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

@@ -1,18 +1,19 @@
 package com.steerinfo.dil.controller;
-
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckUnloadResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
-
 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.ApiOperation;
+import org.apache.commons.collections4.Put;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,6 +38,9 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckUnloadResultService tmstruckUnloadResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -52,10 +56,37 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     public RESTfulResult getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize
+                                           Integer pageSize,
+                                           Integer orderType,String con
     ){
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_truck_unload_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
         //不分页筛选数据
-        List<Map<String, Object>> allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
+        List<Map<String, Object>> allUnloadResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_truck_unload_list");
+            //添加id
+            map.put("indexId","truckUnloadId");
+            allUnloadResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allUnloadResult);
+            //删除
+            allUnloadResult.remove(allUnloadResult.size()-1);
+        }
+        if(allUnloadResult == null){
+            allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> unloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
@@ -63,14 +94,55 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
     @ApiOperation(value="更新卸货实绩 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
-    @PostMapping("/addUnloadResult")
-    public RESTfulResult addUnloadResult(@RequestBody Map<String, Object> mapValue){
+    @PostMapping("/updateUnloadResult")
+    public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue){
         int i = tmstruckUnloadResultService.updateUnloadResult(mapValue);
         return success(i);
     }
 
+
+    @ApiOperation(value="新增卸货实绩：远程调用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩ID、卸货点", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addUnloadResult")
+    public RESTfulResult addUnloadResult(@RequestBody(required=false) Map<String, Object> mapValue){
+        int i = tmstruckUnloadResultService.addUnloadResult(mapValue);
+        return success(i);
+    }
+//*******************************************内转物流**************************************************
+    /**
+     *  内转物流卸货装车实绩
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="内转物流新增卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addUnLoadResultForconverted")
+    public RESTfulResult addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map){
+        String orderNumber=(String)map.get("orderNumber");
+        Map<String,Object> loadResultIdForOrderNumber = tmstruckUnloadResultService.selectLoadResultIdByOrderNumber(orderNumber);
+        Integer loadResultId =(Integer) loadResultIdForOrderNumber.get("loadResultId");
+        //通过运输订单号查找实绩是否存在
+        int i=0;
+        int i1=0;
+        int i2=0;
+        if (loadResultId==null){
+            //执行新增
+            i=tmstruckUnloadResultService.addUnloadresultForconverted(map);
+            //然后执行更新
+            i1=tmstruckUnloadResultService.updateUnloadresultForconverted(map);
+        }
+        else {
+            i2=tmstruckUnloadResultService.updateUnloadresultForconverted(map);
+        }
+        return  success(i+i1+i2);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckWeightResultService;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -13,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,9 +40,32 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckWeightResultService tmstruckWeightResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    @ApiOperation(value="新增计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩ID、计皮点、计毛点", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addWeightResult")
+    public RESTfulResult addWeightResult(@RequestBody Map<String, Object> mapValue){
+        int i = tmstruckWeightResultService.addWeightResult(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="更新计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
+    })
+    @PostMapping("/updateTruckWeight")
+    public RESTfulResult updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
+        int i = tmstruckWeightResultService.updateTruckWeight(mapList);
+        return success(i);
+    }
+
     @ApiOperation(value="查询计毛实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -52,10 +78,37 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     public RESTfulResult getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_jimao_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allJiMaoResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_jimao_list");
+            //添加id
+            map.put("indexId","jiMaoId");
+            allJiMaoResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allJiMaoResult);
+            //删除
+            allJiMaoResult.remove(allJiMaoResult.size()-1);
+        }
+        if(allJiMaoResult == null){
+            allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> jiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
@@ -63,6 +116,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
     @ApiOperation(value="查询计皮实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -75,14 +129,42 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     public RESTfulResult getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize
+                                           Integer pageSize,
+                                           Integer orderType,String con
     ){
+
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_jipi_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
         //不分页筛选数据
-        List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+        List<Map<String, Object>> allJiPiResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allJiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_jipi_list");
+            //添加id
+            map.put("indexId","jiPiId");
+            allJiPiResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allJiPiResult);
+            //删除
+            allJiPiResult.remove(allJiPiResult.size()-1);
+        }
+        if(allJiPiResult == null){
+            allJiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> jiMaoResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allJiMaoResult,jiMaoResult);
+        List<Map<String, Object>> jiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allJiPiResult,jiPiResult);
         return success(pageList);
     }
 
@@ -105,6 +187,15 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         int i = tmstruckWeightResultService.addJiPiResult(mapValue);
         return success(i);
     }
+
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @PostMapping("/updateTruckCalculate/{orderId}")
+    public RESTfulResult updateTruckCalculate(@PathVariable("orderId") Integer orderId){
+        int i =0;
+        return  success(i);
+    }
 }
 
   

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

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @ time      :2021/10/8 21:56
  */
 
-@FeignClient(value = "dil-bmsship-api-dev", url = "192.168.0.107:8078")
+@FeignClient(value = "dil-bmsship-api-dev", url = "${openfeign.BmsShipFeign.url}")
 public interface BmsShipFeign {
     @PostMapping("api/v1/bmsship/bmsshipdetailsorder/addDetailsOrder/{resultId}")
     public RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception ;

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

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @ time      :2021/10/8 22:02
  */
 
-@FeignClient(value = "dil-bmstruck-api-dev", url = "192.168.0.107:8076")
+@FeignClient(value = "dil-bmstruck-api-dev", url = "${openfeign.BmsTruckFeign.url}")
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @Version 1.0
  */
 @Service
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "localhost:8083")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

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

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "DIL-ES-DEV",url = "https://portal-dev.steerinfo.com/icore.icp.web/pass/dil/dil-es-api")
+@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.166:8089/api/v1/es")
 public interface ESFeign {
     @PostMapping("getConResult")
     PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+
+@FeignClient(value = "DIL-IM-DEV", url = "${openfeign.ImFeign.url}")
+public interface IMFeign {
+    @PostMapping("/websocket/sendToUser")
+    @ResponseBody
+    String sendToUser(@RequestBody HashMap map);
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-10-29 11:23
+ */
+@FeignClient(value = "dil-join-api-dev", url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+    @PostMapping("/api/v1/join/tmsTruckSms/insertSms")
+    public boolean push(@RequestBody(required = false)Map<String, Object> map2) ;
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 18:05
+ */
+
+@FeignClient(value = "dil-oms-dev", url = "${openfeign.OmsFeign.url}")
+public interface OmsFeign {
+
+    //远程调用新增运输订单
+    @PostMapping("api/v1/oms/utilscontroller/insertSelectiveOrder")
+    RESTfulResult insertSelectiveOrder(@RequestBody(required = false) Map<String, Object> omstruckOrder);
+
+    @PostMapping("api/v1/oms/utilscontroller/updateOmsTruckOrder")
+    RESTfulResult updateOmsTruckOrder(@RequestBody(required = false) Map<String,Object> omstruckOrder1);
+
+    //远程调用新增运输订单子表
+    @PostMapping("api/v1/oms/utilscontroller/insertSelectiveOrderMaterial")
+    RESTfulResult insertSelectiveOrderMaterial(@RequestBody(required = false) Map<String, Object> omstruckOrderMaterial);
+
+    //远程调用推送websocket
+    @PostMapping("api/v1/oms/omstruckorderseparates/pushMesToWebsocket")
+    RESTfulResult pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
+}

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

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/11/19 16:28
+ */
+
+@FeignClient(value = "dil-trick-queue-dev", url = "${openfeign.QmsFeign.url}")
+public interface QmsFeign {
+    //远程调用新增运输订单
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/utilscontroller/addQueueResultByCk")
+    RESTfulResult addQueueResultByCk(@RequestBody Map<String,Object> mapValue);
+}

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

@@ -0,0 +1,493 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:13
+ */
+@FeignClient(value = "DAL-DAZHOU-WMS-DEV",url = "${openfeign.WMSFeign.url}")
+public interface WMSFeign {
+    /**
+     * 钢材入库实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult",method = RequestMethod.POST)
+    Map<String,Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize);
+
+    /**
+     * 展示出库实绩
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult",method = RequestMethod.POST)
+    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    /**
+     * 新增出库实绩
+     * @param mapval
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
+    Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 新增出库扫描实绩
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
+    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 更新出库状态
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/updataResultStatus")
+    Map<String,Object> updataResultStatus(@RequestBody(required = false) Integer resultId);
+
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getRmsMaterial")
+    Map<String,Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     *  展示实时库存数据
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList",method = RequestMethod.POST)
+    Map<String,Object> selectGridMaterialList(@RequestBody(required = false)
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
+
+    /**
+     * 钢材异地库出库扫描
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/OutScanResultTag")
+    Map<String,Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 获取钢材异地库出库数据
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList",method = RequestMethod.POST)
+    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false)
+                                                       @RequestParam Integer apiId,
+                                                       @RequestParam Integer pageNum,
+                                                       @RequestParam Integer pageSize);
+
+    /**
+     * 展示钢材异地库入库实绩表
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
+    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false)
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize);
+
+    /**
+     *   钢材异地库入库扫描新增异地库入库实绩
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/insertOffsiteLibraryInbound")
+    Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     *  //展示在途库存列表
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory",method = RequestMethod.POST)
+    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize);
+
+
+    /**
+     *新增倒库出库实绩
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertOutBoundResult")
+    Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * //新增倒库出库扫描实绩
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/AddWmspOutboundScanResult")
+    Map<String,Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     * 通过下拉框筛选数据
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @param warehouseid
+     * @param gradtionNumber
+     * @param stackingId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getWmspRestackMakeResultList")
+    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false)
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam Integer warehouseid,
+                                                    @RequestParam Integer gradtionNumber,
+                                                    @RequestParam Integer stackingId);
+
+    /**
+     *    添加倒垛单实绩
+     * @param mapval
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
+    Map<String,Object> addRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapval);
+
+    /**
+     *   删除倒垛单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/deleteByResultId/{resultId}")
+    Map<String,Object> deleteByResultId(@PathVariable Integer resultId);
+
+    /**
+     * 下发倒垛单pc端
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
+    Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId);
+
+    /**
+     * 下拉框获取层次
+     * @param warehouseid
+     * @param stackingId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
+    Map<String,Object> selectGardationNumber(@RequestParam Integer warehouseid,
+                                             @RequestParam Integer stackingId);
+
+    /**
+     *   下拉框获取垛位
+     * @param warehouseid
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
+    Map<String,Object> selectStackingId(@RequestParam Integer warehouseid);
+
+    /**
+     * 下拉框获取仓库名称
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
+    Map<String,Object> selectWarehouse();
+
+    /**
+     *展示倒垛单
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @param DistrubtionStatus
+     * @return
+     */
+   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
+   Map<String,Object> selectRestackList(@RequestBody(required = false)
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer DistrubtionStatus
+   );
+    /**
+     *  修改倒垛单
+     * @param mapval
+     * @return
+     */
+   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
+   Map<String,Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapval);
+    /**
+     *   渲染倒垛后的仓库信息
+     * @param resultId
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
+  Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
+    /**
+     *  渲染倒垛后的垛位信息
+     * @param resultId
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
+  Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
+
+    /**
+     * PDA展示倒垛单
+     * @param map
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
+  Map<String,Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map);
+    /**
+     * PDA根据实绩id查找物资信息
+     * @param map
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
+  Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map);
+    /**
+     * PDA根据仓库id查找倒垛单
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseId")
+    Map<String,Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map);
+    /**
+     * 库管员扫描吊牌添加扫描实绩
+     * @param mal
+     * @return
+     */
+   @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
+   Map<String,Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal);
+    /**
+     * 库管员下发倒垛单
+     * @param mapList
+     * @return
+     */
+  @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
+  Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+    /**
+     * 展示退库实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReboundResult",method = RequestMethod.POST)
+    RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+    /**
+     * 展示倒库实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsIvboundResult",method = RequestMethod.POST)
+    RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+
+    /**
+     * 展示倒库物资实绩
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getWmsIvboundMaterial",method = RequestMethod.POST)
+    RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    /**
+     * 库存盘点实绩
+     */
+    @RequestMapping(value = "/api/v1/wms/inventoryCheck/getInventoryCheck",method = RequestMethod.POST)
+    RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+
+    /**
+     * 库存结转
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inventoryClose/getInventoryClose",method = RequestMethod.POST)
+    RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    /**
+     * 收发存报表
+     */
+    @RequestMapping(value = "/api/v1/wms/sendReceive/getSendReceive",method = RequestMethod.POST)
+    RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize);
+
+    /**
+     * 展示未下发吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getTagResult();
+
+    /**
+     * 展示已入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getIssuedTagResult();
+
+    /**
+     * 展示异常入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagNoResult",method = RequestMethod.POST)
+    Map<String,Object>  getIssuedTagNoResult();
+
+    /**
+     * 展示退库已下发吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReIssuedResult",method = RequestMethod.POST)
+    Map<String,Object>  getIssuedResult();
+
+    /**
+     * 展示未下发退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getReTagResult();
+
+    /**
+     * 展示已倒库入库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvIssuedResult",method = RequestMethod.POST)
+    Map<String,Object>  getIvIssuedResult();
+
+    /**
+     * 展示倒库入库未下发退库吊钢工扫描吊牌实绩
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvTagResult",method = RequestMethod.POST)
+    Map<String,Object>  getIvTagResult();
+
+    /**
+     * 新增入库实绩，返回选择垛位
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
+    String insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 新增退库实绩，返回选择垛位
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertReboundResult",method = RequestMethod.POST)
+    String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
+
+    /**
+     * 新增倒库入库实绩，返回选择垛位
+     * @param mapList
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertIvboundResult",method = RequestMethod.POST)
+    String insertIvboundResult(@RequestBody List<Map<String, Object>> mapList);
+    /**
+     * 行车工查看垛位
+     * @param DriverId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack",method = RequestMethod.POST)
+    Integer  getInboundStack(@RequestParam Integer DriverId);
+
+
+    /**
+     * 新增库存盘点
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack",method = RequestMethod.POST)
+    Map<String,Object>  inventoryCheck(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 新增入库扫描实绩
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertResult",method = RequestMethod.POST)
+    Map<String, Object> insertResult(@RequestBody Map<String, Object> map);
+
+
+    /**
+     * 新增退库扫描实绩
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertReboundScanResult",method = RequestMethod.POST)
+    Map<String, Object> insertReboundScanResult(@RequestBody Map<String, Object> map);
+
+
+    /**
+     *新增倒库入库扫描实绩
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertIvboundScanResult",method = RequestMethod.POST)
+    Map<String, Object> insertIvboundScanResult(@RequestBody Map<String, Object> map);
+    /**
+     * 根据实绩id查找物资是否稽核完成
+     *
+     */
+    @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
+    Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
+}
+

src/main/java/com/steerinfo/dil/feign/WmsBoundFeign.java → src/main/java/com/steerinfo/dil/feign/WmshBoundFeign.java

@@ -12,12 +12,12 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "dil-wsm-api",url = "192.168.0.104:8091")
-public interface WmsBoundFeign {
+@FeignClient(value = "dil-wsm-api",url = "${openfeign.WmshBoundFeign.url}")
+public interface WmshBoundFeign {
 
-    @PostMapping("api/v1/wms/wmshinboundresults/addWarehousingResult")
+    @PostMapping("api/v1/wmsh/wmshinboundresults/addWarehousingResult")
     RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String,Object> wmshInboundResult);
 
-    @PostMapping("api/v1/wms/wmshoutboundresults/addResult")
+    @PostMapping("api/v1/wmsh/wmshoutboundresults/addResult")
     RESTfulResult addResult(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -1,30 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AmstruckPurplanMapper extends IBaseMapper<AmstruckPurplan, BigDecimal> {
-
-    //查询所有运输计划
-    List<Map<String, Object>> getAllPurPlan(Map<String, Object> map);
-
-    //新增运输计划
-    int insertSelective(AmstruckPurplan amstruckPurplan);
-
-    //查询最大ID值
-    BigDecimal selectMaxId();
-
-    //通过ID查询运输计划
-    List<Map<String, Object>> getPurPlanById(@Param("planId") Integer planId);
-
-    //修改运输计划
-    int updateByPrimaryKeySelective(AmstruckPurplan amstruckPurplan);
-
-}

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

@@ -1,28 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.AmstruckPurplanMaterial;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AmstruckPurplanMaterialMapper extends IBaseMapper<AmstruckPurplanMaterial, BigDecimal> {
-    //新增运输计划同时新增运输计划子表数据
-    int insertSelective(AmstruckPurplanMaterial amstruckPurplanMaterial);
-
-    //通过Id查询运输计划  包含分解信息  未分配、已分配
-    List<Map<String, Object>> getDecomposedPlan(Map<String, Object> map);
-
-    //通过Id查询已分配重量、未分配重量
-    List<Map<String, Object>> getWeight(Integer planId);
-
-    //查询最大主键Id
-    BigDecimal selectMaxId();
-
-    //通过运输计划Id查询计划子表主键ID
-    BigDecimal getChildIdByPlanId(BigDecimal planId);
-
-}

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

@@ -41,6 +41,21 @@ public interface DropDownMapper {
     //获取所有的港口
     List<Map<String, Object>> getPort();
 
+    //获取所有的月台
+    List<Map<String, Object>> getPlatformId();
 
+    //装货地点下拉框
+    List<Map<String,Object>>  getLoadedPlace();
 
+    //外轮船名下拉框
+    List<Map<String,Object>> getForeignName();
+
+    //查询卸货点 或 装货点（通过类型判断）
+    List<Map<String, Object>> getUnloadPoint(Integer type);
+
+    //通过订单Id查询装车的物资
+    List<Map<String, Object>> getOrderMaterial(Integer orderId);
+
+    //通过仓库ID查询月台ID
+    List<Map<String, Object>> getPlatformIdByWarehouse(Integer warehouseId);
 }

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

@@ -1,65 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.poi.ss.formula.functions.T;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecimal> {
-    //查询所有运输订单信息 状态：3
-    //查询所有已下发运输订单 状态：4
-    List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map);
-
-    //新增运单
-    int insertSelective(OmstruckOrder omstruckOrder);
-
-    //查询最大主键Id
-    BigDecimal selectMaxId();
-
-    //通过运输订单Id查询运输订单号
-    String getOrderNumberByOrderId(Integer orderId);
-
-    //查询所有运力信息
-    List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
-
-    //通过运力Id 或 车牌号 修改运输状态
-    int updateCapacityByCarIdOrNum(Map<String, Object> map);
-
-    //通过运输订单ID 或 运输订单号 查询运力Id
-    BigDecimal getCapacityIdByOrderOrNum(Map<String, Object> map);
-
-    //修改运输订单 、分配运单给司机
-    int updateByPrimaryKeySelective(OmstruckOrder omstruckOrder);
-
-    //通过ID获取派单时间
-    Date getInsertTimeById(Integer orderId);
-
-    //通过车牌号查询运力id
-    BigDecimal getCapacityIdByCapacityNum(String capacityNumber);
-
-    //司机接单调用接口 通过运力Id匹配  /  通过运单ID查询运单信息 APP
-    //查询所有接单或拒绝接单的订单 PC
-    List<Map<String, Object>> getTruckOrderByCapacityNum(Map<String, Object> map);
-
-    //查询司机所有已拒绝过的订单
-    List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map);
-
-
-    // 查询实绩地点和时间
-    List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId);
-
-    //通过运单号查询运单信息
-    List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId);
-
-    //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
-    Map<String, Object> getPointIdByOrderNum(String orderNumber);
-
-    //运输派单
-    List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
-}

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

@@ -1,24 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.math.BigDecimal;
-
-@Mapper
-public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMaterial, BigDecimal> {
-    //新增运单子表
-    int insertSelective(OmstruckOrderMaterial omstruckOrderMaterial);
-
-    //修改运输订单子表
-    int updateByPrimaryKeySelective(OmstruckOrder omstruckOrder);
-
-    //查询最大主键Id
-    BigDecimal selectMaxId();
-
-    //通过订单Id
-    BigDecimal getOrderMaterialIdByOrderId(BigDecimal orderId);
-
-}

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

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 规则方法
+ * @ author    :TXF
+ * @ time      :2021/11/16 14:28
+ */
+
+@Mapper
+public interface RulesMapper {
+    //根据物资Id、门岗规则 查询门岗id (可能会查询出多个)
+    List<Map<String, Object>> queryGatepostByMaterialId(Map<String, Object> map);
+
+    //通过物资Id、计量类型（进厂、出厂、中转） 可能会有多个称
+    List<Integer> queryTruckCalculate(Map<String, Object> map);
+
+    //查询未装车实绩
+    List<Map<String, Object>> judgeLastMaterial(BigDecimal orderId);
+
+    //通过门岗ID 和 网格类型 匹配 网格主键
+    BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map);
+
+
+    //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
+    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
+
+    //通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
+    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
+
+    //通过月台Id 查询月台当前排队车辆数
+    BigDecimal queueCountByPlatformId(BigDecimal platformId);
+}

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

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 统计报表
+ * @ author    :TXF
+ * @ time      :2021/12/14 15:27
+ */
+@Mapper
+public interface StatisticalReportMapper {
+    //查询采购统计报表 (辅料、燃料、内转)
+    List<Map<String, Object>> getAllPurchaseFLRLReport(Map<String, Object> map);
+
+}

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -10,22 +11,50 @@ import java.util.Map;
 
 @Mapper
 public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfactoryResult, Short> {
-    //获取所有进厂实绩
-    List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map);
+    //获取采购进口矿进厂实绩
+    List<Map<String, Object>> getCGJKEnFactoryResult(Map<String, Object> map);
+
+    //查询销售进厂实绩
+    List<Map<String, Object>> getXSEnFactoryResult(Map<String, Object> map);
+
+    //查询内转钢材到异地库进厂实绩
+    List<Map<String, Object>> getSteelNZEnFactoryResult(Map<String, Object> map);
+
+    //查询内转国产矿进口矿 进厂实绩
+    List<Map<String, Object>> getImportedDomesticNzLoadResult(Map<String, Object> map);
+
+    //查询内转厂内物资进厂实绩
+    List<Map<String, Object>> getInFactoryMaterialEnFactoryResult(Map<String, Object> map);
+
+    //查询所有内转进厂实绩
+    List<Map<String, Object>> getAllInwardTurnEnFactoryResult(Map<String, Object> map);
 
     //查询最大主键Id
+    @Select("select seq_tmstruck_enfactory_result.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过车牌号和 运输订单 查询 与运输订单关联的实绩总表ID
-    Integer selectOrderIdByCpAndOn(Map<String, Object> map);
+    Map<String,Object> selectTotalResultIdByCpAndOn(Map<String, Object> map);
 
     //通过门岗名称查询门岗Id
     Integer selectGatepostIdByGatepostName(String gatepostName);
 
-    //根据orderNumber获取实绩id
+    //根据orderNumber获取实绩id  总实绩Id 订单id  订单类型 orderTypee
     Map<String, Object> selectEnFactoryResultId(String orderNumber);
 
     //查找排队序号
     Integer selectNodeNumber(String orderNumber);
 
+    //通过运输订单id查询物资信息
+    List<Map<String,Object>> getMaterial(Integer orderId);
+    // APP查询进厂实绩
+    List<Map<String, Object>> getEnfactoryResultList();
+
+
+    // APP通过运输订单id查询进厂实绩
+    List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber);
+
+    Map<String, Object> getBillOrder(String orderNumber);
+
+    List<Map<String, Object>> getBillOrderMaterial(String orderNumber);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,10 +12,11 @@ import java.util.Map;
 @Mapper
 public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLeaveFactoryResult, BigDecimal> {
     //查询最大ID
+    @Select("select seq_tmstruck_leavefactory.nextval from dual")
     BigDecimal selectMaxId();
 
-    //查询所有的出厂实绩、
-    List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map);
+    //查询采购所有的出厂实绩、
+    List<Map<String, Object>> getCGLeaveFactoryResult(Map<String, Object> map);
 
     //查询运输路线是否为出厂
     Integer selectTransportRoute(String orderNumber);
@@ -24,4 +26,29 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     //根据订单号获取实绩id
     Map<String, Object> selectResultId(String orderNumber);
+
+    //销售物流查询所有的出厂实绩
+    List<Map<String,Object>> selectAllLeaveFacatoryForSale(Map<String,Object> map);
+
+    //查询内转钢材到异地库出厂实绩
+    List<Map<String, Object>> selectSteelNzLeaveFactory(Map<String, Object> map);
+
+    //查询内转国产矿进口矿出厂实绩
+    List<Map<String, Object>> getImportedDomesticNzEnFactoryResult(Map<String, Object> map);
+
+    //查询内转厂内物资出厂实绩
+    List<Map<String, Object>> getInFactoryOutFactoryResult(Map<String, Object> map);
+
+    //通过总实绩Id
+    BigDecimal getResultIdByTotalId(Integer resultTotalId);
+
+    Map<String, Object> getTruckFactoryResult(String nu);
+
+    //
+    List<Map<String, Object>> getLeaveFactoryList(String orderNumber);
+
+
+    Map<String, Object> getDeliveryOrder(String orderNumber);
+
+    List<Map<String,Object>> getDeliveryOrderMaterial(String orderNumber);
 }

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

@@ -4,20 +4,32 @@ import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult, BigDecimal> {
-    //查询所有的装车实绩
-    List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
+    //查询采购装车实绩
+    List<Map<String, Object>> getCGJKLoadResult(Map<String, Object> map);
 
-    //新增装车实绩
-    int insertSelective(TmstruckLoadResult tmstruckLoadResult);
+    //查询销售装车实绩
+    List<Map<String, Object>> getXSLoadResult(Map<String, Object> map);
+
+    //查询内转钢材到异地库装车实绩
+    List<Map<String, Object>> getSteelNzLoadResult(Map<String, Object> map);
+
+    //查询内转进口矿/国产矿装车实绩
+    List<Map<String, Object>> getImportedDomesticNzLoadResult(Map<String, Object> map);
+
+    //查询内转厂内物资装车实绩
+    List<Map<String, Object>> getInFactoryLoadResult(Map<String, Object> map);
 
     //查询最大ID值
+    @Select("select seq_tmstruck_load_result.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过Id获取装车实绩 数据 用于修改
@@ -28,4 +40,70 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     //通过订单ID查询批次ID
     BigDecimal getBatchIdByOrderId(BigDecimal orderId);
+
+    //通过订单Id 和物资ID 查询装车实绩Id  一个订单可能会有多个装车实绩
+    Integer getLoadResultId(Map<String, Object> map);
+
+    //根据运输订单号查找运输订单类型
+    Integer selectOrderTypeByOrderNumber(String oderNumber);
+
+    //根据运输订单号查找扫描实绩id
+    List<Integer>  selectResultIdByOrderNumber(String orderNumber);
+
+    //根据实绩id查找扫描时间
+    Date selectLoadTimeByResultId(BigDecimal resultId);
+
+    //根据实绩id查找扫描时间
+    Integer selecLoadIdByresultId(Integer resultId);
+
+    //销售查询所有的装车实绩
+    List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
+
+    //根据运输订单号查找物资id
+    List<Map<String,Object>> selectMaterialIdByOrderNumber(Map<String, Object> map);
+
+    //内转物流汽车装货展示
+    List<Map<String,Object>> selectLoadResultForConverted(Map<String,Object> map);
+
+    //通过实绩id渲染数据
+    List<Map<String,Object>> selectLoadResultByResultId(Integer resultId);
+
+    //通过车牌号查找物资id和运力id以及总实绩id
+    Map<String,Object> selectMaterialIdAndCapacityId(String  capacityNumber);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> selectLoadResultIdByOrderNumber(String orderNumber);
+
+    //通过用户id查找用户姓名
+    String selectPersonNameByPersonnelId(Integer personnelId);
+
+    //通过物资id查找物资类型
+    Integer selectMaterialTypeByMaterialId(Integer materialId);
+
+    //通过港口ID查询仓库表中的港存库ID
+    BigDecimal getWarehouseIdByPortId(BigDecimal portId);
+
+    /*
+    TangXiaoFeng
+     */
+    //通过物资ID和总实绩Id查询唯一的装车实绩Id
+    Integer getLoadResultIdByMIdAndTotalId(@Param("resultTotalId") Integer resultTotalId, @Param("materialId") Integer materialId);
+
+    //通过物资ID和订单Id查询唯一的装车实绩Id
+    Integer getLoadIdByOrderIdAndMId(Map<String, Object> map);
+
+    //通过物资ID和运输订单号 查找最先扫描Id
+    Map<String, Object> getMinScanIdByOrderNum(Map<String, Object> map);
+
+    //通过物资唯一编码 查找物资ID
+    BigDecimal getMaterialIdByMaterialCode(String materialOnlyCode);
+
+    //查询所有正在进行进厂排队的销售订单
+    List<Map<String, Object>> getSaleOrderOnQueue(Map<String, Object> map);
+
+    BigDecimal getResultId(BigDecimal totalId);
+
+    Integer getOrderType(BigDecimal totalId);
+
+
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,10 +12,47 @@ import java.util.Map;
 @Mapper
 public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMeasureCommission, BigDecimal> {
 
-    //查询所有计量委托
-    List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map);
+    //查询计量委托
+    List<Map<String, Object>> getMeasureCommission(Map<String, Object> map);
 
     //查询最大主键Id
+    @Select("select seq_measure_commission.nextval from dual")
     BigDecimal selectMaxId();
 
+    //查询采购计量委托
+    Map<String, Object> getCGMeasureCommission(Map<String, Object> map);
+
+    //查询销售计量委托
+    Map<String, Object> getXSMeasureCommission(Map<String, Object> map);
+
+    /*
+     * from zhangXuan
+     */
+
+    //销售查询计毛
+    Map<String, Object> selectMakesureGrossForSaleByOrderNumber(Map<String, Object> map);
+
+    //销售查询计皮
+    Map<String, Object> selectMakesureTareForSaleByOrderNumber(Map<String, Object> map);
+
+    //内转查询计皮
+    Map<String, Object> selectMakesureTareForConvertedByOrderNumber(Map<String, Object> map);
+
+    //内转查询计毛
+    Map<String, Object> selectMakesureGrossForConvertedByOrderNumber(Map<String, Object> map);
+
+    //采购查询计皮
+    Map<String, Object> selectMakesureGrossForPurchase(Map<String, Object> map);
+
+    //采购查询计毛
+    Map<String, Object> selectMakesureTareForPurchase(Map<String, Object> map);
+
+    //采购辅料计量委托
+    Map<String, Object> purchaseFLMeasure(Map<String, Object> map);
+
+    //采购辅料计量委托
+    Map<String, Object> purchaseFLDXMeasure(Map<String, Object> map);
+
+    //通过订单ID查询发货单位ID
+    Integer getSupplierIdByOrderId(BigDecimal orderId);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckQualityResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,7 +15,16 @@ public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQuality
     //查询所有的质检作业
     List<Map<String, Object>> getQualityResult(Map<String, Object> map);
 
-
     //通过ID查询质检作业
     List<Map<String, Object>> getQualityResultById(Integer resultId);
+
+    //获取主键
+    @Select("select seq_tmstruck_quality.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //内转物流查询质检作业
+    List<Map<String,Object>>  selectQualityResultForConverted(Map<String,Object> map);
+
+    //内转查询质检作业
+    List<Map<String, Object>> getInwardQualityResult(Map<String, Object> map);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.Map;
 @Mapper
 public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceiptResult, BigDecimal> {
     //查询最大ID值
+    @Select("select seq_tmstruck_receipt.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过总实绩Id查询主键Id
@@ -19,6 +21,12 @@ public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceipt
     //计皮完成后 通过总实绩ID 更新状态 为 1
     int updateByTotalResultId(TmstruckReceiptResult tmstruckReceiptResult);
 
-    //查询所有签收实绩
-    List<Map<String, Object>> getReceiveResult(Map<String, Object> map);
+    //查询所有收货实绩
+    List<Map<String, Object>> getCGReceiptResult(Map<String, Object> map);
+
+    //查询内转钢材到异地库收货实绩
+    List<Map<String, Object>> getSteelNzReceiptResult(Map<String, Object> map);
+
+    //获取内转收货实绩
+    List<Map<String, Object>> getInwardReceipt(Map<String, Object> map);
 }

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

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckReturnResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+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 TmstruckReturnResultMapper extends IBaseMapper<TmstruckReturnResult, BigDecimal> {
+
+    //查询最大ID值
+    @Select("select seq_tmstruck_return.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //通过运输订单号查询总实绩Id
+    Map<String, Object> getResultTotalIdByOrderNumber(String orderNumber);
+
+    //通过运输订单ID查询上一个订单的信息
+    Map<String, Object> getOldOrderMesById(BigDecimal orderId);
+
+    //通过运输订单Id查询查询上一个订单子表的信息
+    List<Map<String, Object>> getOldOrderMaterialMesByOrderId(BigDecimal orderId);
+
+    //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
+    Map<String, Object> getPointIdByOrderNum(Map<String, Object> map);
+
+    //查询辅料退货实绩
+    List<Map<String, Object>> getFLReturnResult(Map<String, Object> map);
+}

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

@@ -0,0 +1,26 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckSmsRusult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+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 TmstruckSmsRusultMapper extends IBaseMapper<TmstruckSmsRusult, BigDecimal> {
+    //查询最大ID
+    @Select("select seq_tmstruck_sms.nextval from dual")
+    BigDecimal selectMaxId();
+    //根据运输订单号查找托运方
+    Integer selectShipperIdByOrderNumber(String orderNumber);
+    //根据运输订单号查找司机姓名
+    String selectCarDriverByOrderNumber(String orderNumber);
+    //查询短信实绩
+    List<Map<String,Object>> selectSmsResult(Map<String,Object> map);
+
+    Map<String,Object> selectIdApp(BigDecimal bigDecimal);
+
+}

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

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckTimeTaskResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+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 TmstruckTimeTaskResultMapper extends IBaseMapper<TmstruckTimeTaskResult, BigDecimal> {
+
+    //查询最大ID
+    @Select("select seq_time_task.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //通过运输订单号 查询总实绩ID
+    Map<String, Object> getResultTotalIdByOrderNum(String orderNumber);
+
+    //查询上一次用车单位确认暂停结束时间
+    Map<String, Object> getLastTimeout(BigDecimal resultTotalId);
+
+    //查询用车单位确认开始时间
+    Map<String, Object> getStartTime(BigDecimal resultTotalId);
+
+    //查询所有确认暂停结束时间
+    List<Map<String, Object>> getAllTimeout(BigDecimal resultTotalId);
+
+    //查询计时作业
+    List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map);
+
+}

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

@@ -3,11 +3,20 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckTotalResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 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 TmstruckTotalResultMapper extends IBaseMapper<TmstruckTotalResult, BigDecimal> {
     //查询最大ID值
+    @Select("select seq_tmstruck_total_result.nextval from dual")
     BigDecimal selectMaxId();
+
+    //查询计数作业
+    List<Map<String,Object>> selectCountList(Map<String,Object> map);
+    //查询包月作业
+    List<Map<String, Object>> getTmstruckMonthResult(Map<String, Object> mapValue);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -10,10 +11,20 @@ import java.util.Map;
 
 @Mapper
 public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadResult, BigDecimal> {
-    //查询卸货实绩
-    List<Map<String, Object>> getUnloadResult(Map<String, Object> map);
+    //查询采购卸货实绩
+    List<Map<String, Object>> getCGUnloadResult(Map<String, Object> map);
+
+    //查询内转采购进口矿国产矿卸货实绩
+    List<Map<String, Object>> getImportedDomesticNzUnloadResult(Map<String, Object> map);
+
+    //查询内转采购进口矿国产矿卸货实绩(老区-厂内)
+    List<Map<String, Object>> getImportedDomesticNzUnload2Result(Map<String, Object> map);
+
+    //查询内转厂内卸货实绩
+    List<Map<String, Object>> getInFactoryUnloadResult(Map<String, Object> map);
 
     //查询最大ID值
+    @Select("select seq_tmstruck_unload_result.nextval from dual")
     BigDecimal selectMaxId();
 
     // 通过总实绩id查询卸货实绩id
@@ -24,4 +35,10 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     //通过卸货地点查询仓库Id
     BigDecimal getWarehouseIdByWName(String warehouseName);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> selectUnloadResultIdByOrderNumber(String orderNumber);
+
+    //通过总实绩ID查询卸货点
+    BigDecimal getUnloadPointId(Map<String, Object> map);
 }

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

@@ -4,6 +4,8 @@ import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -12,18 +14,62 @@ import java.util.Map;
 @Mapper
 public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightResult, Short> {
     //查询最大主键Id
+    @Select("select seq_tmstruck_weight_result.nextval from dual")
     BigDecimal selectMaxId();
 
-    //通过订单号查询实绩总表Id
-    Map<String, Object> selectTotalIdByOrderNo(String orderNumber);
+    //通过物资ID或运输订单ID查询计量实绩ID
+    BigDecimal getWeightIdByMaterialIdAndOrderId(Map<String, Object> map);
+
+    //通过运输订单号和查询订单Id 和物资ID (针对单拼)
+    Map<String, Object> getOrderIdAndMaterialIdByOrderNum(String orderNumber);
+
+    //通过物资名称和规格型号查询物资Id
+    Integer getMaterialIdByMaterialNameAndSpe(Map<String, Object> map);
+
+    //通过订单号查询计重实绩数据
+    Map<String, Object> selectTotalIdByOrderNo(Map<String, Object> map);
 
     //通过汽车衡编号查询汽车衡ID
     Integer selectTruckCalculateId(String truckCalculateNumber);
 
-    //查询所有计毛实绩
-    List<Map<String, Object>> getAllJiMaoResult(Map<String, Object> map);
+    //查询采购所有计毛实绩
+    List<Map<String, Object>> getCGAllJiMaoResult(Map<String, Object> map);
+
+    //查询销售计毛实绩
+    List<Map<String, Object>> getXSAllJiMaoResult(Map<String, Object> map);
+
+    //查询采购所有计皮实绩
+    List<Map<String, Object>> getCGAllJiPiResult(Map<String, Object> map);
+
+    //查询销售所有计皮实绩
+    List<Map<String, Object>> getXSAllJiPiResult(Map<String, Object> map);
+
+    //查询内转到钢材到异地库计皮实绩
+    List<Map<String, Object>> getSteelNzJiPiResult(Map<String, Object> map);
+
+    //查询内转钢材到异地库计毛实绩
+    List<Map<String, Object>> getSteelNzJiMaoResult(Map<String, Object> map);
+
+    //查询国产矿进口矿计毛实绩
+    List<Map<String, Object>> getImportedDomesticNzJiMaoResult(Map<String, Object> map);
+
+    //查询国产矿进口矿计皮实绩
+    List<Map<String, Object>> getImportedDomesticNzJiPiResult(Map<String, Object> map);
+
+    //查询国产矿进口矿计皮实绩(老区-厂内)
+    List<Map<String, Object>> getImportedDomesticNzJiPi2Result(Map<String, Object> map);
+
+    //查询国产矿进口矿计毛实绩(老区-厂内)
+    List<Map<String, Object>> getImportedDomesticNzJiMao2Result(Map<String, Object> map);
+
+    //查询内转厂内物资计量实绩
+    List<Map<String, Object>> getInFactoryJiLiangResult(Map<String, Object> map);
+
+    //查询订单下所有的物资件数和物资理重
+    List<Map<String, Object>> getMaterialMes(Integer orderId);
+
 
-    //查询所有计皮实绩
-    List<Map<String, Object>> getAllJiPiResult(Map<String, Object> map);
+    //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
+    Map<String, BigDecimal> selectByOrderId(BigDecimal orderId);
 
 }

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

@@ -0,0 +1,68 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/26 14:27
+ */
+
+@Mapper
+public interface UtilsMapper {
+
+    //查询运输订单最大主键Id
+    @Select("select seq_omstruck_order.nextval from dual")
+    BigDecimal selectOrderMaxId();
+
+    //查询运输订单子表主键ID
+    @Select("select seq_omstruck_order_material.nextval from dual")
+    BigDecimal selectOrderMaterialMaxId();
+
+    //通过订单Id修改订单状态
+    int updateOrderStatusByOrderIdOrNum(Map<String, Object> map);
+
+    //通过运输Id 或者运输订单号修改 路段顺序号
+    int updateLineSeqByOrderIdOrNum(Map<String, Object> map);
+
+    //通过运力ID 或车牌号 修改运力状态
+    int updateCapacityByCarIdOrNum(Map<String, Object> map);
+
+    //通过仓库名称查询仓库Id
+    Integer queryWarehouseIdByName(String warehouseName);
+
+    //通过月台名称查找月台Id platformName
+    Integer queryPlatformIdByName(String platformName);
+
+    //根据运输订单号查询物资Id
+    BigDecimal queryOrderMesByOrderId(String orderNumber);
+
+    //查询当前路段顺序号
+    Integer getLineSequenceByOrderId(@Param("orderId") BigDecimal orderId);
+
+    //查询订单跟订单物资中间表 查询是否有多个物资Id
+    List<Integer> getAllMaterialId(Map<String, Object> map);
+
+    //通过总实绩Id查询订单Id
+    Integer getOrderIdByTotalId(Integer resultTotalId);
+
+    //通过运输订单号查询订单ID
+    BigDecimal getOrderIdByOrderNumber(String orderNumber);
+
+    //通过运输订单号查询总实绩ID
+    BigDecimal getTotalIdByOrderNumber(String orderNumber);
+
+    //通过总实绩ID查找订单类型
+    Integer getOrderTypeByTotalId(BigDecimal resultTotalId);
+
+    //查询最大路段顺序号 以及当前订单路段顺序号（执行到哪一步）
+    Map<String, Object> getLineSeqAndOrderSeq(Map<String, Object> map);
+
+    //通过订单ID查询物资ID（针对单拼）
+    List<Integer> getMaterialIdByOrderId(BigDecimal orderId);
+}

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

@@ -1,259 +0,0 @@
-package com.steerinfo.dil.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel(value="采购运输计划")
-public class AmstruckPurplan implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(PLAN_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal planId;
-
-    /**
-     * 批次ID(BATCH_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="批次ID",required=false)
-    private BigDecimal batchId;
-
-    /**
-     * 运输计划号(PLAN_NO,VARCHAR,25)
-     */
-    @ApiModelProperty(value="运输计划号",required=false)
-    private String planNo;
-
-    /**
-     * 承运商ID(CARRIER_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="承运商ID",required=false)
-    private BigDecimal carrierId;
-
-    /**
-     * 车数(PLAN_TRUCK_NUMBER,DECIMAL,38)
-     */
-    @ApiModelProperty(value="车数",required=false)
-    private BigDecimal planTruckNumber;
-
-    /**
-     * 车型ID(CAPACITY_TYPE_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="车型ID",required=false)
-    private BigDecimal capacityTypeId;
-
-    /**
-     * 用车时间(PLAN_TRUCK_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="用车时间",required=false)
-    private Date planTruckTime;
-
-    /**
-     * 计划状态：0：未下发；1：已下发；2：已接收(PLAN_STATUS,DECIMAL,38)
-     */
-    @ApiModelProperty(value="计划状态：0：未下发；1：已下发；2：已接收",required=false)
-    private BigDecimal planStatus;
-
-    /**
-     * 物资总重量(MATERIAL_TOTAL_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资总重量",required=false)
-    private BigDecimal materialTotalWeight;
-
-    /**
-     * 预计进厂时间(PLAN_INCOMING_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="预计进厂时间",required=false)
-    private Date planIncomingTime;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.planId;
-    }
-
-    @Override
-    public void setId(BigDecimal planId) {
-        this.planId = planId;
-    }
-
-    public BigDecimal getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(BigDecimal planId) {
-        this.planId = planId;
-    }
-
-    public BigDecimal getBatchId() {
-        return batchId;
-    }
-
-    public void setBatchId(BigDecimal batchId) {
-        this.batchId = batchId;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo == null ? null : planNo.trim();
-    }
-
-    public BigDecimal getCarrierId() {
-        return carrierId;
-    }
-
-    public void setCarrierId(BigDecimal carrierId) {
-        this.carrierId = carrierId;
-    }
-
-    public BigDecimal getPlanTruckNumber() {
-        return planTruckNumber;
-    }
-
-    public void setPlanTruckNumber(BigDecimal planTruckNumber) {
-        this.planTruckNumber = planTruckNumber;
-    }
-
-    public BigDecimal getCapacityTypeId() {
-        return capacityTypeId;
-    }
-
-    public void setCapacityTypeId(BigDecimal capacityTypeId) {
-        this.capacityTypeId = capacityTypeId;
-    }
-
-    public Date getPlanTruckTime() {
-        return planTruckTime;
-    }
-
-    public void setPlanTruckTime(Date planTruckTime) {
-        this.planTruckTime = planTruckTime;
-    }
-
-    public BigDecimal getPlanStatus() {
-        return planStatus;
-    }
-
-    public void setPlanStatus(BigDecimal planStatus) {
-        this.planStatus = planStatus;
-    }
-
-    public BigDecimal getMaterialTotalWeight() {
-        return materialTotalWeight;
-    }
-
-    public void setMaterialTotalWeight(BigDecimal materialTotalWeight) {
-        this.materialTotalWeight = materialTotalWeight;
-    }
-
-    public Date getPlanIncomingTime() {
-        return planIncomingTime;
-    }
-
-    public void setPlanIncomingTime(Date planIncomingTime) {
-        this.planIncomingTime = planIncomingTime;
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getInsertUpdateRemark() {
-        return insertUpdateRemark;
-    }
-
-    public void setInsertUpdateRemark(String insertUpdateRemark) {
-        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", planId=").append(planId);
-        sb.append(", batchId=").append(batchId);
-        sb.append(", planNo=").append(planNo);
-        sb.append(", carrierId=").append(carrierId);
-        sb.append(", planTruckNumber=").append(planTruckNumber);
-        sb.append(", capacityTypeId=").append(capacityTypeId);
-        sb.append(", planTruckTime=").append(planTruckTime);
-        sb.append(", planStatus=").append(planStatus);
-        sb.append(", materialTotalWeight=").append(materialTotalWeight);
-        sb.append(", planIncomingTime=").append(planIncomingTime);
-        sb.append(", insertUsername=").append(insertUsername);
-        sb.append(", insertTime=").append(insertTime);
-        sb.append(", updateUsername=").append(updateUsername);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -1,319 +0,0 @@
-package com.steerinfo.dil.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel(value="汽运运输订单")
-public class OmstruckOrder implements IBasePO<BigDecimal> {
-    /**
-     * 运输订单id(ORDER_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="运输订单id",required=true)
-    private BigDecimal orderId;
-
-    /**
-     * 销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID(ORDER_PLAN_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID",required=false)
-    private BigDecimal orderPlanId;
-
-    /**
-     * 运输订单号（WYSDD-年月日-8位数的顺序号）(ORDER_NUMBER,VARCHAR,50)
-     */
-    @ApiModelProperty(value="运输订单号（WYSDD-年月日-8位数的顺序号）",required=false)
-    private String orderNumber;
-
-    /**
-     * 运力ID(CAPACITY_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="运力ID",required=false)
-    private BigDecimal capacityId;
-
-    /**
-     * 订单下发时间(ORDER_ISSUE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="订单下发时间",required=false)
-    private Date orderIssueTime;
-
-    /**
-     * 司机操作订单行为：0：拒绝；1：接收(ORDER_RECEIVE_STATUS,DECIMAL,38)
-     */
-    @ApiModelProperty(value="司机操作订单行为：0：拒绝；1：接收",required=false)
-    private BigDecimal orderReceiveStatus;
-
-    /**
-     * 司机接收/拒绝订单时间(ORDER_RECEIVE_REFUSE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="司机接收/拒绝订单时间",required=false)
-    private Date orderReceiveRefuseTime;
-
-    /**
-     * 通信时长=司机接单/拒绝时间-订单下发时间(ORDER_COMMUNICATION_DURATION,DECIMAL,0)
-     */
-    @ApiModelProperty(value="通信时长=司机接单/拒绝时间-订单下发时间",required=false)
-    private BigDecimal orderCommunicationDuration;
-
-    /**
-     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收(ORDER_STATUS,DECIMAL,38)
-     */
-    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收",required=false)
-    private BigDecimal orderStatus;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    /**
-     * 逻辑删除(DELETED,DECIMAL,0)
-     */
-    @ApiModelProperty(value="逻辑删除",required=false)
-    private BigDecimal deleted;
-
-    /**
-     * 订单类型（1：销售订单；2：发运计划；3：采购订单；4：内转物流计划）(ORDER_TYPE,DECIMAL,0)
-     */
-    @ApiModelProperty(value="订单类型（1：销售订单；2：发运计划；3：采购订单；4：内转物流计划）",required=false)
-    private BigDecimal orderType;
-
-    /**
-     * 路段顺序号(ORDER_LINE_SEQUENCE,DECIMAL,38)
-     */
-    @ApiModelProperty(value="路段顺序号",required=false)
-    private BigDecimal orderLineSequence;
-
-    /**
-     * 运输路线ID(LINE_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="运输路线ID",required=false)
-    private BigDecimal lineId;
-
-    /**
-     * 预计进厂时间(ORDER_ENTRY_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="预计进厂时间",required=false)
-    private Date orderEntryTime;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.orderId;
-    }
-
-    @Override
-    public void setId(BigDecimal orderId) {
-        this.orderId = orderId;
-    }
-
-    public BigDecimal getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(BigDecimal orderId) {
-        this.orderId = orderId;
-    }
-
-    public BigDecimal getOrderPlanId() {
-        return orderPlanId;
-    }
-
-    public void setOrderPlanId(BigDecimal orderPlanId) {
-        this.orderPlanId = orderPlanId;
-    }
-
-    public String getOrderNumber() {
-        return orderNumber;
-    }
-
-    public void setOrderNumber(String orderNumber) {
-        this.orderNumber = orderNumber == null ? null : orderNumber.trim();
-    }
-
-    public BigDecimal getCapacityId() {
-        return capacityId;
-    }
-
-    public void setCapacityId(BigDecimal capacityId) {
-        this.capacityId = capacityId;
-    }
-
-    public Date getOrderIssueTime() {
-        return orderIssueTime;
-    }
-
-    public void setOrderIssueTime(Date orderIssueTime) {
-        this.orderIssueTime = orderIssueTime;
-    }
-
-    public BigDecimal getOrderReceiveStatus() {
-        return orderReceiveStatus;
-    }
-
-    public void setOrderReceiveStatus(BigDecimal orderReceiveStatus) {
-        this.orderReceiveStatus = orderReceiveStatus;
-    }
-
-    public Date getOrderReceiveRefuseTime() {
-        return orderReceiveRefuseTime;
-    }
-
-    public void setOrderReceiveRefuseTime(Date orderReceiveRefuseTime) {
-        this.orderReceiveRefuseTime = orderReceiveRefuseTime;
-    }
-
-    public BigDecimal getOrderCommunicationDuration() {
-        return orderCommunicationDuration;
-    }
-
-    public void setOrderCommunicationDuration(BigDecimal orderCommunicationDuration) {
-        this.orderCommunicationDuration = orderCommunicationDuration;
-    }
-
-    public BigDecimal getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(BigDecimal orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getInsertUpdateRemark() {
-        return insertUpdateRemark;
-    }
-
-    public void setInsertUpdateRemark(String insertUpdateRemark) {
-        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
-    }
-
-    public BigDecimal getDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(BigDecimal deleted) {
-        this.deleted = deleted;
-    }
-
-    public BigDecimal getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(BigDecimal orderType) {
-        this.orderType = orderType;
-    }
-
-    public BigDecimal getOrderLineSequence() {
-        return orderLineSequence;
-    }
-
-    public void setOrderLineSequence(BigDecimal orderLineSequence) {
-        this.orderLineSequence = orderLineSequence;
-    }
-
-    public BigDecimal getLineId() {
-        return lineId;
-    }
-
-    public void setLineId(BigDecimal lineId) {
-        this.lineId = lineId;
-    }
-
-    public Date getOrderEntryTime() {
-        return orderEntryTime;
-    }
-
-    public void setOrderEntryTime(Date orderEntryTime) {
-        this.orderEntryTime = orderEntryTime;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", orderId=").append(orderId);
-        sb.append(", orderPlanId=").append(orderPlanId);
-        sb.append(", orderNumber=").append(orderNumber);
-        sb.append(", capacityId=").append(capacityId);
-        sb.append(", orderIssueTime=").append(orderIssueTime);
-        sb.append(", orderReceiveStatus=").append(orderReceiveStatus);
-        sb.append(", orderReceiveRefuseTime=").append(orderReceiveRefuseTime);
-        sb.append(", orderCommunicationDuration=").append(orderCommunicationDuration);
-        sb.append(", orderStatus=").append(orderStatus);
-        sb.append(", insertUsername=").append(insertUsername);
-        sb.append(", insertTime=").append(insertTime);
-        sb.append(", updateUsername=").append(updateUsername);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", deleted=").append(deleted);
-        sb.append(", orderType=").append(orderType);
-        sb.append(", orderLineSequence=").append(orderLineSequence);
-        sb.append(", lineId=").append(lineId);
-        sb.append(", orderEntryTime=").append(orderEntryTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -24,7 +24,7 @@ public class TmstruckEnfactoryResult implements IBasePO<BigDecimal> {
     /**
      * 进门门岗ID(GATEPOST_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="进门门岗ID",required=true)
+    @ApiModelProperty(value="进门门岗ID",required=false)
     private BigDecimal gatepostId;
 
     /**
@@ -87,6 +87,12 @@ public class TmstruckEnfactoryResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="废除时间",required=false)
     private Date deleteTime;
 
+    /**
+     * 路段顺序号(SEGMEN_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmenSqe;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -203,6 +209,14 @@ public class TmstruckEnfactoryResult implements IBasePO<BigDecimal> {
         this.deleteTime = deleteTime;
     }
 
+    public BigDecimal getSegmenSqe() {
+        return segmenSqe;
+    }
+
+    public void setSegmenSqe(BigDecimal segmenSqe) {
+        this.segmenSqe = segmenSqe;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -222,6 +236,7 @@ public class TmstruckEnfactoryResult implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleteUsername=").append(deleteUsername);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", segmenSqe=").append(segmenSqe);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -24,7 +24,7 @@ public class TmstruckLeaveFactoryResult implements IBasePO<BigDecimal> {
     /**
      * 出门门岗ID(GATEPOST_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="出门门岗ID",required=true)
+    @ApiModelProperty(value="出门门岗ID",required=false)
     private BigDecimal gatepostId;
 
     /**
@@ -81,6 +81,12 @@ public class TmstruckLeaveFactoryResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="废除时间",required=false)
     private Date deleteTime;
 
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
     /**
      * 车厢抓拍图片(RESULT_TRUCK_SNAPSHOT_PICTURE,BLOB,4000)
      */
@@ -195,6 +201,14 @@ public class TmstruckLeaveFactoryResult implements IBasePO<BigDecimal> {
         this.deleteTime = deleteTime;
     }
 
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
     public byte[] getResultTruckSnapshotPicture() {
         return resultTruckSnapshotPicture;
     }
@@ -221,6 +235,7 @@ public class TmstruckLeaveFactoryResult implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleteUsername=").append(deleteUsername);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", segmentSqe=").append(segmentSqe);
         sb.append(", resultTruckSnapshotPicture=").append(resultTruckSnapshotPicture);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");

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

@@ -100,9 +100,9 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
     private String insertUpdateRemark;
 
     /**
-     * 状态：0 ：正常 1：逻辑删除(STATUS,DECIMAL,0)
+     * 状态：0 ：正常 1：逻辑删除 (STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="状态：0 ：正常 1：逻辑删除",required=false)
+    @ApiModelProperty(value="状态：0 ：正常 1：逻辑删除 ",required=false)
     private BigDecimal status;
 
     /**
@@ -117,6 +117,30 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="装货点ID",required=false)
     private BigDecimal loadingId;
 
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 装车顺序(LOADING_SEQUENCE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装车顺序",required=false)
+    private BigDecimal loadingSequence;
+
+    /**
+     * 是否需要质检（0 ：不需要   1：需要）(ISDEDUCT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否需要质检（0 ：不需要   1：需要）",required=false)
+    private BigDecimal isdeduct;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -273,6 +297,38 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         this.loadingId = loadingId;
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getLoadingSequence() {
+        return loadingSequence;
+    }
+
+    public void setLoadingSequence(BigDecimal loadingSequence) {
+        this.loadingSequence = loadingSequence;
+    }
+
+    public BigDecimal getIsdeduct() {
+        return isdeduct;
+    }
+
+    public void setIsdeduct(BigDecimal isdeduct) {
+        this.isdeduct = isdeduct;
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -297,6 +353,10 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         sb.append(", status=").append(status);
         sb.append(", resultMeasuredTonnage=").append(resultMeasuredTonnage);
         sb.append(", loadingId=").append(loadingId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", loadingSequence=").append(loadingSequence);
+        sb.append(", isdeduct=").append(isdeduct);
+        sb.append(", segmentSqe=").append(segmentSqe);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -57,6 +57,18 @@ public class TmstruckMeasureCommission implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 汽车衡ID(CALCULATE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="汽车衡ID",required=false)
+    private BigDecimal calculateId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -133,6 +145,22 @@ public class TmstruckMeasureCommission implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getCalculateId() {
+        return calculateId;
+    }
+
+    public void setCalculateId(BigDecimal calculateId) {
+        this.calculateId = calculateId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -147,6 +175,8 @@ public class TmstruckMeasureCommission implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", calculateId=").append(calculateId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/model/AmstruckPurplanMaterial.java → src/main/java/com/steerinfo/dil/model/TmstruckReturnResult.java

@@ -7,43 +7,19 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="采购运输计划物资中间表")
-public class AmstruckPurplanMaterial implements IBasePO<BigDecimal> {
+@ApiModel(value="退货实绩")
+public class TmstruckReturnResult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(PURPLAN_PLAN_MATERIAL_ID,DECIMAL,38)
+     * 主键ID(RESULT_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal purplanPlanMaterialId;
+    private BigDecimal resultId;
 
     /**
-     * 计划ID(PLAN_ID,DECIMAL,38)
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="计划ID",required=false)
-    private BigDecimal planId;
-
-    /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
-
-    /**
-     * 物资数量(PURPLAN_MATERIAL_NUMBER,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资数量",required=false)
-    private BigDecimal purplanMaterialNumber;
-
-    /**
-     * 已分配重量(MATERIAL_ALLOCATED_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="已分配重量",required=false)
-    private BigDecimal materialAllocatedWeight;
-
-    /**
-     * 未分配重量(MATERIAL_UNALLOCATED_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="未分配重量",required=false)
-    private BigDecimal materialUnallocatedWeight;
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -79,60 +55,28 @@ public class AmstruckPurplanMaterial implements IBasePO<BigDecimal> {
 
     @Override
     public BigDecimal getId() {
-        return this.purplanPlanMaterialId;
+        return this.resultId;
     }
 
     @Override
-    public void setId(BigDecimal purplanPlanMaterialId) {
-        this.purplanPlanMaterialId = purplanPlanMaterialId;
-    }
-
-    public BigDecimal getPurplanPlanMaterialId() {
-        return purplanPlanMaterialId;
-    }
-
-    public void setPurplanPlanMaterialId(BigDecimal purplanPlanMaterialId) {
-        this.purplanPlanMaterialId = purplanPlanMaterialId;
-    }
-
-    public BigDecimal getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(BigDecimal planId) {
-        this.planId = planId;
-    }
-
-    public BigDecimal getMaterialId() {
-        return materialId;
-    }
-
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
-    }
-
-    public BigDecimal getPurplanMaterialNumber() {
-        return purplanMaterialNumber;
-    }
-
-    public void setPurplanMaterialNumber(BigDecimal purplanMaterialNumber) {
-        this.purplanMaterialNumber = purplanMaterialNumber;
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
     }
 
-    public BigDecimal getMaterialAllocatedWeight() {
-        return materialAllocatedWeight;
+    public BigDecimal getResultId() {
+        return resultId;
     }
 
-    public void setMaterialAllocatedWeight(BigDecimal materialAllocatedWeight) {
-        this.materialAllocatedWeight = materialAllocatedWeight;
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
     }
 
-    public BigDecimal getMaterialUnallocatedWeight() {
-        return materialUnallocatedWeight;
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
     }
 
-    public void setMaterialUnallocatedWeight(BigDecimal materialUnallocatedWeight) {
-        this.materialUnallocatedWeight = materialUnallocatedWeight;
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
     }
 
     public String getInsertUsername() {
@@ -181,12 +125,8 @@ public class AmstruckPurplanMaterial implements IBasePO<BigDecimal> {
         sb.append(getClass().getSimpleName());
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
-        sb.append(", purplanPlanMaterialId=").append(purplanPlanMaterialId);
-        sb.append(", planId=").append(planId);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", purplanMaterialNumber=").append(purplanMaterialNumber);
-        sb.append(", materialAllocatedWeight=").append(materialAllocatedWeight);
-        sb.append(", materialUnallocatedWeight=").append(materialUnallocatedWeight);
+        sb.append(", resultId=").append(resultId);
+        sb.append(", resultTotalId=").append(resultTotalId);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);

src/main/java/com/steerinfo/dil/model/OmstruckOrderMaterial.java → src/main/java/com/steerinfo/dil/model/TmstruckSmsRusult.java

@@ -7,37 +7,37 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="运输订单物资中间表")
-public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
+@ApiModel(value="汽运短信实绩")
+public class TmstruckSmsRusult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(ORDER_MATERIAL_ID,DECIMAL,38)
+     * 总实绩ID(RESULT_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal orderMaterialId;
+    @ApiModelProperty(value="总实绩ID",required=true)
+    private BigDecimal resultId;
 
     /**
-     * 订单id(ORDER_ID,DECIMAL,38)
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="订单id",required=true)
-    private BigDecimal orderId;
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
 
     /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     * 发送方ID(SENDER_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
+    @ApiModelProperty(value="发送方ID",required=false)
+    private BigDecimal senderId;
 
     /**
-     * 物资件数(ORDER_MATERIAL_NUMBER,DECIMAL,38)
+     * 短信发送时间(RESULT_SENDING_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="物资件数",required=false)
-    private BigDecimal orderMaterialNumber;
+    @ApiModelProperty(value="短信发送时间",required=false)
+    private Date resultSendingTime;
 
     /**
-     * 物资重量(ORDER_MATERIAL_WEIGHT,DECIMAL,0)
+     * 短信内容(RESULT_SMS_CONTENT,VARCHAR,120)
      */
-    @ApiModelProperty(value="物资重量",required=false)
-    private BigDecimal orderMaterialWeight;
+    @ApiModelProperty(value="短信内容",required=false)
+    private String resultSmsContent;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -73,52 +73,52 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
 
     @Override
     public BigDecimal getId() {
-        return this.orderMaterialId;
+        return this.resultId;
     }
 
     @Override
-    public void setId(BigDecimal orderMaterialId) {
-        this.orderMaterialId = orderMaterialId;
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
     }
 
-    public BigDecimal getOrderMaterialId() {
-        return orderMaterialId;
+    public BigDecimal getResultId() {
+        return resultId;
     }
 
-    public void setOrderMaterialId(BigDecimal orderMaterialId) {
-        this.orderMaterialId = orderMaterialId;
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
     }
 
-    public BigDecimal getOrderId() {
-        return orderId;
+    public BigDecimal getTotalResultId() {
+        return totalResultId;
     }
 
-    public void setOrderId(BigDecimal orderId) {
-        this.orderId = orderId;
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
     }
 
-    public BigDecimal getMaterialId() {
-        return materialId;
+    public BigDecimal getSenderId() {
+        return senderId;
     }
 
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
+    public void setSenderId(BigDecimal senderId) {
+        this.senderId = senderId;
     }
 
-    public BigDecimal getOrderMaterialNumber() {
-        return orderMaterialNumber;
+    public Date getResultSendingTime() {
+        return resultSendingTime;
     }
 
-    public void setOrderMaterialNumber(BigDecimal orderMaterialNumber) {
-        this.orderMaterialNumber = orderMaterialNumber;
+    public void setResultSendingTime(Date resultSendingTime) {
+        this.resultSendingTime = resultSendingTime;
     }
 
-    public BigDecimal getOrderMaterialWeight() {
-        return orderMaterialWeight;
+    public String getResultSmsContent() {
+        return resultSmsContent;
     }
 
-    public void setOrderMaterialWeight(BigDecimal orderMaterialWeight) {
-        this.orderMaterialWeight = orderMaterialWeight;
+    public void setResultSmsContent(String resultSmsContent) {
+        this.resultSmsContent = resultSmsContent == null ? null : resultSmsContent.trim();
     }
 
     public String getInsertUsername() {
@@ -167,11 +167,11 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(getClass().getSimpleName());
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
-        sb.append(", orderMaterialId=").append(orderMaterialId);
-        sb.append(", orderId=").append(orderId);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", orderMaterialNumber=").append(orderMaterialNumber);
-        sb.append(", orderMaterialWeight=").append(orderMaterialWeight);
+        sb.append(", resultId=").append(resultId);
+        sb.append(", totalResultId=").append(totalResultId);
+        sb.append(", senderId=").append(senderId);
+        sb.append(", resultSendingTime=").append(resultSendingTime);
+        sb.append(", resultSmsContent=").append(resultSmsContent);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);

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

@@ -0,0 +1,334 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="计时作业实绩表")
+public class TmstruckTimeTaskResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(TIME_TASK_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal timeTaskResultId;
+
+    /**
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 作业时长(RESULT_VALUE,DECIMAL,10)
+     */
+    @ApiModelProperty(value="作业时长",required=false)
+    private BigDecimal resultValue;
+
+    /**
+     * 度量单位ID(RESULT_UOM_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="度量单位ID",required=false)
+    private BigDecimal resultUomId;
+
+    /**
+     * 记录时间类型：（0：计时开始申请时间；1：计时开始确认时间；2：计时结束申请时间；3：计时结束确认时间；4：暂停开始申请时间；5：暂停开始确认时间；6：暂停结束申请时间；7：暂停结束确认时间）(RESULT_TIME_TYPE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="记录时间类型：（0：计时开始申请时间；1：计时开始确认时间；2：计时结束申请时间；3：计时结束确认时间；4：暂停开始申请时间；5：暂停开始确认时间；6：暂停结束申请时间；7：暂停结束确认时间）",required=false)
+    private BigDecimal resultTimeType;
+
+    /**
+     * 计时时间(RESULT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计时时间",required=false)
+    private Date resultTime;
+
+    /**
+     * 扫码开始作业点ID(RESULT_START_NODE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="扫码开始作业点ID",required=false)
+    private BigDecimal resultStartNodeId;
+
+    /**
+     * 扫码开始经度(RESULT_START_LONGITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码开始经度",required=false)
+    private String resultStartLongitudeVal;
+
+    /**
+     * 扫码开始纬度(RESULT_START_LATITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码开始纬度",required=false)
+    private String resultStartLatitudeVal;
+
+    /**
+     * 扫码结束作业点ID(RESULT_END_NODE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="扫码结束作业点ID",required=false)
+    private BigDecimal resultEndNodeId;
+
+    /**
+     * 扫码结束经度(RESULT_END_LONGITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码结束经度",required=false)
+    private String resultEndLongitudeVal;
+
+    /**
+     * 扫码结束纬度(RESULT_END_LATITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码结束纬度",required=false)
+    private String resultEndLatitudeVal;
+
+    /**
+     * 备注(RESULT_MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String resultMemo;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private Date deleteTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.timeTaskResultId;
+    }
+
+    @Override
+    public void setId(BigDecimal timeTaskResultId) {
+        this.timeTaskResultId = timeTaskResultId;
+    }
+
+    public BigDecimal getTimeTaskResultId() {
+        return timeTaskResultId;
+    }
+
+    public void setTimeTaskResultId(BigDecimal timeTaskResultId) {
+        this.timeTaskResultId = timeTaskResultId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public BigDecimal getResultValue() {
+        return resultValue;
+    }
+
+    public void setResultValue(BigDecimal resultValue) {
+        this.resultValue = resultValue;
+    }
+
+    public BigDecimal getResultUomId() {
+        return resultUomId;
+    }
+
+    public void setResultUomId(BigDecimal resultUomId) {
+        this.resultUomId = resultUomId;
+    }
+
+    public BigDecimal getResultTimeType() {
+        return resultTimeType;
+    }
+
+    public void setResultTimeType(BigDecimal resultTimeType) {
+        this.resultTimeType = resultTimeType;
+    }
+
+    public Date getResultTime() {
+        return resultTime;
+    }
+
+    public void setResultTime(Date resultTime) {
+        this.resultTime = resultTime;
+    }
+
+    public BigDecimal getResultStartNodeId() {
+        return resultStartNodeId;
+    }
+
+    public void setResultStartNodeId(BigDecimal resultStartNodeId) {
+        this.resultStartNodeId = resultStartNodeId;
+    }
+
+    public String getResultStartLongitudeVal() {
+        return resultStartLongitudeVal;
+    }
+
+    public void setResultStartLongitudeVal(String resultStartLongitudeVal) {
+        this.resultStartLongitudeVal = resultStartLongitudeVal == null ? null : resultStartLongitudeVal.trim();
+    }
+
+    public String getResultStartLatitudeVal() {
+        return resultStartLatitudeVal;
+    }
+
+    public void setResultStartLatitudeVal(String resultStartLatitudeVal) {
+        this.resultStartLatitudeVal = resultStartLatitudeVal == null ? null : resultStartLatitudeVal.trim();
+    }
+
+    public BigDecimal getResultEndNodeId() {
+        return resultEndNodeId;
+    }
+
+    public void setResultEndNodeId(BigDecimal resultEndNodeId) {
+        this.resultEndNodeId = resultEndNodeId;
+    }
+
+    public String getResultEndLongitudeVal() {
+        return resultEndLongitudeVal;
+    }
+
+    public void setResultEndLongitudeVal(String resultEndLongitudeVal) {
+        this.resultEndLongitudeVal = resultEndLongitudeVal == null ? null : resultEndLongitudeVal.trim();
+    }
+
+    public String getResultEndLatitudeVal() {
+        return resultEndLatitudeVal;
+    }
+
+    public void setResultEndLatitudeVal(String resultEndLatitudeVal) {
+        this.resultEndLatitudeVal = resultEndLatitudeVal == null ? null : resultEndLatitudeVal.trim();
+    }
+
+    public String getResultMemo() {
+        return resultMemo;
+    }
+
+    public void setResultMemo(String resultMemo) {
+        this.resultMemo = resultMemo == null ? null : resultMemo.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", timeTaskResultId=").append(timeTaskResultId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", resultValue=").append(resultValue);
+        sb.append(", resultUomId=").append(resultUomId);
+        sb.append(", resultTimeType=").append(resultTimeType);
+        sb.append(", resultTime=").append(resultTime);
+        sb.append(", resultStartNodeId=").append(resultStartNodeId);
+        sb.append(", resultStartLongitudeVal=").append(resultStartLongitudeVal);
+        sb.append(", resultStartLatitudeVal=").append(resultStartLatitudeVal);
+        sb.append(", resultEndNodeId=").append(resultEndNodeId);
+        sb.append(", resultEndLongitudeVal=").append(resultEndLongitudeVal);
+        sb.append(", resultEndLatitudeVal=").append(resultEndLatitudeVal);
+        sb.append(", resultMemo=").append(resultMemo);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -46,10 +46,10 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
     private BigDecimal resultDuration;
 
     /**
-     * 卸货状态：0：拒绝；1：同意(UNLOAD_STATUS,DECIMAL,0)
+     * 卸货状态：拒绝；同意(UNLOAD_STATUS,VARCHAR,5)
      */
-    @ApiModelProperty(value="卸货状态：0：拒绝；1：同意",required=false)
-    private BigDecimal unloadStatus;
+    @ApiModelProperty(value="卸货状态：拒绝；同意",required=false)
+    private String unloadStatus;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -99,6 +99,12 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="卸货点(连原料仓库)",required=false)
     private BigDecimal resultUnloadPlaceId;
 
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -159,12 +165,12 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         this.resultDuration = resultDuration;
     }
 
-    public BigDecimal getUnloadStatus() {
+    public String getUnloadStatus() {
         return unloadStatus;
     }
 
-    public void setUnloadStatus(BigDecimal unloadStatus) {
-        this.unloadStatus = unloadStatus;
+    public void setUnloadStatus(String unloadStatus) {
+        this.unloadStatus = unloadStatus == null ? null : unloadStatus.trim();
     }
 
     public String getInsertUsername() {
@@ -231,6 +237,14 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         this.resultUnloadPlaceId = resultUnloadPlaceId;
     }
 
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -252,6 +266,7 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         sb.append(", deleteName=").append(deleteName);
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", resultUnloadPlaceId=").append(resultUnloadPlaceId);
+        sb.append(", segmentSqe=").append(segmentSqe);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -21,9 +21,8 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="总实绩ID",required=false)
     private BigDecimal resultTotalId;
 
-
     /**
-     * 磅单号(RESULT_POUND_NO,VARCHAR,20)
+     * 磅单号(RESULT_POUND_NO,VARCHAR,100)
      */
     @ApiModelProperty(value="磅单号",required=false)
     private String resultPoundNo;
@@ -112,6 +111,36 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="计皮点ID(汽车衡)",required=false)
     private BigDecimal resultTarePlaceId;
 
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 是否需要扣水扣杂(0:否，1：是)(ISDEDUCT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="是否需要扣水扣杂(0:否，1：是)",required=false)
+    private BigDecimal isdeduct;
+
+    /**
+     * 是否完成扣水扣杂(0:否，1：是)(ISQUALITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="是否完成扣水扣杂(0:否，1：是)",required=false)
+    private BigDecimal isquality;
+
+    /**
+     * 毛重路段顺序号(GROSS_SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="毛重路段顺序号",required=false)
+    private BigDecimal grossSegmentSqe;
+
+    /**
+     * 皮重路段顺序号(TARE_SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="皮重路段顺序号",required=false)
+    private BigDecimal tareSegmentSqe;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -140,7 +169,6 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         this.resultTotalId = resultTotalId;
     }
 
-
     public String getResultPoundNo() {
         return resultPoundNo;
     }
@@ -261,6 +289,46 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         this.resultTarePlaceId = resultTarePlaceId;
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getIsdeduct() {
+        return isdeduct;
+    }
+
+    public void setIsdeduct(BigDecimal isdeduct) {
+        this.isdeduct = isdeduct;
+    }
+
+    public BigDecimal getIsquality() {
+        return isquality;
+    }
+
+    public void setIsquality(BigDecimal isquality) {
+        this.isquality = isquality;
+    }
+
+    public BigDecimal getGrossSegmentSqe() {
+        return grossSegmentSqe;
+    }
+
+    public void setGrossSegmentSqe(BigDecimal grossSegmentSqe) {
+        this.grossSegmentSqe = grossSegmentSqe;
+    }
+
+    public BigDecimal getTareSegmentSqe() {
+        return tareSegmentSqe;
+    }
+
+    public void setTareSegmentSqe(BigDecimal tareSegmentSqe) {
+        this.tareSegmentSqe = tareSegmentSqe;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -284,6 +352,11 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", resultGrossPlaceId=").append(resultGrossPlaceId);
         sb.append(", resultTarePlaceId=").append(resultTarePlaceId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", isdeduct=").append(isdeduct);
+        sb.append(", isquality=").append(isquality);
+        sb.append(", grossSegmentSqe=").append(grossSegmentSqe);
+        sb.append(", tareSegmentSqe=").append(tareSegmentSqe);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -32,4 +32,22 @@ public interface DropDownService {
 
     //获取所有的港口
     List<Map<String, Object>> getPort();
+
+    //获取所有的月台
+    List<Map<String, Object>> getPlatformId();
+
+    //装货地点下拉框
+    List<Map<String,Object>>   getLoadedPlace();
+
+    //外轮船名下拉框
+    List<Map<String,Object>> getForeignName();
+
+    //查询卸货点（通过类型判断）
+    List<Map<String, Object>> getUnloadPoint(Integer type);
+
+    //通过订单Id查询装车的物资
+    List<Map<String, Object>> getOrderMaterial(Integer orderId);
+
+    //通过仓库ID查询月台ID
+    List<Map<String, Object>> getPlatformIdByWarehouse(Integer warehouseId);
 }

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

@@ -1,26 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.AmstruckPurplanMaterial;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplanMaterial服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 02:15
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplanMaterial服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAmstruckPurplanMaterialService{
-    //查询所有已分解计划
-    List<Map<String, Object>> getDecomposedPlan(Map<String, Object> map);
-}

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

@@ -1,45 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.framework.service.IBaseService;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplan服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-02 10:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-02
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplan服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAmstruckPurplanService{
-    //查询所有运输计划
-    List<Map<String, Object>> getAllPurPlan(Map<String, Object> map);
-
-    //通过ID查询运输计划
-    List<Map<String, Object>> getPurPlanById(@Param("planId") Integer planId);
-
-    //新增运输计划
-    int addPurPlan(AmstruckPurplan amstruckPurplan);
-
-    //修改运输计划
-    int updatePurPlan(AmstruckPurplan amstruckPurplan);
-
-    //逻辑删除运输计划
-    int deletePurPlan(AmstruckPurplan amstruckPurplan);
-
-    //下发运输计划
-    int sendPurPlan(AmstruckPurplan amstruckPurplan);
-
-    //下发运输计划
-    int receptionPurPlan(AmstruckPurplan amstruckPurplan);
-}

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

@@ -1,23 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
-
-/**
- * OmstruckOrderMaterial服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrderMaterial服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IOmstruckOrderMaterialService{
-
-}

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

@@ -1,65 +0,0 @@
-package com.steerinfo.dil.service;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * OmstruckOrder服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 03:47
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrder服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IOmstruckOrderService{
-
-    //查询所有运输订单信息 状态：3
-    //查询所有已经下发的运输订单 用于查询司机车牌 websocket  状态：4
-    List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map);
-
-    //新增采购进口矿 运输订单
-    int addPurOrder(Map<String, Object> map);
-
-    //查询所有运力信息
-    List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
-
-    //修改运输订单 和 运输订单子表
-    int updateOrder(Map<String, Object> map);
-
-    //分派运单给司机
-    int dispatchOrder(Integer id);
-
-    //逻辑删除未下发运单
-    int deleteOrder(Map<String, Object> map);
-
-    //司机接单\拒绝
-    int driverReceiveOrRefuse(Map<String, Object> map);
-
-    //查询所有接单或拒绝接单的订单
-    List<Map<String, Object>> getReceiveRefuseOrder(Map<String, Object> map);
-
-    //司机接单调用接口推送数据 接收车牌号
-    List<Map<String, Object>> sendMesToDriver(Map<String, Object> map);
-
-    //通过运单号查询所有信息
-    List<Map<String, Object>> getOrderMesByOrderNum(Map<String, Object> map);
-
-    //查询司机所有已拒绝过的订单
-    List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map);
-
-    // 查询实绩地点和时间
-    List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId);
-
-    //通过运单Id获取运单相关信息
-    List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId);
-
-    //运输派单
-    List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
-}

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

@@ -0,0 +1,39 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/11/16 14:30
+ */
+
+public interface IRulesService {
+    //通过运输订单号查询物资并根据门岗规则计算出厂门岗
+    int calculateGatepost(Map<String, Object> map);
+
+    //通过物资Id、计量类型（进厂、出厂、中转） 可能会有多个称
+    List<Integer> queryTruckCalculate(Map<String, Object> map);
+
+    //查询当前物资是否为最后一拼（是否还有未装车实绩）
+    List<Map<String, Object>> judgeLastMaterial(BigDecimal orderId);
+
+    //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
+    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
+
+    //通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
+    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
+
+    //通过月台Id 查询月台当前排队车辆数
+    BigDecimal queueCountByPlatformId(BigDecimal platformId);
+
+    //通过排队规则查询月台ID  materialIdList：运单关联的所有物资
+    Map<String, Object> getPlatId(Integer materialId);
+
+    //计算物资优先级顺序 并计算装车点
+    Map<String, Object> calculateMaterialPriority(List<Map<String, Object>> mapList);
+
+    //计算装车顺序
+    Map<String, Object> calculateMaterial(List<Map<String, Object>> mapList);
+}

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.service;
+
+/**
+ * 查询汽运统计报表
+ * @ author    :TXF
+ * @ time      :2021/12/14 15:25
+ */
+
+public interface IStatisticalReportService {
+
+}

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

@@ -20,18 +20,24 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface ITmstruckEnfactoryResultService{
-    //获取所有进厂实绩
+    //通过订单类型获取进厂实绩
     List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map);
-
-    //采从门岗系统采集信息后 新增进厂作业
+    //通过运输订单id查询物资信息
+    List<Map<String, Object>> getMaterial(Integer orderId);
+    //新增进厂作业
     int addEnFactoryResult(Map<String, Object> map);
 
-    //使用PDA方式进厂更新实绩
-    int updateEnFactoryByPDA(Map<String,Object> map);
-
-    //使用门禁系统进厂更新实绩
-    int updateEnFactoryByMenJin(Map<String,Object> map);
-
     //查找排队序号
     Integer selectNodeNumber(String orderNumber);
+
+    //进厂实绩
+    int enFactoryResultByPDA(Map<String, Object> map);
+
+    //
+    int enFactoryResultByMJ(Map<String, Object> map);
+
+    // APP查询进厂实绩
+    List<Map<String, Object>> getEnfactoryResultList();
+    // APP通过运输订单id查询进厂实绩
+    List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber);
 }

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

@@ -20,24 +20,22 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface ITmstruckLeaveFactoryResultService {
-    //新增出厂作业实绩
-    int addLeaveFactoryResult(Map<String, Object> map);
 
     //查询所有的出厂实绩
     List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map);
 
+    //更新出厂实绩 通过运输订单号
+    int leaveFactoryByPDA(Map<String, Object> map);
+
     //查询运输路线是否为可出厂 路段顺序号为 4：已计皮完成
     Integer selectTransportRoute(String orderNumber);
 
-    //查询车牌号与门岗名称
-    Map<String,Object> selectLeaveFactory(String orderNumber);
 
     //新增进厂实绩 派单时新增
     int addLeaveFactory(Map<String,Object> mapValue);
 
-    //更新出厂实绩
-    int updateLeaveFactoryByPDA(Map<String,Object> mapValue);
-    //根据门禁系统采集获取
-    int updateLeaveFactoryByMenGang(Map<String,Object> mapValue);
+    Map<String, Object> getTruckFactoryResult(String nu);
 
+    // APP查询出厂信息
+    List<Map<String, Object>> getLeaveFactoryList(String orderNumber);
 }

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

@@ -23,9 +23,18 @@ public interface ITmstruckLoadResultService{
     //查询所有的装车实绩
     List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
 
-    //新增装车实绩
+    //生成装车实绩(销售)
     int addLoadResult(Map<String, Object> map);
 
+    //新增采购装车实绩
+    int addCGLoadResult(Map<String, Object> map);
+
+    //修改销售装车实绩  （如果是多种物资【多拼】，通过物资Id和运输订单号来确定唯一的装车实绩进行修改）
+    int addXSLoadResult(Map<String, Object> map);
+
+    //修改销售钢渣、水渣、危化品装车实绩
+    int addXS2LoadResult(Map<String, Object> map);
+
     //修改装车作业
     int updateLoadResult(TmstruckLoadResult tmstruckLoadResult);
 
@@ -34,4 +43,37 @@ public interface ITmstruckLoadResultService{
 
     //逻辑删除装车作业
     int deleteLoadResult(Integer resultId);
+
+    //修改装车作业作业点
+    int updateLoadingIds(List<Map<String, Object>> map);
+
+    //销售查询所有的装车实绩
+    List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
+
+    //内转物流，新增装车实绩
+    int addLoadResultForconverted(Map<String,Object> map);
+
+    //内转物流，修改装车实绩
+    int updateLoadResultForconverted(Map<String,Object> map);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> getLoadResultIdForOrderNumber(String orderNumber);
+
+    //内转物流汽车装货展示
+    List<Map<String,Object>> selectLoadResultForConverted(Map<String,Object> map);
+
+    //通过实绩id渲染数据
+    List<Map<String,Object>> selectLoadResultByResultId(Integer resultId);
+
+    //内转物流火车装车新增装车实绩
+    int addLoadResultForConverted(Map<String,Object> map);
+
+    //查询所有正在进行进厂排队的销售订单
+    List<Map<String, Object>> getSaleOrderOnQueue(Map<String, Object> map);
+
+    //修改装车点和装车顺序
+    int updateLoadingIdAndLoadSq(Map<String, Object> map);
+
+    //新增达州站-厂内装车实绩
+    int addDaZhouToDaGangLoadResult(Map<String, Object> map);
 }

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

@@ -1,8 +1,6 @@
 package com.steerinfo.dil.service;
 
 
-import com.steerinfo.dil.model.TmstruckMeasureCommission;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -25,5 +23,9 @@ public interface ITmstruckMeasureCommissionService{
     List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map);
 
     //新增计量委托实绩 当进厂作业完成后
-    int addMeasureCommission(BigDecimal totalId, Integer type);
+    int addMeasureCommission(Map<String, Object> map, Integer type);
+
+    //添加计毛委托
+    int addMaoMeasureCommission(Map<String, Object> map);
+
 }

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

@@ -31,4 +31,5 @@ public interface ITmstruckQualityResultService {
     //修改质检作业
     int updateQualityResult(TmstruckQualityResult tmstruckQualityResult);
 
+
 }

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

@@ -18,7 +18,10 @@ import java.util.Map;
  */
 public interface ITmstruckReceiptResultService{
 
-    //查询所有签收实绩
+    //查询所有收货实绩
     List<Map<String, Object>> getReceiveResult(Map<String, Object> map);
 
+    //新增钢材到异地库达州站驻港人员确定收货
+    int addSteelNzReceiptResult(Map<String, Object> map);
+
 }

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

@@ -0,0 +1,26 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckReturnResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-18 09:17
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckReturnResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstruckReturnResultService{
+    //添加退货实绩
+    int addReturnGoodsResult(Map<String, Object> map);
+
+    //查询退货实绩
+    List<Map<String, Object>> getAllReturnResult(Map<String, Object> map);
+}

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

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.service;
+
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-11-17 20:58
+ */
+public interface ITmstruckSelfMachineService {
+    /*
+    提货单信息
+     */
+    Map<String, Object> getBillOrder(String orderNumber);
+
+    Map<String, Object> getDeliveryOrder(String orderNumber);
+}

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.TmstruckSmsRusult;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckSmsRusult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-18 09:19
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckSmsRusult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstruckSmsRusultService extends IBaseService<TmstruckSmsRusult, BigDecimal>{
+  //新增短信
+ int addSmsResult(Map<String ,Object> map);
+ //查询短信实绩
+ List<Map<String,Object>> getSmsResult(Map<String,Object> map);
+}

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

@@ -0,0 +1,51 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.TmstruckTimeTaskResult;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckTimeTskResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 07:28
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-22
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckTimeTskResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstruckTimeTaskResultService {
+
+    //司机申请开始装车
+    int applyStartTime(Map<String, Object> map);
+
+    //用车单位确认开始装车
+    int unitSureStartTime(Map<String, Object> map);
+
+    //司机申请暂停
+    int applyStartTimeout(Map<String, Object> map);
+
+    //用车单位确认暂停
+    int unitSureStartTimeout(Map<String, Object> map);
+
+    //司机申请暂停结束
+    int applyEndTimeout(Map<String, Object> map);
+
+    //用车单位确认暂停结束
+    int unitSureEndTimeout(Map<String, Object> map);
+
+    //司机申请结束
+    int applyEndTime(Map<String, Object> map);
+
+    //用车单位确认结束
+    int unitSureEndTime(Map<String, Object> map);
+
+    //查询计时作业
+    List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map);
+}

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

@@ -0,0 +1,19 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 10:17
+ */
+
+public interface ITmstruckTotalResultService {
+
+    public int addTotalResult(BigDecimal orderId);
+    //查询计数作业
+    List<Map<String,Object>> selectCountList(Map<String,Object> map);
+    //查询包月作业
+    List<Map<String, Object>> getTmstruckMonthResult(Map<String, Object> mapValue);
+}

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

@@ -28,4 +28,13 @@ public interface ITmstruckUnloadResultService{
 
     // 修改实绩内容
     int updateUnloadResult(Map<String, Object> map);
+
+    //新增卸货实绩
+    int addUnloadresultForconverted(Map<String,Object> map);
+
+    //修改卸货实绩
+    int updateUnloadresultForconverted(Map<String,Object> map);
+
+    //根据运输订单号查找装车实绩
+    Map<String,Object> selectLoadResultIdByOrderNumber(String orderNumber);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -20,6 +21,9 @@ public interface ITmstruckWeightResultService{
     //更新计毛实绩
     int addJiMaoResult(Map<String, Object> map);
 
+    //计量接口更新实绩
+    int updateTruckWeight(List<Map<String, Object>> mapList);
+
     //查询所有计毛实绩
     List<Map<String, Object>> getAllJiMaoResult(Map<String, Object> map);
 
@@ -31,4 +35,5 @@ public interface ITmstruckWeightResultService{
 
     //新增计皮计毛实绩
     int addWeightResult(Map<String, Object> map);
+
 }

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

@@ -0,0 +1,46 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/26 14:42
+ */
+
+public interface IUtilsService {
+
+    //添加运单Id
+    BigDecimal selectOrderMaxId();
+
+    //查询运输订单子表主键ID
+    BigDecimal selectOrderMaterialMaxId();
+
+    //通过运力ID 修改运力状态
+    int updateCapacityStatus(Map<String, Object> map, Integer status);
+
+    //正常关闭订单
+    int closeOrderNormally(Map<String, Object> map);
+
+    //通过仓库名称查询仓库Id
+    Integer queryWarehouseIdByName(String warehouseName);
+
+    //用于更新路段顺序号
+    int updateOrderLineSequence(Map<String, Object> map);
+
+    //通过月台名称查找月台Id platformName
+    Integer queryPlatformIdByName(String platformName);
+
+    //查询当前路段顺序号
+    Integer getLineSequenceByOrderId(BigDecimal orderId);
+
+    //查询订单跟订单物资中间表 查询是否有多个物资Id
+    List<Integer> getAllMaterialId(Map<String, Object> map);
+
+    //通过总实绩Id查询订单Id
+    Integer getOrderIdByTotalId(Integer resultTotalId);
+
+    //推送消息给websocket
+    void pushMesToWebsocket(String capacityNumber, String pushMes);
+}

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

@@ -1,36 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper;
-import com.steerinfo.dil.service.IAmstruckPurplanMaterialService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplanMaterial服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-03 02:15
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplanMaterial服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "amstruckPurplanMaterialService")
-public class AmstruckPurplanMaterialServiceImpl implements IAmstruckPurplanMaterialService {
-
-    @Autowired
-    private AmstruckPurplanMaterialMapper amstruckPurplanMaterialMapper;
-
-
-    @Override
-    public List<Map<String, Object>> getDecomposedPlan(Map<String, Object> map) {
-        return amstruckPurplanMaterialMapper.getDecomposedPlan(map);
-    }
-}

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

@@ -1,156 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmstruckPurplanMapper;
-import com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper;
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.dil.model.AmstruckPurplanMaterial;
-import com.steerinfo.dil.service.IAmstruckPurplanService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplan服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-02 10:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-02
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplan服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "amstruckPurplanService")
-public class AmstruckPurplanServiceImpl implements IAmstruckPurplanService {
-
-    @Autowired
-    private AmstruckPurplanMapper amstruckPurplanMapper;
-
-    @Autowired
-    private AmstruckPurplanMaterialMapper amstruckPurplanMaterialMapper;
-
-    /**
-     * 查询所有运输计划
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllPurPlan(Map<String, Object> map) {
-        return amstruckPurplanMapper.getAllPurPlan(map);
-    }
-
-    /**
-     * 通过主键Id查询运输计划
-     * @param planId
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getPurPlanById(Integer planId) {
-        return amstruckPurplanMapper.getPurPlanById(planId);
-    }
-
-    /**
-     * 新增运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    @Transactional
-    public int addPurPlan(AmstruckPurplan amstruckPurplan) {
-        //生成主键Id
-        long id;
-        BigDecimal maxId = amstruckPurplanMapper.selectMaxId();
-        id = maxId == null ? 1 : maxId.longValue() + 1;
-        BigDecimal planId = new BigDecimal(id);
-        amstruckPurplan.setPlanId(planId);
-        //生成运输计划号
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String planNumber = "WYSJF" + sdf.format(new Date());
-        planNumber += id < 10 ? "0000000" + id : id < 100 ? "000000" + id : id < 1000 ? "00000" + id : id < 10000 ?
-                "0000" + id : id < 100000 ? "000" + id : id < 1000000 ? "00" + id : id < 10000000 ? "0" + id : id;
-        amstruckPurplan.setPlanNo(planNumber);
-        //新增状态为未下发：0
-        amstruckPurplan.setPlanStatus(new BigDecimal(0));
-        //记录创建人
-        amstruckPurplan.setInsertUsername("admin");
-        //生成子表数据
-        AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
-        //生成主键
-        long childId;
-        BigDecimal selectMaxId = amstruckPurplanMaterialMapper.selectMaxId();
-        childId = selectMaxId == null? 1 :selectMaxId.longValue() + 1;
-        amstruckPurplanMaterial.setPurplanPlanMaterialId(new BigDecimal(childId));
-        //设置父表主键
-        amstruckPurplanMaterial.setPlanId(planId);
-        //设置子表未分配数量重量 = 总重量
-        amstruckPurplanMaterial.setMaterialUnallocatedWeight(amstruckPurplan.getMaterialTotalWeight());
-        //设置已分配重量 初始为 0
-        amstruckPurplanMaterial.setMaterialAllocatedWeight(new BigDecimal(0));
-        int i = amstruckPurplanMaterialMapper.insertSelective(amstruckPurplanMaterial);
-        int i1 = amstruckPurplanMapper.insertSelective(amstruckPurplan);
-        return i + i1;
-    }
-
-    /**
-     * 修改运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    @Transactional
-    public int updatePurPlan(AmstruckPurplan amstruckPurplan) {
-        int i = amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-        //通过计划ID查询子表主键ID
-        BigDecimal childId = amstruckPurplanMaterialMapper.getChildIdByPlanId(amstruckPurplan.getPlanId());
-        //修改子表数据未分配物资重量
-        AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
-        amstruckPurplanMaterial.setId(childId);
-        amstruckPurplanMaterial.setMaterialUnallocatedWeight(amstruckPurplan.getMaterialTotalWeight());
-        int i1 = amstruckPurplanMaterialMapper.updateByPrimaryKeySelective(amstruckPurplanMaterial);
-        return i + i1;
-    }
-
-    /**
-     * 逻辑删除运输计划 3
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    public int deletePurPlan(AmstruckPurplan amstruckPurplan) {
-
-        return amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-    }
-
-    /**
-     * 下发运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    public int sendPurPlan(AmstruckPurplan amstruckPurplan) {
-        //记录下发计划时间
-        amstruckPurplan.setInsertTime(new Date());
-        return amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-    }
-
-    /**
-     * 接收运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    public int receptionPurPlan(AmstruckPurplan amstruckPurplan) {
-        //记录接收计划时间
-        amstruckPurplan.setUpdateTime((new Date()));
-        return amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-    }
-
-}

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

@@ -100,5 +100,62 @@ public class DropDownServiceImpl implements DropDownService {
         return dropDownMapper.getPort();
     }
 
+    /**
+     * 获取所有的月台
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPlatformId() {
+        return dropDownMapper.getPlatformId();
+    }
+    /**
+     * 获取装货点下拉框
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getLoadedPlace() {
+        return dropDownMapper.getLoadedPlace();
+    }
+
+    /**
+     * 获取外轮船名
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getForeignName() {
+        return dropDownMapper.getForeignName();
+    }
+
+    /**
+     * 获取卸货点
+     * @param type
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getUnloadPoint(Integer type) {
+        return dropDownMapper.getUnloadPoint(type);
+    }
+
+
+    /**
+     * 查询订单下关联的物资
+     * @param orderId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getOrderMaterial(Integer orderId) {
+        return dropDownMapper.getOrderMaterial(orderId);
+    }
+
+    /**
+     * 查询仓库对应的月台
+     * @param warehouseId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPlatformIdByWarehouse(Integer warehouseId) {
+        return dropDownMapper.getPlatformIdByWarehouse(warehouseId);
+    }
+
 
 }

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

@@ -1,32 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-
-/**
- * OmstruckOrderMaterial服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-03 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrderMaterial服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "omstruckOrderMaterialService")
-public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialService {
-
-    @Autowired
-    private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
-
-  }

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

@@ -1,489 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper;
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
-import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
-import com.steerinfo.dil.model.*;
-import com.steerinfo.dil.service.IOmstruckOrderService;
-import com.steerinfo.dil.util.DataChange;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * OmstruckOrder服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-03 03:47
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrder服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "omstruckOrderService")
-public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
-
-    @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
-
-    @Autowired
-    private AmstruckPurplanMaterialMapper amstruckPurplanMaterialMapper;
-
-    @Autowired
-    private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
-
-    @Autowired
-    private TmstruckTotalResultMapper tmstruckTotalResultMapper;
-
-    @Autowired
-    private TmstruckEnfactoryResultServiceImpl tmstruckEnfactoryResultService;
-    @Autowired
-    private TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
-    @Autowired
-    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
-    @Autowired
-    private TmstruckUnloadResultServiceImpl tmstruckUnloadResultService;
-    /**
-     * 查询所有运输订单
-     * 获取已下发的运输订单 用于websocket
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map) {
-        return omstruckOrderMapper.getAllTruckOrder(map);
-    }
-
-    /**
-     * 生成运输订单实体类
-     */
-    public OmstruckOrder generateOmsTruckOrder(Map<String, Object> map){
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        //生成订单主键Id
-        long id;
-        BigDecimal maxId = omstruckOrderMapper.selectMaxId();
-        id = maxId == null ? 1 : maxId.longValue() + 1;
-        BigDecimal orderId = new BigDecimal(id);
-        omstruckOrder.setOrderId(orderId);
-        //生成运输订单号
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String orderNumber = "WYSDD" + sdf.format(new Date());
-        orderNumber +=
-                id < 10 ? "0000000" + id : id < 100 ? "000000" + id : id < 1000 ? "00000" + id : id < 10000 ?
-                        "0000" + id : id < 100000 ? "000" + id : id < 1000000 ? "00" + id : id < 10000000 ? "0" + id : id;
-        omstruckOrder.setOrderNumber(orderNumber);
-        //运单状态 刚分配默认为未下发
-        omstruckOrder.setOrderStatus(new BigDecimal(3));
-        //添加采购订单ID
-        omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
-        //添加运力Id
-        BigDecimal capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
-        omstruckOrder.setCapacityId(capacityId);
-        //添加订单类型 3
-        omstruckOrder.setOrderType(new BigDecimal(3));
-
-        omstruckOrder.setInsertUsername("admin");
-        omstruckOrder.setInsertTime(new Date());
-        return omstruckOrder;
-    }
-
-    /**
-     * 新增采购 运输订单
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int addPurOrder(Map<String, Object> map) {
-        //生成运输订单号和主键
-        OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
-        //设置线路  遗留问题
-        omstruckOrder.setLineId(new BigDecimal(1));
-        Object orderEntryTime = map.get("orderEntryTime");
-        if(orderEntryTime != null){
-            omstruckOrder.setOrderEntryTime(new Date((long) orderEntryTime)); //新增预计进厂时间
-        }
-        if(map.get("orderMaterialWeight") != null){
-            updateMaterial(map); //更改运输计划子表 增加已分配重量 减少未分配重量
-        }
-        //新增运输订单
-        omstruckOrderMapper.insertSelective(omstruckOrder);
-        //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
-        //新增运输订单子表
-        addOrderMaterial(map, omstruckOrder.getOrderId());
-        //新增实绩总表关联订单
-        addTotalResult(omstruckOrder.getOrderId());
-        return 5;
-    }
-
-
-    /**
-     * 新增实绩总表
-     * 运输订单ID
-     * @param orderId
-     * @return
-     */
-    public int addTotalResult(BigDecimal orderId){
-        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
-        BigDecimal selectMaxId = tmstruckTotalResultMapper.selectMaxId();
-        long totalId;
-        totalId = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        tmstruckTotalResult.setResultTotalId(new BigDecimal(totalId));
-        tmstruckTotalResult.setOrderId(orderId);
-        tmstruckTotalResult.setInsertTime(new Date());
-        tmstruckTotalResult.setInsertUsername("admin");
-        return tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
-    }
-
-    /**
-     * 新增订单子表
-     * @param map
-     * @param
-     */
-    public void addOrderMaterial(Map<String, Object> map, BigDecimal orderId){
-        //新增运输订单子表
-        OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-        //生成子表主键
-        long childId;
-        BigDecimal selectMaxId = omstruckOrderMaterialMapper.selectMaxId();
-        childId = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        omstruckOrderMaterial.setOrderMaterialId(new BigDecimal(childId));
-        omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        omstruckOrderMaterial.setOrderId(orderId);
-        Object orderMaterialWeight = map.get("orderMaterialWeight"); // 采购辅料没有物资重量
-        if(orderMaterialWeight != null){
-            omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(orderMaterialWeight));
-        }
-        omstruckOrderMaterial.setInsertUsername("admin");
-        omstruckOrderMaterial.setInsertTime(new Date());
-        omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
-    }
-
-    /**
-     * 用于更改计划子表方法
-     * @param map
-     */
-    public void updateMaterial(Map<String, Object> map){
-        Object omw = map.get("orderMaterialWeight");
-        double weight;
-        if(omw instanceof Double){
-            weight = (Double) omw;
-        }else if(omw instanceof Integer){
-            weight = (Integer) omw;
-        }else {
-            weight = Double.parseDouble(omw.toString());
-        }
-        Integer planId = DataChange.dataToBigDecimal(map.get("planId")).intValue();
-        List<Map<String, Object>> weightList = amstruckPurplanMaterialMapper.getWeight(planId);
-        Map<String, Object> weightMap = weightList.get(0);
-        double materialAllocatedWeight = DataChange.dataToBigDecimal(weightMap.get("materialAllocatedWeight")).floatValue();
-        double materialUnallocatedWeight = DataChange.dataToBigDecimal(weightMap.get("materialUnallocatedWeight")).floatValue();
-        //float allWeight = materialAllocatedWeight + materialUnallocatedWeight;
-        //前端判断数据分配重量是否大于未分配重量 此处不做判断
-
-        //通过前端是否传来旧的重量 判断 是否是在原有已分解过的计划上修改 未分配 已分配重量
-        if(map.get("weight") != null){
-            BigDecimal oldWeight = DataChange.dataToBigDecimal(map.get("weight"));
-            double difference = weight - oldWeight.doubleValue();
-            materialAllocatedWeight += difference;
-            materialUnallocatedWeight -= difference;
-        }else {
-            materialAllocatedWeight += weight;
-            materialUnallocatedWeight -= weight;
-        }
-        AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
-        //通过计划Id查询子表主键
-        amstruckPurplanMaterial.setPurplanPlanMaterialId(amstruckPurplanMaterialMapper.getChildIdByPlanId(new BigDecimal(planId)));
-        amstruckPurplanMaterial.setMaterialAllocatedWeight(new BigDecimal(materialAllocatedWeight));
-        amstruckPurplanMaterial.setMaterialUnallocatedWeight(new BigDecimal(materialUnallocatedWeight));
-        amstruckPurplanMaterialMapper.updateByPrimaryKeySelective(amstruckPurplanMaterial);
-    }
-
-    /**
-     * 查询所有运力信息
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllCapacity(Map<String, Object> map) {
-        return omstruckOrderMapper.getAllCapacity(map);
-    }
-
-    /**
-     * 修改运输订单 和订单子表
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int updateOrder(Map<String, Object> map) {
-        //修改运输订单运力ID
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        if(map.get("capacityId") != null){
-            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
-        }
-        if(map.get("orderEntryTime") != null){
-            omstruckOrder.setOrderEntryTime(new Date((long) map.get("orderEntryTime")));
-        }
-        omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-
-        //修改运输订单子表物资重量
-        OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-        //添加子表主键 通过订单ID查询出子表主键
-        BigDecimal orderMaterialId = omstruckOrderMaterialMapper.getOrderMaterialIdByOrderId(orderId);
-        omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
-        if(map.get("orderMaterialWeight") != null){
-            omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
-            //修改运输计划子表 已分配未分配重量
-            updateMaterial(map);
-        }
-        if(map.get("materialId") != null){
-            omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        }
-        omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
-
-        return 1;
-    }
-
-    /**
-     * 运单派发
-     *  运单ID
-     * 生成进厂实绩、计量实绩、卸货实绩、出厂实绩
-     * @param orderId
-     * @return
-     */
-    @Override
-    @Transactional
-    public int dispatchOrder(Integer orderId) {
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(new BigDecimal(orderId));
-        //设置状态为已下发：4
-        //生成订单下发时间 修改订单表
-        omstruckOrder.setOrderIssueTime(new Date());
-        omstruckOrder.setOrderStatus(new BigDecimal(4));
-        omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        //通过运输订单ID查询运输订单号 （使用的都是运输订单号）
-        String orderNumber = omstruckOrderMapper.getOrderNumberByOrderId(orderId);
-        //通过运输订单号 查询各个作业点ID 及 总实绩ID
-        Map<String, Object> map = omstruckOrderMapper.getPointIdByOrderNum(orderNumber);
-        tmstruckEnfactoryResultService.addEnFactoryResult(map);
-        tmstruckWeightResultService.addWeightResult(map);
-        tmstruckLeaveFactoryResultService.addLeaveFactory(map);
-        tmstruckUnloadResultService.addUnloadResult(map);
-        return 5;
-    }
-
-    /**
-     * 逻辑删除未下发订单
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int deleteOrder(Map<String, Object> map) {
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        //设置状态为逻辑删除：7
-        omstruckOrder.setOrderStatus(new BigDecimal(7));
-        int i = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        //若是传来物资重量则修改已分配未分配重量
-        if(map.get("orderMaterialWeight") != null){
-            updateMaterial(map);
-        }
-        //通过车牌号修改运输状态为空闲中 0
-        String capacityNumber = (String) map.get("capacityNumber");
-        HashMap<String, Object> changeStatusMap = new HashMap<>();
-        changeStatusMap.put("capacityNumber", capacityNumber);
-        changeStatusMap.put("capacityStatus", 0);
-        int i1 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeStatusMap);
-        return i + i1;
-    }
-
-    /**
-     * 司机接单、拒绝 0：拒绝   1：接收
-     * 需要接收参数 主键Id 与 接收拒绝操作码
-     * @param map
-     * @return
-     */
-    @Override
-    public int driverReceiveOrRefuse(Map<String, Object> map) {
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        if((Integer) map.get("orderReceiveStatus") == 1){
-            omstruckOrder.setOrderReceiveStatus(new BigDecimal(1));
-            omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
-        }else { //其他状态都视为 拒绝接单
-            omstruckOrder.setOrderReceiveStatus(new BigDecimal(0));
-            omstruckOrder.setOrderStatus(new BigDecimal(6));// 6：未接收
-            //将司机运力置为空闲 通过运输订单Id 查询运力ID
-            BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
-            map.put("capacityId", capacityId);
-            map.put("capacityStatus", 0);
-            //修改运力表
-            omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
-        }
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        //生成接收/拒绝时间
-        Date receiveTime = new Date();
-        omstruckOrder.setOrderReceiveRefuseTime(receiveTime);
-        //计算司机从派单到操作时长
-        Date issueTime = omstruckOrderMapper.getInsertTimeById(orderId.intValue());
-        long time = receiveTime.getTime() - issueTime.getTime();
-        long min = time / (1000 * 60);
-        omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
-
-        return  omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-    }
-
-    /**
-     * 用于后台展示司机接单未接单数据
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getReceiveRefuseOrder(Map<String, Object> map) {
-        return omstruckOrderMapper.getTruckOrderByCapacityNum(map);
-    }
-
-    /**
-     * 司机接单推送数据
-     * 车牌号
-     * @param
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> sendMesToDriver(Map<String, Object> map) {
-
-        //通过车牌号匹配运力ID
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByCapacityNum((String) map.get("capacityNumber"));
-        map.put("capacityId", capacityId);
-        if(capacityId == null)
-        return null;
-        //通过运力Id匹配 已下发的运输订单
-        List<Map<String, Object>> truckOrderByCapacityNum = omstruckOrderMapper.getTruckOrderByCapacityNum(map);
-        return truckOrderByCapacityNum;
-    }
-
-    /**
-     * 通过运输订单号查询运单所有信息 包含作业路径名称
-     *
-     * @param map 传运输订单号
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getOrderMesByOrderNum(Map<String, Object> map) {
-        return omstruckOrderMapper.getTruckOrderByCapacityNum(map);
-    }
-
-    /**
-     * 查询所有司机已拒绝的订单
-     * 车牌号
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map) {
-        //通过车牌号查询运力Id
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByCapacityNum((String) map.get("capacityNumber"));
-        map.put("capacityId", capacityId);
-
-        return  omstruckOrderMapper.getReceiveRefuseOrderByCapacityId(map);
-    }
-
-    /**
-     * 得到作业时间和地点
-     * @param orderId
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId) {
-        List<Map<String, Object>> mapList = omstruckOrderMapper.selectPlaceAndTime(orderId);
-        Map<String, Object> map = mapList.get(0);
-        String entryGatepost = (String) map.get("entryGatepost");
-        Date entryTime = (Date) map.get("entryTime");
-        String entryResult = entryGatepost + "/" + entryTime;
-        String grossCalculate = (String) map.get("grossCalculate");
-        Date grossTime = (Date) map.get("grossTime");
-        String grossResult = grossCalculate + "/" + grossTime;
-        String unloadWarhouse = (String) map.get("unloadWarhouse");
-        Date unloadTime = (Date) map.get("unloadTime");
-        String unloadResult = unloadWarhouse + "/" + unloadTime;
-        String tareCalculate = (String) map.get("tareCalculate");
-        Date tareTime = (Date) map.get("tareTime");
-        String tareResult = tareCalculate + "/" + tareTime;
-        String leaveGatepost = (String) map.get("leaveGatepost");
-        Date outTime = (Date) map.get("outTime");
-        String leaveResult = leaveGatepost + "/" + outTime;
-        List<Map<String, Object>> resultList = new ArrayList<>();
-        Map<String, Object> map1 = new HashMap<>();
-        map1.put("title","进厂门岗/时间");
-        map1.put("desc",entryResult);
-        resultList.add(map1);
-        Map<String, Object> map2 = new HashMap<>();
-        map2.put("title","毛重衡器/时间");
-        map2.put("desc",grossResult);
-        resultList.add(map2);
-        Map<String, Object> map3 = new HashMap<>();
-        map3.put("title","卸货地点/时间");
-        map3.put("desc",unloadResult);
-        resultList.add(map3);
-        Map<String, Object> map4 = new HashMap<>();
-        map4.put("title","皮重衡器/时间");
-        map4.put("desc",tareResult);
-        resultList.add(map4);
-        Map<String, Object> map5 = new HashMap<>();
-        map5.put("title","出厂门岗/时间");
-        map5.put("desc",leaveResult);
-        resultList.add(map5);
-        Map<String, Object> map6 = new HashMap<>();
-        BigDecimal orderLineSequence = (BigDecimal) map.get("orderLineSequence");
-        map6.put("orderLineSequence",orderLineSequence);
-        resultList.add(map6);
-        return resultList;
-    }
-
-    /**
-     * 通过运单号查询订单详情
-     * 运输订单号
-     * @param
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId) {
-
-        return omstruckOrderMapper.getOrderByOrderId(orderId);
-    }
-
-    /**
-     * 查看运输派单
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getTransportDispatch(Map<String, Object> map) {
-        return omstruckOrderMapper.getTransportDispatch(map);
-    }
-
-    /**
-     * 用于更新路段顺序号
-     * @param map  orderId
-     * @return
-     */
-    public int updateOrderLineSequence(Map<String, Object> map, Integer lineSequence){
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        omstruckOrder.setOrderLineSequence(new BigDecimal(lineSequence));
-        return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-    }
-}

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

@@ -0,0 +1,257 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.RulesMapper;
+import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
+import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
+import com.steerinfo.dil.service.IRulesService;
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/11/16 14:30
+ */
+
+@Service(value = "rulesService")
+public class RulesServiceImpl implements IRulesService {
+    @Autowired
+    private UtilsMapper utilsMapper;
+
+    @Autowired
+    private RulesMapper rulesMapper;
+
+    @Autowired
+    private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
+
+    /**
+     * 通过运输订单号查询物资并根据门岗规则计算出厂门岗
+     * @param map
+     * @return
+     */
+    public int calculateGatepost(Map<String, Object> map){
+        if(map != null){ //物资问题原因 计算不了门岗
+            return 1;
+        }
+        BigDecimal materialId = utilsMapper.queryOrderMesByOrderId((String) map.get("orderNumber"));
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("materialId", materialId);
+        //类型为出厂
+        map1.put("type", 1);
+        List<Map<String, Object>> list = rulesMapper.queryGatepostByMaterialId(map1);
+        for (Map<String, Object> mes : list) {
+            //从数据库中获取门岗开始时间结束时间 若当前时间满足该门岗进门时间 则下放 暂不考虑门岗优先级
+            boolean judgeTime = judgeTime((String)mes.get("startTime"), (String)mes.get("endTime"));
+            if(judgeTime){
+                //更新出厂实绩门岗ID
+                //通过运输订单号获取出厂实绩ID
+                Map<String, Object> map2 = tmstruckLeaveFactoryResultMapper.selectResultId((String) map.get("orderNumber"));
+                TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
+                tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(map2.get("resultId")));
+                tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(mes.get("gatepostId")));
+                return tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
+            }
+        }
+        return 1;
+    }
+
+    /**
+     * 判断当前时间是否在时间区间范围内
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    public boolean judgeTime(String startTime, String endTime){
+        SimpleDateFormat sdf = new SimpleDateFormat("HHmmss");
+        String format = sdf.format(new Date());
+        int begin = Integer.parseInt(startTime);
+        int end = Integer.parseInt(endTime);
+        int now = Integer.parseInt(format);
+        if(begin < end){
+            return now < end && now >= begin;
+        }else {
+            return now < end || now >= begin;
+        }
+    }
+
+
+    /**
+     * 通过物资ID 和 计量类型 查找汽车衡
+        materialId 物资Id
+        nature 1: 进厂秤  2：出厂秤  3：中转
+     * @return 汽车衡
+     */
+    public int calculateWeighbridge(Map<String, Object> map){
+        //物资类型：无法计算汽车衡 返回所有1
+        if(map != null){
+            return 1;
+        }
+        List<Integer> calculateList = queryTruckCalculate(map);
+        //暂时不考虑优先级 随机进行取值
+        int size = calculateList.size();
+        if(size == 0){
+            return 13; //没有查询到汽车衡  则使用备用秤
+        }if(size == 1){
+            return calculateList.get(0);
+        }
+        return calculateList.get(new Random().nextInt(size));
+    }
+
+    /**
+     * 通过物资Id、计量类型（进厂、出厂、中转） 可能会有多个
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Integer> queryTruckCalculate(Map<String, Object> map) {
+        return rulesMapper.queryTruckCalculate(map);
+    }
+
+    /**
+     * 查询未装车实绩
+     * @param orderId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> judgeLastMaterial(BigDecimal orderId) {
+        return rulesMapper.judgeLastMaterial(orderId);
+    }
+
+
+    /*=========================仓库排队规则=========================*/
+
+    /**
+     *通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
+     * @param materialId 物资ID
+     * @return
+     */
+    @Override
+    public List<Integer> getWarehouseIdByMaterialId(Integer materialId) {
+        return rulesMapper.getWarehouseIdByMaterialId(materialId);
+    }
+
+    /**
+     * 通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
+     * @param map MaterialId 物资ID warehouseId 仓库ID
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getStackGradation(Map<String, Object> map) {
+        return rulesMapper.getStackGradation(map);
+    }
+
+    /**
+     * 通过月台Id 查询月台当前排队车辆数
+     * @param platformId 月台ID
+     * @return
+     */
+    @Override
+    public BigDecimal queueCountByPlatformId(BigDecimal platformId) {
+        return rulesMapper.queueCountByPlatformId(platformId);
+    }
+
+
+    /**
+     * 获取月台Id 通过物资ID 根据排队规则 获取车辆该去哪个月台
+     * 规则：不同物资在不同仓库 -->  遍历仓库通过物资Id和仓库Id查找对应的仓储网格表
+     *       --> 找出多条数据 也就是说多个月台可以装  --> 遍历月台查看每个月台的排队车辆数 寻找最小的排队车辆数的月台
+     *       --> 返回物资ID 和 月台ID
+     * @param materialId 物资ID
+     * @return 月台ID
+     */
+    public Map<String, Object> getPlatId(Integer materialId){
+        Map<String, Object> map = new HashMap<>();
+        Integer platId = null;
+        //一种物资可能在多个仓库中
+        List<Integer> warehouseList = getWarehouseIdByMaterialId(materialId);
+        int countNum = 1000; //初始化比较值
+        for (Integer warehouseId : warehouseList) {
+            HashMap<String, Object> hashMap = new HashMap<>();
+            hashMap.put("materialId", materialId);
+            hashMap.put("warehouseId", warehouseId);
+            //通过物资Id和仓库ID对仓储网格表 再次进行查询并筛选出层次号最高的几条数据
+            List<Map<String, Object>> mesList = getStackGradation(hashMap);
+            //遍历筛选出来的月台 查看当前月台排队车辆数
+            for (Map<String, Object> mesMap : mesList) {
+                BigDecimal platformId = DataChange.dataToBigDecimal(mesMap.get("platformId"));
+                //通过月台ID 和 网格类型 查找当前网格Id
+                hashMap.put("queueLocationId", platformId);
+                hashMap.put("gridType", 1);
+                BigDecimal gridId = rulesMapper.getGridIdByGatepostIdAndGridType(hashMap);
+                //取得排队车辆数
+                int count = queueCountByPlatformId(gridId).intValue();
+                map.put("count", count);
+                //如果当前月台排队车数为0 则直接选择这个月台
+                if(count == 0){
+                    platId = platformId.intValue();
+                    map.put("loadingId", platId);
+                    return map;
+                }
+                //如果排队车辆数小于上个月台排队车辆数
+                if(count < countNum){
+                    countNum = count; //取代比较数
+                    platId = platformId.intValue(); //替换月台ID
+                    map.put("loadingId", platId);
+                }
+            }
+        }
+        return map;
+    }
+
+
+    /**
+     * 计算物资优先级顺序 并计算装车点  传入多个物资ID
+     * @param mapList
+     */
+    public Map<String, Object> calculateMaterialPriority (List<Map<String, Object>> mapList){
+        int compareNum = 100; //优先级比较基准数初始值
+        int compareNum2 = 0; //车辆排队序号
+        Map<String, Object> map = new HashMap<>();
+        for (Map<String, Object> mesMap : mapList) {
+            int materialOrder = DataChange.dataToBigDecimal(mesMap.get("materialOrder")).intValue();
+            if(materialOrder < compareNum){
+                //通过当前物资Id查找装车点
+                Map<String, Object> loadingIdMap = getPlatId(DataChange.dataToBigDecimal(map.get("materialId")).intValue());
+                mesMap.put("loadingId", loadingIdMap.get("loadingId"));
+                compareNum = materialOrder; //替换比较数
+                compareNum2 = (int) loadingIdMap.get("count"); //添加车辆排队比较数
+                map = mesMap;
+            }
+            if(materialOrder == compareNum){//如果优先级相同 计算当前月台排队车辆数
+                //通过当前物资Id查找装车点
+                Map<String, Object> loadingIdMap = getPlatId(DataChange.dataToBigDecimal(map.get("materialId")).intValue());
+                int count = (int) loadingIdMap.get("count");
+                mesMap.put("loadingId", loadingIdMap.get("loadingId"));
+                //如果当前排队车辆数小于上一排队车辆数
+                if(count < compareNum2){
+                    map = mesMap;//更换要返回的map
+                    compareNum2 = count;//替换排队比较数
+                }
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 计算装车顺序
+     * @return
+     */
+    public Map<String, Object> calculateMaterial(List<Map<String, Object>> mapList){
+        int compareNum = 100; //比较基准数
+        //传入多个未装车的装车物资ID以及装车顺序
+        Map<String, Object> map = null;
+        for (Map<String, Object> mesMap : mapList) {
+            //获取装车顺序 顺序小的先装
+            BigDecimal loadingSequence = DataChange.dataToBigDecimal(mesMap.get("loadingSequence"));
+            if(loadingSequence.intValue() < compareNum){
+                map = mesMap;
+            }
+        }
+        return map;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.service.IStatisticalReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/12/14 15:26
+ */
+@Service
+public class StatisticalReportImpl implements IStatisticalReportService {
+
+}

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

@@ -1,9 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
-import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
+import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -12,13 +11,11 @@ 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.*;
 
 /**
  * TmstruckEnfactoryResult服务实现：
- * @author generator
+ * @author TXF
  * @version 1.0-SNAPSHORT 2021-09-08 06:23
  * 类描述
  * 修订历史：
@@ -36,105 +33,278 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
     @Autowired
-    private OmstruckOrderServiceImpl omstruckOrderService;
+    private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
 
     @Autowired
-    private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
+
+    @Autowired
+    private UtilsServiceImpl utilsService;
+
+    @Autowired
+    private RulesServiceImpl rulesService;
+
+    @Autowired
+    OmsFeign omsFeign;
+
+    @Autowired
+    UtilsMapper utilsMapper;
 
-    /**
-     * 获取所有的进厂实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map) {
-        return tmstruckEnfactoryResultMapper.getAllEnFactoryResult(map);
-    }
 
     /**
      * 派单时新增进厂实绩
-     * 总实绩Id、线路起点
+     * map: 总实绩Id、线路起点
      * @param map
      * @return
      */
     @Override
     public int addEnFactoryResult(Map<String, Object> map) {
         TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
         //生成进厂作业主键Id
-        long id;
-        BigDecimal maxId = tmstruckEnfactoryResultMapper.selectMaxId();
-        id = maxId == null ? 1 : maxId.longValue() + 1;
         //添加主键
-        tmstruckEnfactoryResult.setResultId(new BigDecimal(id));
-        //添加门岗ID 路线起点就是进厂门岗
-        tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("lineStartNodeId")));
+        tmstruckEnfactoryResult.setResultId(tmstruckEnfactoryResultMapper.selectMaxId());
+        //通过总实绩ID查询订单类型
+        Integer orderType = utilsMapper.getOrderTypeByTotalId(resultTotalId);
+        if(!"123".contains(orderType.toString())){
+            //通过物资计算门岗 (暂时定死)
+            tmstruckEnfactoryResult.setGatepostId(new BigDecimal(1));
+        }
         //添加实绩总表Id
-        tmstruckEnfactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        tmstruckEnfactoryResult.setResultTotalId(resultTotalId);
+        // 添加路段顺序号
+        tmstruckEnfactoryResult.setSegmenSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
         return tmstruckEnfactoryResultMapper.insertSelective(tmstruckEnfactoryResult);
     }
 
     /**
-     * 使用PDA方式进厂
-     * 运输订单号
-     * (操作人员主键ID)
+     * 通过运输订单号查找排队顺序号
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public Integer selectNodeNumber(String orderNumber) {
+        return tmstruckEnfactoryResultMapper.selectNodeNumber(orderNumber);
+    }
+
+    /**
+     * 获取进厂实绩
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
     @Override
+    public List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+            case 2:
+            case 3:
+                return tmstruckEnfactoryResultMapper.getXSEnFactoryResult(map); //apiId:210
+            case 4:
+                return tmstruckEnfactoryResultMapper.getSteelNZEnFactoryResult(map); //apiId:261
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                return tmstruckEnfactoryResultMapper.getCGJKEnFactoryResult(map); //apiID: 99
+            case 9:
+                return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
+            case 10:
+                break;
+            case 11:
+                return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
+
+        }
+        return null;
+    }
+
+    /**
+     * 通过运输订单id查询物资信息
+     * @param orderId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getMaterial(Integer orderId) {
+        return tmstruckEnfactoryResultMapper.getMaterial(orderId);
+    }
+
+
+    /**
+     * 通过PDA进厂
+     * orderNumber 运输订单号 gatepostName 门岗名称
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     * @param map
+     * @return
+     */
     @Transactional
-    public int updateEnFactoryByPDA(Map<String, Object> map) {
+    public int enFactoryResultByPDA(Map<String, Object> map){
+        int i = 0;
+        //通过运输订单号查询订单类型
+        String orderNumber = (String) map.get("orderNumber");
+        String substring = orderNumber.substring(0, orderNumber.length() - 1);
+        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring));
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        i += updateEnFactoryResultByPDA(map); //添加进厂实绩
+        //修改路段顺序号
+        i += utilsService.updateOrderLineSequence(map);
+        switch (orderType.intValue()){
+            case 1:
+            case 4:
+                //查询未装车实绩
+                List<Map<String, Object>> mapList = rulesService.judgeLastMaterial(DataChange.dataToBigDecimal(map.get("orderId")));
+                if(mapList.size() == 1){
+                    //如果是单拼 不需要走计算 直接走钢材的汽车衡
+                    Map<String, Object> mesMap = new HashMap<>();
+                    mesMap.put("materialId",mapList.get(0).get("materialId"));
+                    mesMap.put("nature", 1);
+                    //计算计皮汽车衡
+                    int tarePlaceId = rulesService.calculateWeighbridge(mesMap);
+                    mesMap.put("tarePlaceId", tarePlaceId);
+                    //更新汽车衡
+                    i += tmstruckWeightResultService.updateWeightResult(mesMap);
+                }else {
+                    //如果是多拼
+                    Map<String, Object> mesMap = rulesService.calculateMaterial(mapList);
+                    //获取物资ID
+                    HashMap<String, Object> calculateMap = new HashMap<>();
+                    calculateMap.put("orderId", map.get("orderId"));
+                    calculateMap.put("materialId", mesMap.get("materialId"));
+                    calculateMap.put("nature", 1); // 1：进厂秤
+                    //计算计皮汽车衡
+                    int tarePlaceId = rulesService.calculateWeighbridge(calculateMap);
+                    calculateMap.put("tarePlaceId", tarePlaceId);
+                    //更新汽车衡
+                    i += tmstruckWeightResultService.updateWeightResult(calculateMap);
+                }
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+                break;
+            case 2:
+            case 3:
+                //计算计皮汽车衡并更新计量实绩
+                i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 1);
+                //焦炭 水渣 等只会有一种物资
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
+                map.put("grossPlaceId", 3);
+                i += tmstruckWeightResultService.updateWeightResult(map);
+                //通过物资ID查询物资Id
+                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialIdList.get(0));
+                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                break;
+            case 10: // 采购内转（老区-厂内） 没有进厂
+                break;
+            case 11:
+        }
+        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
+        return i;
+    }
+
+
+    /**
+     * 通过门禁进厂
+     * 运输订单号 orderNumber，车牌号capacityNumber，
+     * 门岗名称 gatepostName，进厂时间 resultEntryGateTime，（进厂方式）
+     * @param map
+     * @return
+     */
+    public int enFactoryResultByMJ(Map<String, Object> map){
+        int i = 0;
+        //通过运输订单号查询订单类型
+        String orderNumber = (String) map.get("orderNumber");
+        String subString = orderNumber.substring(0,orderNumber.length() - 1);
+        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(subString));
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+            case 4:
+                i += updateEnFactoryResultByMJ(map); //添加进厂实绩
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+                break;
+            case 2:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                i += updateEnFactoryResultByMJ(map); //添加进厂实绩
+                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                break;
+            case 10: // 采购内转（老区-厂内）
+                break;
+            case 11:
+        }
+        omsFeign.pushMesToWebsocket(map);
+        return i;
+    }
+
+    /**
+     * APP查询进厂实绩
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getEnfactoryResultList() {
+        return tmstruckEnfactoryResultMapper.getEnfactoryResultList();
+    }
+
+    /**
+     * APP通过运输订单id查询进厂实绩
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber) {
+        return tmstruckEnfactoryResultMapper.getEnfactoryMessageByOrderId(orderNumber);
+    }
+
+    /**
+     * 通过PDA添加进厂实绩方法
+     * @param map
+     * @return
+     */
+    public int updateEnFactoryResultByPDA(Map<String, Object> map){
         TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
-        String orderNumber = map.get("orderNumber").toString();
         //获取进厂实绩id
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
         tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        //添加门岗
+        tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("gatepostId")));
         //添加进厂时间
         tmstruckEnfactoryResult.setResultEntryGateTime(new Date());
         tmstruckEnfactoryResult.setInsertTime(new Date());
         tmstruckEnfactoryResult.setResultEntryMode("手动抬杠");
         tmstruckEnfactoryResult.setInsertUsername("admin");
-        int i = tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
-        //更新订单路段顺序号
-        int i1 = omstruckOrderService.updateOrderLineSequence(map, 1);
-        //新增一条计毛委托
-        //进厂完成后新增一条计毛委托 类型 1
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        int i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 1);
-        return i + i1 +i2;
+        return tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
     }
 
     /**
-     * 使用门禁系统进厂
+     * 通过门禁系统添加进厂实绩方法
      * @param map
      * @return
      */
-    @Override
-    public int updateEnFactoryByMenJin(Map<String, Object> map) {
+    public int updateEnFactoryResultByMJ(Map<String, Object> map){
         TmstruckEnfactoryResult tmstruckEnfactoryResult=new TmstruckEnfactoryResult();
-        String orderNumber = map.get("orderNumber").toString();
-        //获取进厂实绩id
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
-        tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         //进门方式
         tmstruckEnfactoryResult.setResultEntryMode("自动抬杆");
+        //添加进厂时间
+        tmstruckEnfactoryResult.setResultEntryGateTime(new Date((long) map.get("resultEntryGateTime")));
+        //添加门岗
+        String gatepostName = (String) map.get("gatepostName");
+        Integer gatepostNameId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
+        tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostNameId));
+
         tmstruckEnfactoryResult.setInsertTime(new Date());
         tmstruckEnfactoryResult.setInsertUsername("admin");
-        int i = tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
-        //更新路段顺序号
-        int i1 = omstruckOrderService.updateOrderLineSequence(map, 1);
-        //进厂完成后新增一条计毛委托 类型 1
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        int i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 1);
-        return i + i1 +i2;
+        return tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
     }
 
-    /**
-     * 通过运输订单号查找排队顺序号
-     * @param orderNumber
-     * @return
-     */
-    @Override
-    public Integer selectNodeNumber(String orderNumber) {
-        return tmstruckEnfactoryResultMapper.selectNodeNumber(orderNumber);
-    }
 }

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

@@ -2,18 +2,19 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.BmsShipFeign;
 import com.steerinfo.dil.feign.BmsTruckFeign;
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
+import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -42,178 +43,180 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
     @Autowired
-    private OmstruckOrderServiceImpl omstruckOrderService;
-
-    @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
+    private IUtilsService utilsService;
 
     @Autowired
     private BmsShipFeign bmsShipFeign;
 
     @Autowired
     private BmsTruckFeign bmsTruckFeign;
+
+    @Autowired
+    OmsFeign omsFeign;
+
     /**
-     * 新增出厂实绩  需要采集的数据
-     *  运输订单号
-     *  车牌号
-     *  门岗名称
-     *  出厂时间
-     *  出厂方式
-     *  车厢抓拍图片
-     * @param map
+     * 查看运输线路是否为出厂
+     * @param orderNumber
      * @return
      */
     @Override
-    public int addLeaveFactoryResult(Map<String, Object> map) {
-        TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
-        //查询最大主键ID
-        long id;
-        BigDecimal selectMaxId = tmstruckLeaveFactoryResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        tmstruckLeaveFactoryResult.setId(new BigDecimal(id));
-        //获取运输订单号
-        String orderNumber = (String) map.get("orderNumber");
-        //获取车牌号
-        String capacityNumber = (String) map.get("capacityNumber");
-        HashMap<String, Object> map1 = new HashMap<>();
-        map1.put("orderNumber", orderNumber);
-        map1.put("capacityNumber", capacityNumber);
-        //通过运输订单号、车牌号查询 总实绩ID
-        Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map1);
-        tmstruckLeaveFactoryResult.setResultTotalId(new BigDecimal(totalId));
-        //获取门岗名称
-        String gatepostName = (String) map.get("gatepostName");
-        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
-        tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
-        //获取出厂时间
-        long resultOutGateTime = (long)map.get("resultOutGateTime");
-        tmstruckLeaveFactoryResult.setResultOutGateTime(new Date(resultOutGateTime));
-        //获取出厂方式
-        String resultOutMode = (String) map.get("resultOutMode");
-        tmstruckLeaveFactoryResult.setResultOutMode(resultOutMode);
-
-        tmstruckLeaveFactoryResult.setInsertTime(new Date());
-        tmstruckLeaveFactoryResult.setInsertUsername("admin");
-        return tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
+    public Integer selectTransportRoute(String orderNumber) {
+        return tmstruckLeaveFactoryResultMapper.selectTransportRoute(orderNumber);
     }
 
+
     /**
-     * 查询所有的出厂实绩
+     * 派单后新增出厂实绩
+     * 总实绩ID、线路终点
      * @param map
      * @return
      */
     @Override
-    public List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map) {
-        return tmstruckLeaveFactoryResultMapper.getLeaveFactoryResult(map);
+    public int addLeaveFactory(Map<String, Object> map) {
+        TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
+        //添加主键
+        tmstruckLeaveFactoryResult.setId(tmstruckLeaveFactoryResultMapper.selectMaxId());
+        //添加总实绩ID
+        tmstruckLeaveFactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        //添加路段顺序号
+        tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
+        //添加门岗ID 出厂门岗为线路的终点
+//        tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("lineEndNodeId")));
+        return tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
+    }
+
+    @Override
+    public Map<String, Object> getTruckFactoryResult(String nu) {
+        return tmstruckLeaveFactoryResultMapper.getTruckFactoryResult(nu);
     }
 
     /**
-     * 查看运输线路是否为出厂
+     * APP查询出厂信息
      * @param orderNumber
      * @return
      */
     @Override
-    public Integer selectTransportRoute(String orderNumber) {
-        return tmstruckLeaveFactoryResultMapper.selectTransportRoute(orderNumber);
+    public List<Map<String, Object>> getLeaveFactoryList(String orderNumber) {
+        return tmstruckLeaveFactoryResultMapper.getLeaveFactoryList(orderNumber);
     }
 
+
     /**
-     * 通过运输订单号获取 车牌号 和 门岗
-     * @param orderNumber
+     * 查询所有的出厂实绩
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     * @param map
      * @return
      */
     @Override
-    public Map<String, Object> selectLeaveFactory(String orderNumber) {
-        return tmstruckLeaveFactoryResultMapper.selectCnAndGnByOrderNumber(orderNumber);
+    public List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+            case 2:
+            case 3:
+                return tmstruckLeaveFactoryResultMapper.selectAllLeaveFacatoryForSale(map);
+            case 4:
+                return tmstruckLeaveFactoryResultMapper.selectSteelNzLeaveFactory(map);
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                return tmstruckLeaveFactoryResultMapper.getCGLeaveFactoryResult(map); //apiId:110
+            case 9:
+                return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
+            case 10:
+                break;
+            case 11:
+                return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
+        }
+        return null;
     }
 
+
     /**
-     * 派单后新增出厂实绩
-     * 总实绩ID、线路终点
+     * 通过 PDA 出厂
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
-    @Override
-    public int addLeaveFactory(Map<String, Object> map) {
-        TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
-        //查询最大主键ID
-        long id;
-        BigDecimal selectMaxId = tmstruckLeaveFactoryResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        //添加主键
-        tmstruckLeaveFactoryResult.setId(new BigDecimal(id));
-        //添加总实绩ID
-        tmstruckLeaveFactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        //添加门岗ID 出厂门岗为线路的终点
-        tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("lineEndNodeId")));
-        return tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
+    public int leaveFactoryByPDA(Map<String, Object> map){
+        int i = 0;
+        String orderNumber = (String) map.get("orderNumber");
+        String substring = orderNumber.substring(0, orderNumber.length() - 1);
+        map.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(substring));
+        map.put("orderNumber", substring);
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        i += updateLeaveResultByPDA(map); //更新出厂实绩
+        //更新路段顺序号
+        i += utilsService.updateOrderLineSequence(map);
+        switch (orderType.intValue()){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
+                i += utilsService.closeOrderNormally(map);
+//                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
+                //采购出厂 通过feign调用新增详单
+//                try {
+//                    bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id
+//                    bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));  // 运单ID
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+                break;
+            case 10:
+                break;
+            case 11:
+        }
+        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
+        return i;
     }
 
     /**
-     * 通过PDA进行更新实绩
-     * 运输订单号
-     * @param mapValue
+     * 更新出厂实绩
+     * @param mapValue {运输订单号:orderNumber 门岗名称:gatepostName}
      * @return
      */
-    @Override
-    @Transactional
-    public int updateLeaveFactoryByPDA(Map<String, Object> mapValue){
-        //获取订单号
-        String orderNumber = mapValue.get("orderNumber").toString();
-        //根据订单号获取实绩id
-        mapValue.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber));
+    public int updateLeaveResultByPDA(Map<String, Object> mapValue){
         TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
         tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(mapValue.get("resultId")));
-        //设置常规字段
+        //通过门岗名称获取门岗ID
+        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName((String) mapValue.get("gatepostName"));
+        if(gatepostId != null){
+            tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
+        }
+        //设置常规字段 添加 出厂时间 和 出厂方式
         tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
         tmstruckLeaveFactoryResult.setResultOutMode("手动抬杠");
         tmstruckLeaveFactoryResult.setInsertUsername("admin");
         tmstruckLeaveFactoryResult.setInsertTime(new Date());
-        int i = tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
-        //更改路段顺序号为 5 ：出厂
-        int i1 = omstruckOrderService.updateOrderLineSequence(mapValue, 5);
-        //将运力置为空闲状态
-        mapValue.put("capacityStatus", 0);
-        int i3 = omstruckOrderMapper.updateCapacityByCarIdOrNum(mapValue);
-        //将订单状态改为已结束 2
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        omstruckOrder.setOrderStatus(new BigDecimal(2));
-        int i2 = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        //通过feign调用新增详单
-
-        try {
-            bmsShipFeign.addDetailsOrder(tmstruckLeaveFactoryResult.getResultId()); // 出厂实绩Id
-            bmsTruckFeign.addDetailsOrder(orderId);  // 运单ID
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return i + i1 + i2 + i3;
+        return tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
     }
 
     /**
-     * 通过门岗系统进行更新实绩
-     * @param mapValue
+     * 通过总实绩Id修改出厂实绩出厂门岗
+     * @param resultTotalId
+     * @param gatepostId
      * @return
      */
-    @Override
-    public int updateLeaveFactoryByMenGang(Map<String, Object> mapValue) {
-        //获取订单号
-        String orderNumber=mapValue.get("orderNumber").toString();
-        //根据订单号获取实绩id
-        mapValue.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber));
+    public int updateLeaveFactoryGatepostId(Integer resultTotalId, Integer gatepostId){
         TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
-        tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(mapValue.get("resultId")));
-        //设置常规字段
-        tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
-        String  ResultLeaveModel=mapValue.get("ResultLeaveModel").toString();
-        tmstruckLeaveFactoryResult.setResultOutMode(ResultLeaveModel);
-        tmstruckLeaveFactoryResult.setInsertUsername("admin");
-        tmstruckLeaveFactoryResult.setInsertTime(new Date());
-        int i = tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
-        //更改路段顺序号为 5 ：出厂
-        int i1 = omstruckOrderService.updateOrderLineSequence(mapValue, 5);
-        return i + i1;
+        //通过总实绩ID查询出产实绩
+        BigDecimal resultId = tmstruckLeaveFactoryResultMapper.getResultIdByTotalId(resultTotalId);
+        tmstruckLeaveFactoryResult.setResultId(resultId);
+        tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
+        return tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
     }
 }

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

@@ -1,27 +1,20 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.feign.WmsBoundFeign;
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.feign.OmsFeign;
+import com.steerinfo.dil.feign.WMSFeign;
+import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
-import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
+import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
 import com.steerinfo.dil.model.TmstruckLoadResult;
-import com.steerinfo.dil.model.TmstruckTotalResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstruckLoadResult服务实现：
@@ -46,11 +39,28 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
     @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
+    private TmstruckReturnResultMapper tmstruckReturnResultMapper;
 
     @Autowired
-    private WmsBoundFeign wmsBoundFeign;
+    private UtilsServiceImpl utilsService;
 
+    @Autowired
+    private RulesServiceImpl rulesService;
+
+    @Autowired
+    private WmshBoundFeign wmshBoundFeign;
+
+    @Autowired
+    private WMSFeign wmsFeign;
+
+    @Autowired
+    OmsFeign omsFeign;
+
+    @Autowired
+    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
+
+    @Autowired
+    private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
     /**
      * 查询所有装车实绩
      * @param map
@@ -58,72 +68,239 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      */
     @Override
     public List<Map<String, Object>> getAllLoadResult(Map<String, Object> map) {
-        return tmstruckLoadResultMapper.getAllLoadResult(map);
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType) {
+            case 1:
+            case 2:
+            case 3:
+                map.put("status", 0);
+                return tmstruckLoadResultMapper.getXSLoadResult(map); //apiId = 221
+            case 4:
+                return tmstruckLoadResultMapper.getSteelNzLoadResult(map); //apiID: 263
+            case 5:
+                break;
+            case 6:
+                break;
+            case 7:
+                break;
+            case 8:
+                return tmstruckLoadResultMapper.getCGJKLoadResult(map); // apiId = 91
+            case 9:
+            case 10:
+                return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
+            case 11:
+                return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
+        }
+        return null;
     }
 
     /**
-     * 新增装车实绩
-     * 运输订单号 或 运输订单Id
-     * 是否清场
-     * 装车日期
-     * 备注
-     * 计量吨位
-     * @param map
-     * @return
+     * 新增采购装车实绩  / 内转装车实绩
+     * @param map  resultMeasuredTonnage ：计量吨位  portId：港口ID
+     *             resultLoadStartTime：装车时间 resultIsclear：是否清场
      */
-    @Override
     @Transactional
-    public int addLoadResult(Map<String, Object> map) {
+    public int addCGLoadResult(Map<String,Object> map){
         //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
-        Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
-        // 新增装车实绩
-        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        BigDecimal totalId = (BigDecimal) orderMap.get("resultTotalId");
+        //通过实绩总表ID查询装车实绩ID
+        BigDecimal loadResultId = tmstruckLoadResultMapper.getResultId(totalId);
+
+        TmstruckLoadResult tmstruckLoadResult = tmstruckLoadResultMapper.selectByPrimaryKey(loadResultId);
         //添加主键Id
-        long id;
-        BigDecimal selectMaxId = tmstruckLoadResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
+//        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
         //新增计量吨位 装车所装的重量
         BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
         tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
         tmstruckLoadResult.setStatus(new BigDecimal(0));
-        tmstruckLoadResult.setResultId(new BigDecimal(id));
-        tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
+//        tmstruckLoadResult.setResultTotalId(totalId);
         String resultIsclear = (String) (map.get("resultIsclear"));
         tmstruckLoadResult.setResultIsclear(resultIsclear);
-        tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
+        tmstruckLoadResult.setResultLoadEndTime(new Date((long) map.get("resultLoadStartTime")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-
-        //修改订单状态为执行中 1
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        omstruckOrder.setOrderStatus(new BigDecimal(1));
-        int i1 = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-
-        //修改运力状态为执行中
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
-        HashMap<String, Object> changeMap = new HashMap<>();
-        changeMap.put("capacityId", capacityId);
-        changeMap.put("capacityStatus", 0);
-        int i2 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeMap);
-
-        //新增出库实绩 并修改实时库存
-        BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
+        //根据订单ID查询订单类型
+        Integer orderType = tmstruckLoadResultMapper.getOrderType(totalId);
+        if(orderType == 8){
+            tmstruckLoadResult.setSegmentSqe(new BigDecimal(1));
+        }
+        Object portId = map.get("portId"); //获取港口
         if(portId != null){
-            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(orderId);
+            //通过订单ID获取批次Id
+            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             if(batchId != null){
-                HashMap<String, Object> hashMap = new HashMap<>();
+                Map<String, Object> hashMap = new HashMap<>();
                 hashMap.put("batchId", batchId);
                 hashMap.put("portId", portId);
                 hashMap.put("resultTonnage",resultMeasuredTonnage);
                 hashMap.put("isClean", resultIsclear);
-                wmsBoundFeign.addResult(hashMap);
+                wmshBoundFeign.addResult(hashMap);
+                // 通过港口ID查询仓库表中的港存库ID
+                BigDecimal warehouseId = tmstruckLoadResultMapper.getWarehouseIdByPortId(DataChange.dataToBigDecimal(portId));
+                tmstruckLoadResult.setLoadingId(warehouseId); // 添加装货点为港口
             }
         }
+        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        String capacityNumber = (String) orderMap.get("capacityNumber");
+        utilsService.pushMesToWebsocket(capacityNumber,"装货！");
+        //修改订单状态为执行中 1
+//        int i1 = utilsService.updateOrderStatus(map, 1);
+        //修改运力状态为执行中 1
+//        int i2 = utilsService.updateCapacityStatus(map, 1);
+        return i ;
+    }
 
 
-        return i + i1 + i2;
+    /**
+     * 生成销售装车实绩（虚拟装车实绩）
+     * @param map
+     * @return
+     */
+    public int addLoadResult(Map<String, Object> map){
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //添加主键Id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //添加物资Id
+        tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        //添加总实绩ID
+        tmstruckLoadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        // 添加路段顺序号
+        tmstruckLoadResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
+        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+    }
+
+    /**
+     * 更新装车实绩表
+     * @return
+     */
+    public int updateLoadingId(Map<String, Object> map){
+        //获取装车实绩Id  订单ID 物资ID
+        Integer loadResultId = tmstruckLoadResultMapper.getLoadResultId(map);
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        tmstruckLoadResult.setResultId(new BigDecimal(loadResultId));
+        tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("loadingId")));
+        return tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+    }
+
+    /**
+     * PDA新增销售钢材装车实绩  （如果是多种物资【多拼】，通过物资Id和运输订单号来确定唯一的装车实绩进行修改）
+     *    orderNumber 运输订单号
+     *  insertUpdateRemark 备注   scanText 扫描结果
+     * @param map
+     * @return
+     */
+    @Transactional
+    public int addXSLoadResult(Map<String, Object> map){
+        //通过扫描结果截取物资唯一编码
+        String scanText = (String) map.get("scanText");
+        String[] split = scanText.split("-");
+        String materialOnlyCode = split[7];
+        //通过物资唯一编码查找物资Id
+        BigDecimal materialId = tmstruckLoadResultMapper.getMaterialIdByMaterialCode(materialOnlyCode);
+        //通过运输订单号查找总实绩ID
+        Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        BigDecimal resultTotalId = (BigDecimal) orderMap.get("resultTotalId");
+        map.put("resultTotalId", resultTotalId.intValue());
+        //通过总实绩ID与物资ID查找 装车实绩主键ID
+        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), materialId.intValue());
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        tmstruckLoadResult.setStatus(new BigDecimal(0)); // 添加状态0:正常
+        //编辑装车实绩主键ID对应的各个字段
+        tmstruckLoadResult.setResultId(new BigDecimal(resultId));
+        // 获取扫描实绩最小Id  添加扫描开始时间
+        map.put("materialId", materialId);
+        Map<String, Object> scanMap = tmstruckLoadResultMapper.getMinScanIdByOrderNum(map);
+        Date resultLoadStartTime = tmstruckLoadResultMapper.selectLoadTimeByResultId(DataChange.dataToBigDecimal(scanMap.get("resultId")));
+        tmstruckLoadResult.setResultLoadStartTime(resultLoadStartTime);
+        // 添加装卸工Id
+        tmstruckLoadResult.setLoaderId(DataChange.dataToBigDecimal(scanMap.get("loadId")));
+        // 添加扫描结束时间 以调用当前接口时间为结束时间
+        Date resultLoadEndTime = new Date();
+        tmstruckLoadResult.setResultLoadEndTime(resultLoadEndTime);
+        // 添加装车实绩时长  ----  计算装车时长
+        long time = (resultLoadEndTime.getTime() - resultLoadStartTime.getTime()) / 60000; // 分钟
+        tmstruckLoadResult.setResultLoadDuration(new BigDecimal(time));
+        //添加装车标准时长
+        setLoadStandardTimeId((String)map.get("orderNumber"), tmstruckLoadResult);
+        Object platformName = map.get("platformName");
+        if(platformName != null){
+            // 如果月台不为空则更新月台
+            Integer platformId = utilsService.queryPlatformIdByName((String) platformName);
+            tmstruckLoadResult.setLoadingId(new BigDecimal(platformId));
+        }
+        // 添加备注
+        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        //更新汽车衡
+        i += tmstruckWeightResultService.calculateTruckCalculate(map, resultTotalId.intValue());
+        //发送计毛委托 订单类型：1
+//        map.put("orderTypee", 1);
+//        tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+        return i;
+    }
+
+    /**
+     * PDA新增销售钢渣、水渣、危化品装车实绩
+     * loadStartTime 装车开始时间   resultMeasuredTonnage 计量吨位
+     * warehouseName  仓库名称      orderNumber 运输订单号   insertUpdateRemark 备注
+     * @param map
+     * @return
+     */
+    public int addXS2LoadResult(Map<String, Object> map){
+        //通过运输订单号 查询 总实绩ID、订单类型
+        Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        BigDecimal resultTotalId = (BigDecimal) orderMap.get("resultTotalId");
+        Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber((String) map.get("orderNumber"));
+        //查询装车实绩ID
+        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), null);
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        tmstruckLoadResult.setResultId(new BigDecimal(resultId));
+        tmstruckLoadResult.setStatus(new BigDecimal(0));
+        //添加装车开始时间
+        Date loadStartTime = new Date((long) map.get("loadStartTime"));
+        tmstruckLoadResult.setResultLoadStartTime(loadStartTime);
+        //添加装车结束时间(当前时间)
+        Date loadEndTime = new Date();
+        tmstruckLoadResult.setResultLoadEndTime(loadEndTime);
+        //计算装车时长 取分钟
+        long differentTime = (loadEndTime.getTime() - loadStartTime.getTime() / 60000);
+        tmstruckLoadResult.setResultLoadDuration(new BigDecimal(differentTime));
+        //添加计量吨位
+        tmstruckLoadResult.setResultMeasuredTonnage(DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage")));
+        //添加装车标准时长
+        setLoadStandardTimeId((String)map.get("orderNumber"), tmstruckLoadResult);
+        // 更新装车名称
+        Object warehouseName = map.get("warehouseName");
+        if(warehouseName != null){
+            Integer warehouseId = utilsService.queryWarehouseIdByName((String) warehouseName);
+            tmstruckLoadResult.setLoadingId(new BigDecimal(warehouseId));
+        }
+        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        //装车成功后计算计毛汽车衡（出厂：2）
+        i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 2);
+        //发送计毛委托
+        map.put("resultTotalId", resultTotalId);
+        map.put("orderTypee", orderType);
+        tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+        return i;
+    }
+
+    /**
+     * 添加装车标准时长ID
+     * @param orderNumber
+     * @param tmstruckLoadResult
+     */
+    public void setLoadStandardTimeId(String orderNumber, TmstruckLoadResult tmstruckLoadResult){
+        //添加标准时长ID 通过运输订单号查找运输订单类型
+        Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber(orderNumber);
+        if(orderType == 1){
+            tmstruckLoadResult.setLoadStandardTimeId(new BigDecimal(1));
+        }else if(orderType == 2){
+            tmstruckLoadResult.setLoadStandardTimeId(new BigDecimal(2));
+        }else if(orderType == 3){
+            tmstruckLoadResult.setLoadStandardTimeId(new BigDecimal(3));
+        }
     }
 
     /**
@@ -133,11 +310,17 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      */
     @Override
     public int updateLoadResult(TmstruckLoadResult tmstruckLoadResult) {
+//        BigDecimal orderId = tmstruckLoadResultMapper.getOrderId(tmstruckLoadResult.getResultId());
+//        Map<String , Object> map = new
+//        omsFeign.pushMesToWebsocket(map);
         return tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
     }
 
+
+
     /**
      * 通过ID查询装车实绩
+     *
      * @param resultId
      * @return
      */
@@ -158,4 +341,224 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setStatus(new BigDecimal(1));
         return tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
     }
+
+    /**
+     * 修改装车作业点
+     * @param mapList
+     * @return
+     */
+    @Override
+    public int updateLoadingIds(List<Map<String, Object>> mapList) {
+        int i = 0;
+        //获取所有装车实绩ID
+        for (Map<String, Object> map : mapList) {
+            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+            //通过传过来的物资ID（一个订单中物资ID唯一） 和订单Id 寻找装车实绩ID
+            Integer resultIdList = tmstruckLoadResultMapper.getLoadResultId(map);
+            tmstruckLoadResult.setResultId(new BigDecimal(resultIdList));
+            //获取算出来的装车点
+            tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("loadingId")));
+            i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        }
+        return i;
+    }
+
+    /**
+     * 查询销售合同装车实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadResultForSale(Map<String, Object> map) {
+        return tmstruckLoadResultMapper.selectLoadResultForSale(map);
+    }
+
+    /**
+     * 内转物流，新增装车实绩
+     */
+    @Override
+    public int addLoadResultForconverted(Map<String, Object> map) {
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //设置主键id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+
+        //获取开始时间
+        Date startTime = (Date) map.get("startTime");
+        //获取运输订单号
+        String OrderNumber = map.get("OrderNumber").toString();
+        Map<String, Object> Map = new HashMap<>();
+        Map.put("OrderNumber", OrderNumber);
+        //通过运输订单号查找物资id
+        List<Map<String, Object>> materialIdList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(Map);
+        //设置物资id
+        for (int i = 0; i < materialIdList.size(); i++) {
+            Map<String, Object> map1 = materialIdList.get(i);
+            Integer materialId = (Integer) map1.get("materialId");
+            tmstruckLoadResult.setMaterialId(new BigDecimal(materialId));
+        }
+        //绑定总实绩id
+        Map<String, Object> map2 = tmstruckReturnResultMapper.getResultTotalIdByOrderNumber(OrderNumber);
+        BigDecimal reultTotalId = (BigDecimal) map2.get("resultTotalId");
+        //设置总实绩id
+        tmstruckLoadResult.setResultTotalId(reultTotalId);
+        tmstruckLoadResult.setResultLoadStartTime(startTime);
+        //获取用户id
+        Integer personnelId = (Integer) map.get("personnelId");
+        String personnelName = tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        tmstruckLoadResult.setInsertTime(new Date());
+        tmstruckLoadResult.setInsertUsername(personnelName);
+        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        return i;
+    }
+
+    //内转物流,修改装车实绩
+    @Override
+    public int updateLoadResultForconverted(Map<String, Object> map) {
+        //获取装车实绩id
+        //通过运输订单号查找装车实绩
+        String orderNumber = (String) map.get("orderNumber");
+        Map<String, Object> map1 = tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(orderNumber);
+        //获取结束时间
+        Integer LoadResultId = (Integer) map1.get("loadResultId");
+        Date endTime = (Date) map.get("endTime");
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //根据主键id设置装车结束时间
+        tmstruckLoadResult.setResultId(new BigDecimal(LoadResultId));
+        tmstruckLoadResult.setResultLoadEndTime(endTime);
+        //获取装车开始时间
+        Date startTime = (Date) map1.get("startTime");
+        //开始时间
+        long LoadstartTime = startTime.getTime();
+        long LoadendTime = endTime.getTime();
+        long time = LoadendTime - LoadstartTime;
+        long l = time / 1000;
+        //设置标准时长
+        tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
+        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        return i;
+    }
+
+    @Override
+    public Map<String, Object> getLoadResultIdForOrderNumber(String orderNumber) {
+        return tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(orderNumber);
+    }
+
+    /**
+     * 内转物流汽车装货实绩展示
+     *
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadResultForConverted(Map<String, Object> map) {
+        return tmstruckLoadResultMapper.selectLoadResultForConverted(map);
+    }
+
+
+    /**
+     * 根据实绩id渲染数据
+     *
+     * @param resultId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadResultByResultId(Integer resultId) {
+        return tmstruckLoadResultMapper.selectLoadResultByResultId(resultId);
+    }
+
+    /**
+     * 内转物流新增装车实绩(火车卸货后装车，装车点固定为达州站）
+     *
+     * @param map
+     * @return
+     */
+    @Override
+    public int addLoadResultForConverted(Map<String, Object> map) {
+        Integer personnelId = (Integer) map.get("personnelId");
+        String personnelName = tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //获取车牌号，物资id以及总实绩id
+        String capacityNumber = (String) map.get("capacityNumber");
+        Map<String, Object> map1 = tmstruckLoadResultMapper.selectMaterialIdAndCapacityId(capacityNumber);
+        BigDecimal materialId = (BigDecimal) map1.get("materialId");
+        BigDecimal resultTotalId = (BigDecimal) map1.get("resultTotalId");
+        tmstruckLoadResult.setMaterialId(materialId);
+        tmstruckLoadResult.setResultTotalId(resultTotalId);
+        tmstruckLoadResult.setInsertTime(new Date());
+        //获取装货点
+        Integer arrivalId = (Integer) map.get("arrivalId");
+        tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(arrivalId));
+        Date insertTime = (Date) map.get("insertTime");
+        tmstruckLoadResult.setInsertTime(insertTime);
+        Integer tonnage = (Integer) map.get("tonnage");
+        tmstruckLoadResult.setResultMeasuredTonnage(DataChange.dataToBigDecimal(tonnage));
+        tmstruckLoadResult.setInsertUsername(personnelName);
+        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+    }
+
+
+    /**
+     * 查询所有正在排队的销售订单
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSaleOrderOnQueue(Map<String, Object> map) {
+        return tmstruckLoadResultMapper.getSaleOrderOnQueue(map);
+    }
+
+
+    /**
+     * 修改装车点和装车顺序
+     * @param map
+     * @return
+     */
+    public int updateLoadingIdAndLoadSq(Map<String, Object> map){
+        //前端传来数据结构类型为 {order: Integer, list: List<Map<String, Object>>}
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
+        int i = 0;
+        for (Map<String, Object> mesMap : list) {
+            mesMap.put("orderId", orderId);
+            //通过物资ID和订单ID查询装车实绩ID
+            Integer resultId = tmstruckLoadResultMapper.getLoadIdByOrderIdAndMId(mesMap);
+            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+            tmstruckLoadResult.setResultId(new BigDecimal(resultId));
+            //设置装车顺序
+            tmstruckLoadResult.setLoadingSequence(DataChange.dataToBigDecimal(mesMap.get("serialNumber")));
+            //设置装车月台
+            tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(mesMap.get("platformId")));
+            i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        }
+        return i;
+    }
+
+
+    /**
+     * 新增内转国产矿进口矿装车实绩
+     * @param map
+     * @return
+     */
+    public int addDaZhouToDaGangLoadResult(Map<String, Object> map){
+        List<Integer> totalResultIdList = (List<Integer>) map.get("totalResultIdList");
+        BigDecimal loadingId = DataChange.dataToBigDecimal(map.get("loadingId"));
+        //添加是否需要质检字段
+        BigDecimal isdeduct = DataChange.dataToBigDecimal(map.get("isdeduct"));
+        Date loadTime = new Date((long) map.get("loadTime"));
+        int count = 0;
+        for (Integer totalResultId : totalResultIdList) {
+            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+            tmstruckLoadResult.setResultTotalId(new BigDecimal(totalResultId));
+            tmstruckLoadResult.setLoadingId(loadingId);
+            tmstruckLoadResult.setIsdeduct(isdeduct);
+            tmstruckLoadResult.setResultLoadStartTime(loadTime);
+            tmstruckLoadResult.setStatus(new BigDecimal(0));
+            tmstruckLoadResult.setInsertTime(new Date());
+            tmstruckLoadResult.setInsertUsername("admin");
+            count += tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        }
+        return count;
+    }
 }

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

@@ -1,15 +1,18 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.HTTPRequestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstruckMeasureCommission服务实现：
@@ -25,48 +28,247 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 @Service(value = "tmstruckMeasureCommissionService")
-public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCommissionService {
+public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCommissionService{
 
     @Autowired
     private TmstruckMeasureCommissionMapper tmstruckMeasureCommissionMapper;
 
-    /**
+   /**
      * 查询计量委托 0 ：计皮     1：计毛
-     * @param map
+     * @param map orderTypee 订单类型   type 是计皮还是计毛
      * @return
      */
     @Override
     public List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map) {
-        return tmstruckMeasureCommissionMapper.getAllMeasureCommission(map);
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+                break;
+            case 6:
+                break;
+            case 7:
+                break;
+            case 8:
+                return tmstruckMeasureCommissionMapper.getMeasureCommission(map);
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+        }
+        return null;
     }
 
     /**
-     * 进厂作业完成后 系统自动新增计毛、计皮委托
+     * 添加计量委托 并发送计量委托
+     * @param map {orderTypee: 订单类型
+     *            resultTotalId：总实绩ID  orderId: 订单ID
+     *            总实绩ID }
+     * @return
+     */
+    public int addMaoMeasureCommission(Map<String, Object> map){
+        int i = addMeasureCommission(map, 2); // 添加计毛委托
+        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id   orderId
+        //获取当前订单是属于哪个厂区订单
+        Integer receiveId = tmstruckMeasureCommissionMapper.getSupplierIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        if(receiveId == 1){
+            //发送委托给达州钢铁
+            i += sendMeasureCommissionMes(map);
+        }
+        if(receiveId == 2) {
+            //发送委托给达兴能源
+            i += sendDXMeasureCommissionMes(map);
+        }
+        return i;
+    }
+
+
+    /**
+     * 新增计毛、计皮委托
      * @return
      */
     @Override
-    public int addMeasureCommission(BigDecimal totalId, Integer type) {
+    public int addMeasureCommission(Map<String, Object> map, Integer type) {
         TmstruckMeasureCommission tmstruckMeasureCommission = new TmstruckMeasureCommission();
         //生成主键Id
-        long id;
-        BigDecimal selectMaxId = tmstruckMeasureCommissionMapper.selectMaxId();
-        if (selectMaxId == null){
-            id = 1;
-        }else {
-            id = selectMaxId.longValue() + 1;
+        tmstruckMeasureCommission.setCommssionId(tmstruckMeasureCommissionMapper.selectMaxId());
+        //添加物资ID
+        tmstruckMeasureCommission.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        //添加汽车衡Id
+        if(map.get("grossPlaceId") != null){
+            tmstruckMeasureCommission.setCalculateId(DataChange.dataToBigDecimal(map.get("grossPlaceId")));
+        }
+        if(map.get("tarePlaceId") != null){
+            tmstruckMeasureCommission.setCalculateId(DataChange.dataToBigDecimal(map.get("tarePlaceId")));
         }
-        tmstruckMeasureCommission.setCommssionId(new BigDecimal(id));
-
         //添加实绩总表Id
-        tmstruckMeasureCommission.setResultTotalId(totalId);
-
+        tmstruckMeasureCommission.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //添加计量类型
         tmstruckMeasureCommission.setCommssionType(new BigDecimal(type));
-
         tmstruckMeasureCommission.setInsertTime(new Date());
         tmstruckMeasureCommission.setInsertUsername("admin");
         return tmstruckMeasureCommissionMapper.insertSelective(tmstruckMeasureCommission);
     }
 
 
+    /**
+     * 查询计量委托并向计量系统发送数据  调用他们接口
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  orderId  订单ID
+     */
+    public int sendMeasureCommissionMes(Map<String, Object> map){
+        Map<String, Object> measureCommission = null;
+        //查询计量委托
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        Integer type = (Integer) map.get("type");
+        switch (orderType.intValue()){
+            case 1:
+                if(type == 0) {
+//                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForSaleByOrderNumber(map);
+                }else {
+//                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForSaleByOrderNumber(map);
+                }
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 10:
+            case 11:
+            case 4:
+                if(type == 0) {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForConvertedByOrderNumber(map);
+                }else {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForConvertedByOrderNumber(map);
+                }
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                measureCommission =  tmstruckMeasureCommissionMapper.purchaseFLMeasure(map);
+                measureCommission.put("isRelationEAS", true);
+                measureCommission.put("flowTo", "进厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("IsAssembly", false);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+        }
+        /*访问接口发送数据*/
+//        sendMesToMeasure(measureCommission);
+        return 1;
+    }
+
+
+    /**
+     * 发送计量委托给达兴能源 计量
+     * @param map
+     * @return
+     */
+    public int sendDXMeasureCommissionMes(Map<String, Object> map){
+        Map<String, Object> measureCommission = null;
+        //查询计量委托
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 10:
+            case 11:
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                measureCommission =  tmstruckMeasureCommissionMapper.purchaseFLDXMeasure(map);
+                measureCommission.put("deliveryType", "计重");
+                measureCommission.put("billType", "0");
+                measureCommission.put("planQuantity", 0);
+                measureCommission.put("crname", "admin");
+                measureCommission.put("orderSource", 1);
+                measureCommission.put("ended", 0);
+        }
+        /*访问接口发送数据*/
+        return sendMesToDXMeasure(measureCommission);
+    }
+
+    /**
+     *
+     * 访问老厂区计量接口方法
+     * @param map
+     * @return
+     */
+    public int sendMesToMeasure(Map<String, Object> map){
+        List<Map<String, Object>> sendMap = new ArrayList<>();
+        sendMap.add(map);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", sendMap);
+
+        String url = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
+        String jsonData = null;
+        try {
+            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            boolean success = (boolean) hashMap.get("success");
+            System.out.println(hashMap.get("msg"));
+            if(success){
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+
+    /**
+     * 访问新厂区达兴能源计量接口方法
+     * @param map
+     * @return
+     */
+    public int sendMesToDXMeasure(Map<String, Object> map){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", map);
+
+        String url = "http://223.85.163.87:8121/daXingWeight/orderBusiness.do?addOrder";
+        String jsonData = null;
+        try {
+            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code =(String) map.get("code");
+            System.out.println(hashMap.get("msg"));
+            if("0".equals(code)){
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

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

@@ -31,12 +31,36 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
 
     /**
      * 查询所有的质检作业
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
     @Override
     public List<Map<String, Object>> getQualityResult(Map<String, Object> map) {
-        return tmstruckQualityResultMapper.getQualityResult(map);
+        Integer orderType = (Integer)map.get("orderTypee");
+        switch (orderType){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                return tmstruckQualityResultMapper.getQualityResult(map); //apiId:150
+            case 9:
+            case 10:
+                return tmstruckQualityResultMapper.getInwardQualityResult(map); //apiId:150
+            case 11:
+                break;
+
+        }
+        return null;
     }
 
     /**
@@ -61,4 +85,5 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
         tmstruckQualityResultMapper.updateByPrimaryKeySelective(tmstruckQualityResult);
         return 0;
     }
+
 }

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

@@ -1,11 +1,15 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
+import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.dil.service.ITmstruckReceiptResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -28,13 +32,86 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
     @Autowired
     private TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
 
+    @Autowired
+    private UtilsMapper utilsMapper;
+
     /**
-     * 查询所有签收实绩
+     * 查询所有收货实绩
      * @param map
      * @return
      */
     @Override
     public List<Map<String, Object>> getReceiveResult(Map<String, Object> map) {
-        return tmstruckReceiptResultMapper.getReceiveResult(map);
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+                return tmstruckReceiptResultMapper.getSteelNzReceiptResult(map); //apiId: 266
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                return tmstruckReceiptResultMapper.getCGReceiptResult(map); //apiId: 107
+            case 9:
+            case 10:
+                return tmstruckReceiptResultMapper.getInwardReceipt(map); //apiId: 107
+            case 11:
+
+        }
+        return null;
+    }
+
+    /**
+     * 新增一条虚拟收货实绩
+     * @param map {resultTotalId：总实绩ID}
+     * @return
+     */
+    public int addReceiptResult(Map<String, Object> map){
+        //新增完卸车实绩后新增一条收货实绩
+        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
+        tmstruckReceiptResult.setId(tmstruckReceiptResultMapper.selectMaxId());//添加主键
+        tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));//添加总实绩Id
+        tmstruckReceiptResult.setStatus(new BigDecimal(0)); // 卸货完成后添加的为虚拟收货实绩
+        return tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
+    }
+
+    /**
+     * 确认收货（修改收货实绩为真实收货实绩）
+     * @param map {resultTotalId：总实绩ID}
+     * @return
+     */
+    public int updateReceiptResult(Map<String, Object> map){
+        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
+        tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        tmstruckReceiptResult.setStatus(new BigDecimal(1));
+        tmstruckReceiptResult.setInsertUsername("admin");
+        tmstruckReceiptResult.setInsertTime(new Date());
+        return tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
+    }
+
+    /**
+     * 新增钢材到异地库达州站驻港人员确定收货
+     * @param map
+     * @return
+     */
+    public int addSteelNzReceiptResult(Map<String, Object> map){
+        String orderNumber = (String) map.get("orderNumber");
+        //通过运输订单号获取总实绩ID
+        BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderNumber(orderNumber);
+        //获取异地库ID
+        BigDecimal warehouseId =  DataChange.dataToBigDecimal(map.get("warehouseId"));
+        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
+        tmstruckReceiptResult.setResultId(tmstruckReceiptResultMapper.selectMaxId());
+        tmstruckReceiptResult.setResultTotalId(resultTotalId);
+        tmstruckReceiptResult.setStatus(new BigDecimal(1));
+        tmstruckReceiptResult.setWarehouseId(warehouseId);
+        tmstruckReceiptResult.setInsertTime(new Date());
+        tmstruckReceiptResult.setInsertUsername("admin");
+        return tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
     }
 }

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

@@ -0,0 +1,235 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.feign.OmsFeign;
+import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
+import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
+import com.steerinfo.dil.model.TmstruckReturnResult;
+import com.steerinfo.dil.model.TmstruckTotalResult;
+
+import com.steerinfo.dil.service.ITmstruckReturnResultService;
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckReturnResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-18 09:17
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckReturnResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstruckReturnResultService")
+public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultService {
+
+    @Autowired
+    private TmstruckReturnResultMapper tmstruckReturnResultMapper;
+
+    @Autowired
+    private UtilsServiceImpl utilsService;
+
+    @Autowired
+    private OmsFeign omsFeign;
+
+    @Autowired
+    UtilsMapper utilsMapper;
+
+    @Autowired
+    private TmstruckTotalResultMapper tmstruckTotalResultMapper;
+
+    @Autowired
+    private TmstruckEnfactoryResultServiceImpl tmstruckEnfactoryResultService;
+    @Autowired
+    private TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
+    @Autowired
+    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
+
+    @Autowired
+    TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+
+
+    /**
+     * 添加常规字段
+     * @param tmstruckReturnResult
+     */
+    public void addRegularField(TmstruckReturnResult tmstruckReturnResult){
+        tmstruckReturnResult.setInsertTime(new Date());
+        tmstruckReturnResult.setInsertUsername("admin");
+    }
+
+    /**
+     * 添加退货实绩 删除本条运输订单 重新新增销售运输订单 、运输订单子表  以及进厂、出厂等实绩
+     * @param map {orderNumber 运输订单号}
+     * @return
+     */
+    @Override
+    public int addReturnGoodsResult(Map<String, Object> map) {
+        TmstruckReturnResult tmstruckReturnResult = new TmstruckReturnResult();
+        //生成主键
+        BigDecimal maxId = tmstruckReturnResultMapper.selectMaxId();
+        tmstruckReturnResult.setResultId(maxId);
+        tmstruckReturnResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        tmstruckReturnResult.setInsertUpdateRemark((String) map.get("returnReason"));
+        addRegularField(tmstruckReturnResult);
+        //新增退货实绩
+        int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
+        i += utilsService.updateOrderLineSequence(map); //当前新订单路段顺序号 + 1
+        //通过运输订单ID查询物资ID
+        List<Integer> orderIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        Integer materialId = orderIdList.get(0);
+        map.put("materialId", materialId);
+        //通过物资ID匹配汽车衡 --遗留问题
+        map.put("grossPlaceId", 6);
+        //发送计量委托
+        i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+        return i;
+    }
+
+    /*
+     TmstruckReturnResult tmstruckReturnResult = new TmstruckReturnResult();
+        //生成主键
+        BigDecimal maxId = tmstruckReturnResultMapper.selectMaxId();
+        tmstruckReturnResult.setResultId(maxId);
+        //通过运输订单号获得 运输订单ID
+        map.putAll(tmstruckReturnResultMapper.getResultTotalIdByOrderNumber((String) map.get("orderNumber")));
+        tmstruckReturnResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        //调用更新退货实绩接口
+        omsFeign.updateOmsTruckOrder(map);
+        //设置首次新增时的常规字段
+        addRegularField(tmstruckReturnResult);
+        //新增退货实绩
+        int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
+        //逻辑删除运单
+        int i1 = utilsService.updateOrderStatus(map, 7);
+        //重新新增销售运输订单
+        int i2 = addNewOrder(orderId);
+        return i;
+     */
+
+    /**
+     * 查询退货实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllReturnResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+            case 2:
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                return tmstruckReturnResultMapper.getFLReturnResult(map); //apiId: 377
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+                break;
+        }
+        return null;
+    }
+
+
+    /**
+     * 重新新增销售运输订单
+     * @param orderId
+     * @return
+     */
+    public int addNewOrder(BigDecimal orderId){
+        //通过运输订单ID查询上一个运输订单的相关信息
+        Map<String, Object> omstruckOrder = tmstruckReturnResultMapper.getOldOrderMesById(orderId);
+        //生成主键
+        BigDecimal maxId = utilsService.selectOrderMaxId();
+        omstruckOrder.put("orderId", maxId);
+        //生成运输订单号
+        omstruckOrder.put("orderNumber", DataChange.generateEightDigitsNumber("WYSDD", maxId.intValue()));
+        //添加订单状态 1:执行中
+        omstruckOrder.put("orderStatus", new BigDecimal(4));
+        //添加常规字段
+        omstruckOrder.put("insertTime",new Date());
+        omstruckOrder.put("insertUsername","admin");
+        //新增新的运输订单
+        omsFeign.insertSelectiveOrder(omstruckOrder);
+        //新增新的运输订单子表
+        int i1 = addNewOrderMaterial(orderId, maxId);
+        //新增总实绩 maxId为新订单ID
+        int i2 = addTotalResult(maxId);
+        //新增进厂、计重、出厂实绩
+        int i3 = addAllResult(maxId);
+        return i1 + i2 + i3;
+    }
+
+    /**
+     * 总实绩新增一条数据
+     * @param orderId
+     * @return
+     */
+    public int addTotalResult(BigDecimal orderId){
+        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
+        //生成主键
+        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectMaxId());
+        tmstruckTotalResult.setOrderId(orderId);
+        return tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+    }
+
+    /**
+     * 退货自动新增一条 进厂、计重、出厂实绩  遗留问题（装车）
+     * @param orderId
+     * @return
+     */
+    @Transactional
+    public int addAllResult(BigDecimal orderId){
+        //通过运输订单号 查询各个作业点ID 及 总实绩ID
+        Map<String, Object> idMap = new HashMap<>();
+        idMap.put("orderId", orderId);
+        Map<String, Object> map = tmstruckReturnResultMapper.getPointIdByOrderNum(idMap);
+        int i = tmstruckEnfactoryResultService.addEnFactoryResult(map);
+        int i1 = tmstruckWeightResultService.addWeightResult(map);
+        int i2 = tmstruckLeaveFactoryResultService.addLeaveFactory(map);
+        return i + i1 + i2;
+    }
+
+    /**
+     * 重新新增销售运输订单子表
+     * @param oldOrderId 旧订单Id
+     * @param newOrderId 新订单ID
+     */
+    public int addNewOrderMaterial(BigDecimal oldOrderId, BigDecimal newOrderId){
+        //通过运输订单查询上一个运输订单子表相关的信息 可能会有多个物资信息
+        List<Map<String, Object>> oldOrderMaterialList = tmstruckReturnResultMapper.getOldOrderMaterialMesByOrderId(oldOrderId);
+        int count = 0;
+        for (Map<String, Object> omstruckOrderMaterial : oldOrderMaterialList) {
+            //获取主键
+            omstruckOrderMaterial.put("orderMaterialId", utilsService.selectOrderMaterialMaxId());
+            //设置新订单Id
+            omstruckOrderMaterial.put("orderId", newOrderId);
+            //添加常规字段
+            omstruckOrderMaterial.put("insertTime",new Date());
+            omstruckOrderMaterial.put("insertUsername","admin");
+            omsFeign.insertSelectiveOrderMaterial(omstruckOrderMaterial);
+            count++;
+        }
+        return count;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
+import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
+import com.steerinfo.dil.service.ITmstruckSelfMachineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-11-17 20:59
+ */
+@Service
+public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
+
+    @Autowired
+    TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
+
+    @Autowired
+    TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
+
+    /**
+     * 提货单信息
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public Map<String, Object> getBillOrder(String orderNumber) {
+
+        //1.根据运输订单号查询主干信息
+
+        Map<String,Object>map=tmstruckEnfactoryResultMapper.getBillOrder(orderNumber);
+
+        //2.根据运输订单号查询枝叶信息-物资
+
+        List<Map<String,Object>>list=tmstruckEnfactoryResultMapper.getBillOrderMaterial(orderNumber);
+        map.put("materialList",list);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getDeliveryOrder(String orderNumber) {
+        Map<String,Object> map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
+        List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
+        map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
+        return map;
+    }
+}

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

@@ -0,0 +1,114 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.feign.JoinFeign;
+import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
+import com.steerinfo.dil.mapper.TmstruckSmsRusultMapper;
+import com.steerinfo.dil.model.TmstruckSmsRusult;
+import com.steerinfo.dil.service.ITmstruckSmsRusultService;
+import com.steerinfo.dil.util.MD5Util;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckSmsRusult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-18 09:19
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckSmsRusult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstruckSmsRusultService")
+public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRusult, BigDecimal> implements ITmstruckSmsRusultService {
+
+    @Autowired
+    private TmstruckSmsRusultMapper tmstruckSmsRusultMapper;
+    @Autowired
+    private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
+    @Autowired
+    JoinFeign joinFeign;
+//    @Autowired
+//    private OmstruckOrderMapper omstruckOrderMapper;
+
+    @Override
+    protected IBaseMapper<TmstruckSmsRusult, BigDecimal> getMapper() {
+        return tmstruckSmsRusultMapper;
+    }
+
+    /**
+     * 销售物流通过点击确认新增短信实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public int addSmsResult(Map<String,Object> map) {
+        //获取用户名
+//        Integer personnelId=(Integer) map.get("personnelId");
+//        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
+        //获取订单号
+        String orderNumber = map.get("orderNumber").toString();
+        //新增短信实绩
+        TmstruckSmsRusult tmstruckSmsRusult=new TmstruckSmsRusult();
+        tmstruckSmsRusult.setResultId(tmstruckSmsRusultMapper.selectMaxId());
+        //新增总实绩id
+        Map<String,Object> map1= tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber);
+        Integer resultTotalId = Integer.parseInt(map1.get("resultTotalId").toString());
+        tmstruckSmsRusult.setTotalResultId(new BigDecimal(resultTotalId));
+        Integer shipperId = tmstruckSmsRusultMapper.selectShipperIdByOrderNumber(orderNumber);
+        //设置发送方id
+        tmstruckSmsRusult.setSenderId(new BigDecimal(shipperId));
+        //通过发送方ID查询appId和秘钥
+        Map<String,Object>map5=tmstruckSmsRusultMapper.selectIdApp(new BigDecimal(shipperId));
+        String AppId= (String) map5.get("AppId");
+        String secretKey=(String) map5.get("secretKey");
+
+        tmstruckSmsRusult.setResultSendingTime(new Date());
+        //根据运输订单号查找司机电话号码
+        String driverPhone=tmstruckSmsRusultMapper.selectCarDriverByOrderNumber(orderNumber);
+        String content="您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流";
+        tmstruckSmsRusult.setResultSmsContent("您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流");
+
+        //新增短信实绩
+        tmstruckSmsRusult.setInsertTime(new Date());
+        //调用接口发送短信
+        Map<String, Object> map2 = new HashMap<>();
+        String timestamp=String.valueOf(new Date().getTime());
+        String sign=AppId+secretKey+timestamp;
+        try {
+            String signMd5=MD5Util.md5Encode(sign);
+            map2.put("sign",signMd5);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+      	map2.put("AppId",AppId);
+        map2.put("timestamp",timestamp);
+        map2.put("content",content);
+        map2.put("mobiles",driverPhone);
+        if (joinFeign.push(map2)){
+            int i=tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
+            return i;
+        }
+        else return 0;
+
+
+
+    }
+
+    @Override
+    public List<Map<String, Object>> getSmsResult(Map<String, Object> map) {
+        return tmstruckSmsRusultMapper.selectSmsResult(map);
+    }
+}

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

@@ -0,0 +1,191 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckTimeTaskResultMapper;
+import com.steerinfo.dil.model.TmstruckTimeTaskResult;
+import com.steerinfo.dil.service.ITmstruckTimeTaskResultService;
+
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckTimeTskResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 07:28
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-22
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckTimeTskResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstruckTimeTaskResultService")
+public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResultService {
+
+    @Autowired
+    private TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
+
+
+    /**
+     * 通用生成实例数据
+     * @param map
+     * @return
+     */
+    public TmstruckTimeTaskResult generateTimeTaskResult(Map<String, Object> map, Integer timeType){
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = new TmstruckTimeTaskResult();
+        //获取主键ID
+        tmstruckTimeTaskResult.setId(tmstruckTimeTaskResultMapper.selectMaxId());
+        String orderNumber = (String) map.get("orderNumber");
+        //通过运输订单号查询总实绩ID等数据
+        map.putAll(tmstruckTimeTaskResultMapper.getResultTotalIdByOrderNum(orderNumber));
+        tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        //生成时间
+        tmstruckTimeTaskResult.setResultTime(new Date());
+        //设置时间类型
+        tmstruckTimeTaskResult.setResultTimeType(new BigDecimal(timeType));
+        return tmstruckTimeTaskResult;
+    }
+
+    /**
+     * 司机申请开始
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyStartTime(Map<String, Object> map) {
+        //设置时间类型 0
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 0);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认开始
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureStartTime(Map<String, Object> map) {
+        //设置时间类型 1
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 1);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 司机申请暂停
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyStartTimeout(Map<String, Object> map) {
+        //设置时间类型 4
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 4);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureStartTimeout(Map<String, Object> map) {
+        //设置时间类型 5
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 5);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 司机申请暂停结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyEndTimeout(Map<String, Object> map) {
+        //设置时间类型 6
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 6);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认暂停结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureEndTimeout(Map<String, Object> map) {
+        //设置时间类型 7
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 7);
+        //查询上一次结束的时间
+        Map<String, Object> timeMap = tmstruckTimeTaskResultMapper.getLastTimeout(tmstruckTimeTaskResult.getResultTotalId());
+        Object resultTime = timeMap.get("resultTime");
+        if(resultTime != null){
+            Date lastTimeout = (Date) resultTime;
+            //计算相差时间戳 存入当前实绩中  更精确
+            long differenceTime = new Date().getTime() - lastTimeout.getTime();
+            tmstruckTimeTaskResult.setResultValue(new BigDecimal(differenceTime));
+        }
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 司机申请结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyEndTime(Map<String, Object> map) {
+        //设置时间类型 2
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 2);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureEndTime(Map<String, Object> map) {
+        //设置时间类型 3
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 3);
+        //查询当前车辆排队开始时间 计算出总时长
+        Map<String, Object> startTimeMap = tmstruckTimeTaskResultMapper.getStartTime(tmstruckTimeTaskResult.getResultTotalId());
+        Date endTime = new Date();
+        //计算当前时间与确认开始时间相差的毫秒数（时间戳）
+        Date startTime = (Date) startTimeMap.get("resultTime");
+        long allTime = endTime.getTime() - startTime.getTime();
+        //查询所有确认暂停结束的时长时间戳
+        List<Map<String, Object>> allTimeout = tmstruckTimeTaskResultMapper.getAllTimeout(tmstruckTimeTaskResult.getResultTotalId());
+        long allTimeoutTime = 0;
+        //计算所有暂停时间时长时间戳总和
+        for (Map<String, Object> timeoutMap : allTimeout) {
+            BigDecimal resultTime = DataChange.dataToBigDecimal(timeoutMap.get("resultValue"));
+            allTimeoutTime += resultTime.longValue();
+        }
+        long realTime = allTime - allTimeoutTime;
+        //计算总工作时长（分钟）
+        realTime = realTime / (1000 * 60);
+        tmstruckTimeTaskResult.setResultValue(new BigDecimal(realTime));
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+
+    /**
+     * 查询计时作业
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map) {
+        return tmstruckTimeTaskResultMapper.getAllTimeTaskResult(map);
+    }
+
+
+}

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

@@ -0,0 +1,59 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
+import com.steerinfo.dil.model.TmstruckTotalResult;
+import com.steerinfo.dil.service.ITmstruckTotalResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 10:18
+ */
+
+@Service(value = "tmstruckTotalResultService")
+public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultService {
+
+    @Autowired
+    private TmstruckTotalResultMapper tmstruckTotalResultMapper;
+
+    /**
+     * 新增实绩总表
+     * 运输订单ID
+     * @param orderId
+     * @return
+     */
+    public int addTotalResult(BigDecimal orderId){
+        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
+        BigDecimal maxId = tmstruckTotalResultMapper.selectMaxId();
+        tmstruckTotalResult.setResultTotalId(maxId);
+        tmstruckTotalResult.setOrderId(orderId);
+        tmstruckTotalResult.setInsertTime(new Date());
+        tmstruckTotalResult.setInsertUsername("admin");
+        tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+        return maxId.intValue();
+
+    }
+    /**
+     * 展示计数实绩列表
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectCountList(Map<String, Object> map) {
+        return tmstruckTotalResultMapper.selectCountList(map);
+    }
+    /**
+     * 展示包月实绩列表
+     * @param mapValue
+     * @return
+     */
+    public List<Map<String, Object>> getTmstruckMonthResult(Map<String, Object> mapValue) {
+        return tmstruckTotalResultMapper.getTmstruckMonthResult(mapValue);
+    }
+}