销售合并

pom.xml

@@ -94,6 +94,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>

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

@@ -96,4 +96,11 @@ 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);
+    }
 }

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

@@ -137,11 +137,22 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @ApiOperation(value="分解运输计划后 新增订单  或者直接新增订单 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderType", value = "运输订单类型:1表示销售订单，3表示运输订单", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "saleOrderId", value = "销售订单", required = false, dataType = "Integer"),
     })
     @PostMapping("/addPurOrder")
     public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = omstruckOrderService.addPurOrder(mapValue);
-        return success(i);
+        Integer orderType=(Integer)mapValue.get("orderType");
+        int i=0;
+        int i1=0;
+        if (orderType==3) {
+            i = omstruckOrderService.addPurOrder(mapValue);
+        }
+        if (orderType==1){
+            i1=omstruckOrderService.addOrderForSale(mapValue);
+        }
+        //判断return为5则为正确
+        return success(i+i1);
     }
 
     @ApiOperation(value="修改分派计划")
@@ -330,4 +341,28 @@ public class OmstruckOrderController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrder, order);
         return success(pageList);
     }
+
+    @ApiOperation(value="查询所有空闲的司机排班信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(186)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityForLeisure")
+    public RESTfulResult getCapacityForLeisure(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+
+    ){
+
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = omstruckOrderService.selectCapacityAndDriver(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = omstruckOrderService.selectCapacityAndDriver(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
 }

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

@@ -61,7 +61,7 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
+    @ApiOperation(value="新增进厂作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
@@ -85,4 +85,15 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
 //        }
 //        return failed();
     }
+
+    @ApiOperation(value="使用门禁系统更新进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateEnFactoryByMenJin")
+    public RESTfulResult updateEnFactoryByMenJin(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckEnfactoryResultService.updateEnFactoryByMenJin(mapValue);
+        return success(i);
+    }
+
 }

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

@@ -79,6 +79,7 @@ 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){
@@ -91,4 +92,26 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
 //        }else
 //            return  failed();
     }
+
+    @ApiOperation(value="销售物流查询所有的出厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(174)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLeaveFactoryResultForSale")
+    public RESTfulResult getLeaveFactoryResultForSale(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allLeaveFactoryResult = tmstruckLeaveFactoryResultService.selectAllLeaveFacatoryForSale(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> leaveFactoryResult = tmstruckLeaveFactoryResultService.selectAllLeaveFacatoryForSale(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLeaveFactoryResult,leaveFactoryResult);
+        return success(pageList);
+    }
 }

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

@@ -116,4 +116,56 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         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.updateLoadingId(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);
+    }
+
 }

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

@@ -40,9 +40,10 @@ 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);
     }

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

@@ -0,0 +1,37 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.ITmstruckReturnResultService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+    @ApiOperation(value = "新增退货实绩", notes = "需要运输订单号")
+    @PostMapping(value = "/addReturnGoodsResult")//BigDecimal
+    public RESTfulResult addReturnGoodsResult(@RequestBody(required = false) Map<String, Object> map) {
+        int i = tmstruckReturnResultService.addReturnGoodsResult(map);
+        return success(i);
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.steerinfo.dil.controller;
+
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+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
+    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
+    ){
+        //不分页筛选数据
+        List<Map<String, Object>> allLeaveFactoryResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> leaveFactoryResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLeaveFactoryResult,leaveFactoryResult);
+        return success(pageList);
+    }
+}

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

@@ -13,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;
 
@@ -52,8 +53,15 @@ 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
     ){
+        if (mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(orderType != null){
+            mapValue.put("orderTypee", orderType);
+        }
         //不分页筛选数据
         List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -75,8 +83,15 @@ 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
     ){
+        if (mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(orderType != null){
+            mapValue.put("orderTypee", orderType);
+        }
         //不分页筛选数据
         List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);

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/mapper/DropDownMapper.java

@@ -41,6 +41,7 @@ public interface DropDownMapper {
     //获取所有的港口
     List<Map<String, Object>> getPort();
 
-
+    //获取所有的月台
+    List<Map<String, Object>> getPlatformId();
 
 }

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

@@ -60,8 +60,20 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId);
 
     //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
-    Map<String, Object> getPointIdByOrderNum(String orderNumber);
+    Map<String, Object> getPointIdByOrderNum(Map<String, Object> map);
 
     //运输派单
     List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
+
+    //通过运输订单号查找物资理重和物资件数
+    Map<String,Object> selectTheoreticalWeightAndMaterialNumber(Integer saleOrderMaterialId);
+
+    //通过用户id查找用户姓名
+    String selectPersonNameByPersonnelId(Integer personnelId);
+
+    //通过车序号表id查找物资id
+    List<Map<String,Object>> selectMaterialIdBysaleOrderMaterialId(Integer saleOrderMaterialId);
+
+    //查找司机排班表信息
+    List<Map<String,Object>> selectCapacityAndDriver(Map<String,Object> map);
 }

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

@@ -26,4 +26,7 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     //根据订单号获取实绩id
     Map<String, Object> selectResultId(String orderNumber);
+
+    //销售物流查询所有的出厂实绩
+    List<Map<String,Object>> selectAllLeaveFacatoryForSale(Map<String,Object> map);
 }

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.mapper;
 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;
@@ -30,4 +29,25 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     //通过订单ID查询批次ID
     BigDecimal getBatchIdByOrderId(BigDecimal orderId);
+
+    //通过订单Id查询装车实绩Id  一个订单可能会有多个装车实绩
+    Integer getLoadResultIdList(Map<String, Object> map);
+
+    //根据运输订单号查找运输订单类型
+    Integer selectOrderTypeByOrderNumber(String oderNumber);
+
+    //根据运输订单号查找扫描实绩id
+    List<Integer>  selectResultIdByOrderNumber(String orderNumber);
+
+    //根据实绩id查找扫描时间
+    Map selectLoadTimeByResultId(Integer resultId);
+
+    //根据实绩id查找扫描时间
+    Integer selecLoadIdByresultId(Integer resultId);
+
+    //销售查询所有的装车实绩
+    List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
+
+    //根据运输订单号查找物资id
+    List<Map<String,Object>> selectMaterialIdByOrderNumber(String orderNumber);
 }

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

@@ -12,8 +12,8 @@ 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")

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

@@ -0,0 +1,29 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmstruckOrder;
+import com.steerinfo.dil.model.OmstruckOrderMaterial;
+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查询上一个订单的信息
+    OmstruckOrder getOldOrderMesById(BigDecimal orderId);
+
+    //通过运输订单Id查询查询上一个订单子表的信息
+    List<OmstruckOrderMaterial> getOldOrderMaterialMesByOrderId(BigDecimal orderId);
+}

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

@@ -0,0 +1,23 @@
+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);
+}

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

@@ -16,7 +16,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     @Select("select seq_tmstruck_weight_result.nextval from dual")
     BigDecimal selectMaxId();
 
-    //通过订单号查询实绩总表Id
+    //通过订单号查询计重实绩数据
     Map<String, Object> selectTotalIdByOrderNo(String orderNumber);
 
     //通过汽车衡编号查询汽车衡ID
@@ -28,4 +28,6 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //查询所有计皮实绩
     List<Map<String, Object>> getAllJiPiResult(Map<String, Object> map);
 
+    //查询订单下所有的物资件数和物资理重
+    List<Map<String, Object>> getMaterialMes(Integer orderId);
 }

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

@@ -0,0 +1,290 @@
+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 AmsSaleOrderMaterial implements IBasePO<Short> {
+    /**
+     * 主键ID(SALE_ORDER_MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal saleOrderMaterialId;
+
+    /**
+     * 销售订单ID(SALE_ORDER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="销售订单ID",required=true)
+    private BigDecimal saleOrderId;
+
+    /**
+     * 车序号(SALE_ORDER_MATERIAL_TRUCK_NO,DECIMAL,0)
+     */
+    @ApiModelProperty(value="车序号",required=false)
+    private BigDecimal saleOrderMaterialTruckNo;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 物资件数(SALE_ORDER_MATERIAL_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资件数",required=false)
+    private BigDecimal saleOrderMaterialNumber;
+
+    /**
+     * 物资理论重量(MATERIAL_THEORETICAL_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资理论重量",required=false)
+    private BigDecimal materialTheoreticalWeight;
+
+    /**
+     * 收货地址ID(SALE_SHIPPING_ADDRESS_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="收货地址ID",required=false)
+    private BigDecimal saleShippingAddressId;
+
+    /**
+     * 收货日期(SALE_DATE_OF_RECEIPT,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="收货日期",required=false)
+    private Date saleDateOfReceipt;
+
+    /**
+     * 收货方姓名(SALE_ORDER_CONSIGNEE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货方姓名",required=false)
+    private String saleOrderConsignee;
+
+    /**
+     * 收货方电话(SALE_ORDER_CONSIGNEE_TEL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货方电话",required=false)
+    private String saleOrderConsigneeTel;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 是否删除（0：否，1：是）(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否删除（0：否，1：是）",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 是否为历史记录（0：否，1：是）(UPDATED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否为历史记录（0：否，1：是）",required=false)
+    private BigDecimal updated;
+
+    private static final long serialVersionUID = 1L;
+
+    public BigDecimal getSaleOrderMaterialId() {
+        return saleOrderMaterialId;
+    }
+
+    public void setSaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
+        this.saleOrderMaterialId = saleOrderMaterialId;
+    }
+
+    public BigDecimal getSaleOrderId() {
+        return saleOrderId;
+    }
+
+    public void setSaleOrderId(BigDecimal saleOrderId) {
+        this.saleOrderId = saleOrderId;
+    }
+
+    public BigDecimal getSaleOrderMaterialTruckNo() {
+        return saleOrderMaterialTruckNo;
+    }
+
+    public void setSaleOrderMaterialTruckNo(BigDecimal saleOrderMaterialTruckNo) {
+        this.saleOrderMaterialTruckNo = saleOrderMaterialTruckNo;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getSaleOrderMaterialNumber() {
+        return saleOrderMaterialNumber;
+    }
+
+    public void setSaleOrderMaterialNumber(BigDecimal saleOrderMaterialNumber) {
+        this.saleOrderMaterialNumber = saleOrderMaterialNumber;
+    }
+
+    public BigDecimal getMaterialTheoreticalWeight() {
+        return materialTheoreticalWeight;
+    }
+
+    public void setMaterialTheoreticalWeight(BigDecimal materialTheoreticalWeight) {
+        this.materialTheoreticalWeight = materialTheoreticalWeight;
+    }
+
+    public BigDecimal getSaleShippingAddressId() {
+        return saleShippingAddressId;
+    }
+
+    public void setSaleShippingAddressId(BigDecimal saleShippingAddressId) {
+        this.saleShippingAddressId = saleShippingAddressId;
+    }
+
+    public Date getSaleDateOfReceipt() {
+        return saleDateOfReceipt;
+    }
+
+    public void setSaleDateOfReceipt(Date saleDateOfReceipt) {
+        this.saleDateOfReceipt = saleDateOfReceipt;
+    }
+
+    public String getSaleOrderConsignee() {
+        return saleOrderConsignee;
+    }
+
+    public void setSaleOrderConsignee(String saleOrderConsignee) {
+        this.saleOrderConsignee = saleOrderConsignee == null ? null : saleOrderConsignee.trim();
+    }
+
+    public String getSaleOrderConsigneeTel() {
+        return saleOrderConsigneeTel;
+    }
+
+    public void setSaleOrderConsigneeTel(String saleOrderConsigneeTel) {
+        this.saleOrderConsigneeTel = saleOrderConsigneeTel == null ? null : saleOrderConsigneeTel.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 BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public BigDecimal getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(BigDecimal updated) {
+        this.updated = updated;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", saleOrderMaterialId=").append(saleOrderMaterialId);
+        sb.append(", saleOrderId=").append(saleOrderId);
+        sb.append(", saleOrderMaterialTruckNo=").append(saleOrderMaterialTruckNo);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", saleOrderMaterialNumber=").append(saleOrderMaterialNumber);
+        sb.append(", materialTheoreticalWeight=").append(materialTheoreticalWeight);
+        sb.append(", saleShippingAddressId=").append(saleShippingAddressId);
+        sb.append(", saleDateOfReceipt=").append(saleDateOfReceipt);
+        sb.append(", saleOrderConsignee=").append(saleOrderConsignee);
+        sb.append(", saleOrderConsigneeTel=").append(saleOrderConsigneeTel);
+        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(", updated=").append(updated);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    @Override
+    public Short getId() {
+        return null;
+    }
+
+    @Override
+    public void setId(Short aShort) {
+
+    }
+}

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

@@ -58,9 +58,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal orderCommunicationDuration;
 
     /**
-     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收(ORDER_STATUS,DECIMAL,38)
+     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收，7：逻辑删除(ORDER_STATUS,DECIMAL,38)
      */
-    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收",required=false)
+    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收，7：逻辑删除",required=false)
     private BigDecimal orderStatus;
 
     /**
@@ -123,6 +123,12 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="预计进厂时间",required=false)
     private Date orderEntryTime;
 
+    /**
+     * 司机排班id(DRIVER_CAPACITY_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="司机排班id",required=false)
+    private BigDecimal driverCapacityId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -287,6 +293,14 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.orderEntryTime = orderEntryTime;
     }
 
+    public BigDecimal getDriverCapacityId() {
+        return driverCapacityId;
+    }
+
+    public void setDriverCapacityId(BigDecimal driverCapacityId) {
+        this.driverCapacityId = driverCapacityId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -312,6 +326,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", orderLineSequence=").append(orderLineSequence);
         sb.append(", lineId=").append(lineId);
         sb.append(", orderEntryTime=").append(orderEntryTime);
+        sb.append(", driverCapacityId=").append(driverCapacityId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -18,13 +18,13 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     /**
      * 订单id(ORDER_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="订单id",required=true)
+    @ApiModelProperty(value="订单id",required=false)
     private BigDecimal orderId;
 
     /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     * 钢材物资ID(MATERIAL_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="物资ID",required=false)
+    @ApiModelProperty(value="钢材物资ID",required=false)
     private BigDecimal materialId;
 
     /**
@@ -69,6 +69,12 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 物资指向：0：物资主表（原料用）；1：物资子表（钢材用）(MATERIAL_DIRECTION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资指向：0：物资主表（原料用）；1：物资子表（钢材用）",required=false)
+    private BigDecimal materialDirection;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -161,6 +167,14 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getMaterialDirection() {
+        return materialDirection;
+    }
+
+    public void setMaterialDirection(BigDecimal materialDirection) {
+        this.materialDirection = materialDirection;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -177,6 +191,7 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", materialDirection=").append(materialDirection);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -117,6 +117,12 @@ 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;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -273,6 +279,14 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         this.loadingId = loadingId;
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -297,6 +311,7 @@ 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(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,139 @@
+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 TmstruckReturnResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 记录创建人(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.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        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/TmstruckSmsRusult.java

@@ -0,0 +1,184 @@
+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 TmstruckSmsRusult implements IBasePO<BigDecimal> {
+    /**
+     * 总实绩ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 发送方ID(SENDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="发送方ID",required=false)
+    private BigDecimal senderId;
+
+    /**
+     * 短信发送时间(RESULT_SENDING_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="短信发送时间",required=false)
+    private Date resultSendingTime;
+
+    /**
+     * 短信内容(RESULT_SMS_CONTENT,VARCHAR,120)
+     */
+    @ApiModelProperty(value="短信内容",required=false)
+    private String resultSmsContent;
+
+    /**
+     * 记录创建人(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.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public BigDecimal getSenderId() {
+        return senderId;
+    }
+
+    public void setSenderId(BigDecimal senderId) {
+        this.senderId = senderId;
+    }
+
+    public Date getResultSendingTime() {
+        return resultSendingTime;
+    }
+
+    public void setResultSendingTime(Date resultSendingTime) {
+        this.resultSendingTime = resultSendingTime;
+    }
+
+    public String getResultSmsContent() {
+        return resultSmsContent;
+    }
+
+    public void setResultSmsContent(String resultSmsContent) {
+        this.resultSmsContent = resultSmsContent == null ? null : resultSmsContent.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();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        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);
+        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/service/DropDownService.java

@@ -32,4 +32,7 @@ public interface DropDownService {
 
     //获取所有的港口
     List<Map<String, Object>> getPort();
+
+    //获取所有的月台
+    List<Map<String, Object>> getPlatformId();
 }

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

@@ -62,4 +62,10 @@ public interface IOmstruckOrderService{
 
     //运输派单
     List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
+
+    //新增销售订单
+    int addOrderForSale(Map<String,Object> map);
+
+    //查找司机排班表信息
+    List<Map<String,Object>> selectCapacityAndDriver(Map<String,Object> map);
 }

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

@@ -37,7 +37,11 @@ public interface ITmstruckLeaveFactoryResultService {
 
     //更新出厂实绩
     int updateLeaveFactoryByPDA(Map<String,Object> mapValue);
+
     //根据门禁系统采集获取
     int updateLeaveFactoryByMenGang(Map<String,Object> mapValue);
 
+    //销售物流查询所有的出厂实绩
+    List<Map<String,Object>> selectAllLeaveFacatoryForSale(Map<String,Object> map);
+
 }

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

@@ -34,4 +34,11 @@ public interface ITmstruckLoadResultService{
 
     //逻辑删除装车作业
     int deleteLoadResult(Integer resultId);
+
+
+    //修改装车作业作业点
+    int updateLoadingId(List<Map<String, Object>> map);
+
+    //销售查询所有的装车实绩
+    List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
 }

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+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);
+}

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/impl/AmstruckPurplanServiceImpl.java

@@ -5,6 +5,7 @@ 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 com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,10 +71,7 @@ public class AmstruckPurplanServiceImpl implements IAmstruckPurplanService {
         amstruckPurplan.setPlanId(maxId);
         //生成运输计划号
         int id = maxId.intValue();
-        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;
+        String planNumber = DataChange.generateEightDigitsNumber("WYSJF", id);
         amstruckPurplan.setPlanNo(planNumber);
         //新增状态为未下发：0
         amstruckPurplan.setPlanStatus(new BigDecimal(0));

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

@@ -100,5 +100,14 @@ public class DropDownServiceImpl implements DropDownService {
         return dropDownMapper.getPort();
     }
 
+    /**
+     * 获取所有的月台
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPlatformId() {
+        return dropDownMapper.getPlatformId();
+    }
+
 
 }

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

@@ -7,12 +7,13 @@ 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.apache.commons.collections4.Put;
 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.security.PublicKey;
 import java.util.*;
 
 /**
@@ -51,6 +52,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
     @Autowired
     private TmstruckUnloadResultServiceImpl tmstruckUnloadResultService;
+    @Autowired
+    private TmstruckLoadResultServiceImpl tmstruckLoadResultService;
     /**
      * 查询所有运输订单
      * 获取已下发的运输订单 用于websocket
@@ -66,29 +69,35 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      * 生成运输订单实体类
      */
     public OmstruckOrder generateOmsTruckOrder(Map<String, Object> map){
+        Integer personnelId=(Integer) map.get("personnelId");
+        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
+        Integer orderType=Integer.parseInt(map.get("orderType").toString());
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         //生成订单主键Id
         BigDecimal maxId = omstruckOrderMapper.selectMaxId();
         omstruckOrder.setOrderId(maxId);
         //生成运输订单号
         int id = maxId.intValue();
-        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;
+        String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", id);
         omstruckOrder.setOrderNumber(orderNumber);
         //运单状态 刚分配默认为未下发
         omstruckOrder.setOrderStatus(new BigDecimal(3));
-        //添加采购订单ID
-        omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
+        //判断运输订单类型
+        if (orderType == 3) {
+            //添加采购订单ID
+            omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
+            //添加订单类型 3
+            omstruckOrder.setOrderType(new BigDecimal(3));
+        }else if (orderType == 1){
+            //添加销售订单与物资对应中间表ID
+            omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("saleOrdermaterialId")));
+            //添加订单类型 1为销售订单
+            omstruckOrder.setOrderType(new BigDecimal(1));
+        }
         //添加运力Id
         BigDecimal capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
         omstruckOrder.setCapacityId(capacityId);
-        //添加订单类型 3
-        omstruckOrder.setOrderType(new BigDecimal(3));
-
-        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setInsertUsername(personnelName);
         omstruckOrder.setInsertTime(new Date());
         return omstruckOrder;
     }
@@ -124,6 +133,40 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return 5;
     }
 
+    /**
+     * 新增销售订单
+     * @param map
+     * @return
+     */
+    @Override
+    @Transactional
+    public int addOrderForSale(Map<String, Object> map) {
+        //生成运输订单号和主键
+        OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
+        //设置线路  遗留问题,设置为进门门岗
+        omstruckOrder.setLineId(new BigDecimal(1));
+        //新增运输订单
+        omstruckOrderMapper.insertSelective(omstruckOrder);
+        //更新运力状态为待运输：2
+        map.put("capacityStatus", 2);
+        omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
+        //新增运输订单子表
+        addOrderMaterial(map, omstruckOrder.getOrderId());
+        //新增实绩总表关联订单
+        addTotalResult(omstruckOrder.getOrderId());
+        return 5;
+    }
+
+    /**
+     * 查找司机排班表信息
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectCapacityAndDriver(Map<String, Object> map) {
+        return omstruckOrderMapper.selectCapacityAndDriver(map);
+    }
+
 
     /**
      * 新增实绩总表
@@ -146,17 +189,64 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      * @param
      */
     public void addOrderMaterial(Map<String, Object> map, BigDecimal orderId){
+        Integer orderType=(Integer)map.get("orderType");
+        Integer personnelId=(Integer) map.get("personnelId");
+        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
         //新增运输订单子表
         OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
         //生成子表主键
         omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
         omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         omstruckOrderMaterial.setOrderId(orderId);
-        Object orderMaterialWeight = map.get("orderMaterialWeight"); // 采购辅料没有物资重量
-        if(orderMaterialWeight != null){
-            omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(orderMaterialWeight));
+        if (orderType==3) {
+            Object orderMaterialWeight = map.get("orderMaterialWeight"); // 采购辅料没有物资重量
+            if (orderMaterialWeight != null) {
+                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(orderMaterialWeight));
+            }
+        }else if (orderType==1){
+            //获取中间表id
+            Integer saleOrdermaterialId=(Integer)map.get("saleOrdermaterialId");
+            //通过车序号id查找物资件数和物资重量
+            Map<String,Object> map1=omstruckOrderMapper.selectTheoreticalWeightAndMaterialNumber(saleOrdermaterialId);
+            BigDecimal  materialNumber =(BigDecimal) map1.get("materialNumber");
+            BigDecimal weight=(BigDecimal) map1.get("weight");
+            //设置物资理重和物资件数
+            omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(weight));
+            omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(materialNumber));
+            //通过销售订单车序号id查找物资id
+            List<Map<String,Object>> materialList=omstruckOrderMapper.selectMaterialIdBysaleOrderMaterialId(saleOrdermaterialId);
+            for (int i=0;i<materialList.size();i++) {
+                Map<String,Object> map2=materialList.get(i);
+                BigDecimal materialId=(BigDecimal) map2.get("materialId");
+                omstruckOrderMaterial.setMaterialId(materialId);
+            }
+            //自动下发订单
+            OmstruckOrder omstruckOrder=new OmstruckOrder();
+            omstruckOrder.setOrderId(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> numMap = new HashMap<>();
+            numMap.put("orderId", orderId);
+            Map<String, Object> map4 = omstruckOrderMapper.getPointIdByOrderNum(numMap);
+            tmstruckEnfactoryResultService.addEnFactoryResult(map4);
+            tmstruckWeightResultService.addWeightResult(map4);
+            tmstruckLeaveFactoryResultService.addLeaveFactory(map4);
+            if((Integer) map.get("orderType") == 3){
+                tmstruckUnloadResultService.addUnloadResult(map4);
+            }
+            //将下发的销售订单中间表逻辑删除
+            AmsSaleOrderMaterial amsSaleOrderMaterial=new AmsSaleOrderMaterial();
+            amsSaleOrderMaterial.setSaleOrderMaterialId(new BigDecimal(saleOrdermaterialId));
+            amsSaleOrderMaterial.setDeleted(new BigDecimal(0));
+
         }
-        omstruckOrderMaterial.setInsertUsername("admin");
+        omstruckOrderMaterial.setInsertUsername(personnelName);
         omstruckOrderMaterial.setInsertTime(new Date());
         omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
     }
@@ -266,14 +356,22 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         omstruckOrder.setOrderStatus(new BigDecimal(4));
         omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         //通过运输订单ID查询运输订单号 （使用的都是运输订单号）
-        String orderNumber = omstruckOrderMapper.getOrderNumberByOrderId(orderId);
+//        String orderNumber = omstruckOrderMapper.getOrderNumberByOrderId(orderId);
         //通过运输订单号 查询各个作业点ID 及 总实绩ID
-        Map<String, Object> map = omstruckOrderMapper.getPointIdByOrderNum(orderNumber);
+        Map<String, Object> numMap = new HashMap<>();
+        numMap.put("orderId", orderId);
+        Map<String, Object> map = omstruckOrderMapper.getPointIdByOrderNum(numMap);
         tmstruckEnfactoryResultService.addEnFactoryResult(map);
         tmstruckWeightResultService.addWeightResult(map);
         tmstruckLeaveFactoryResultService.addLeaveFactory(map);
-        tmstruckUnloadResultService.addUnloadResult(map);
-        return 5;
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
+        if(orderType.intValue() == 3){
+            tmstruckUnloadResultService.addUnloadResult(map);
+        }
+        if(orderType.intValue() == 3){
+            tmstruckLoadResultService.addSaleLoadResult(map);
+        }
+        return 1;
     }
 
     /**

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

@@ -53,7 +53,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
 
     /**
      * 派单时新增进厂实绩
-     * 总实绩Id、线路起点
+     * map: 总实绩Id、线路起点
      * @param map
      * @return
      */
@@ -91,17 +91,14 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         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;
+        int i1 = addMeasureCommission(map);
+        return i + i1;
     }
 
     /**
      * 使用门禁系统进厂
+     * 运输订单号 orderNumber，车牌号capacityNumber，
+     * 门岗名称 gatepostName，进厂时间 resultEntryGateTime，（进厂方式）
      * @param map
      * @return
      */
@@ -109,20 +106,59 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     public int updateEnFactoryByMenJin(Map<String, Object> map) {
         TmstruckEnfactoryResult tmstruckEnfactoryResult=new TmstruckEnfactoryResult();
         String orderNumber = map.get("orderNumber").toString();
-        //获取进厂实绩id
+        //获取进厂实绩id 总实绩ID 订单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 = addMeasureCommission(map);
+        //通过判断订单类型 进厂后是走计皮还是计毛
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+                map.put("type", 0);
+                break;
+            case 2:
+                break;
+            case 3:
+                map.put("type", 1);
+        }
+        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 计毛 还是 计皮 resultTotalId： 总实绩Id
+        tmstruckMeasureCommissionService.sendMeasureCommissionMes(map);
+        return i + i1;
+    }
+
+    /**
+     * 添加计量委托
+     * @param map
+     * @return
+     */
+    public int addMeasureCommission(Map<String, Object> map){
+        //更新路段顺序号 1：进厂
         int i1 = omstruckOrderService.updateOrderLineSequence(map, 1);
-        //进厂完成后新增一条计毛委托 类型 1
+        int i2 = 0;
+        // 通过判断订单类型是发送计毛委托还是计皮委托
+        Integer orderType = (Integer) map.get("orderTypee");
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        int i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 1);
-        return i + i1 +i2;
+        switch (orderType){
+            case 3:
+                //采购订单进厂完成后新增一条计毛委托 类型 1
+                i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 1);
+                break;
+            case 1:
+                //销售订单进厂完成后新增一条计皮委托 类型 0
+                i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 0);
+        }
+        return i1 + i2;
     }
 
     /**

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

@@ -143,6 +143,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     }
 
     /**
+     * 销售物流和采购物流
      * 通过PDA进行更新实绩
      * 运输订单号
      * @param mapValue
@@ -173,14 +174,18 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         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();
+        int i2=0;
+        BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
+        if (orderType.intValue() ==3) {
+            omstruckOrder.setOrderStatus(new BigDecimal(2));
+            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;
     }
@@ -209,4 +214,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         int i1 = omstruckOrderService.updateOrderLineSequence(mapValue, 5);
         return i + i1;
     }
+
+    /**
+     * 查询销售订单的所有出厂实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectAllLeaveFacatoryForSale(Map<String, Object> map) {
+        return tmstruckLeaveFactoryResultMapper.selectAllLeaveFacatoryForSale(map);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
@@ -13,10 +14,7 @@ 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;
+import java.util.*;
 
 /**
  * TmstruckLoadResult服务实现：
@@ -45,6 +43,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     @Autowired
     private WmshBoundFeign wmshBoundFeign;
+    
+    @Autowired
+    private WMSFeign wmsFeign;
 
     /**
      * 查询所有装车实绩
@@ -99,12 +100,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         changeMap.put("capacityId", capacityId);
         changeMap.put("capacityStatus", 0);
         int i2 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeMap);
-        //新增出库实绩 并修改实时库存
+
+        //新增港存库出库实绩 并修改实时库存
         BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
         if(portId != null){
             BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(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);
@@ -112,11 +114,125 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 wmshBoundFeign.addResult(hashMap);
             }
         }
+        return i + i1 + i2;
+    }
 
 
-        return i + i1 + i2;
+    /**
+     * 新增销售装车实绩(虚拟)
+     *
+     * @param map {orderNumber 运输订单号}
+     * @return
+     */
+    public int addSaleLoadResult(Map<String, Object> map){
+        String orderNumber = (String) map.get("orderNumber");
+        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(orderNumber);
+        int i = 0;
+        for (Map<String, Object> materialMap : materialList) {
+            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+            //添加物资ID
+            tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(materialMap.get("materialId")));
+            //添加总实绩ID
+            Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
+            //添加主键
+            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+            i += tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        }
+        return i;
     }
 
+
+    /**
+     * 遗留问题  （销售装车）
+     * @param map
+     * @return
+     */
+    public int addLoadResult1(Map<String, Object> map) {
+        String orderNumber = map.get("orderNumber").toString();
+        //通过运输订单号查找物资
+        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(orderNumber);
+        for (int i = 0; i < materialList.size(); i++) {
+            Map<String, Object> map3 = materialList.get(i);
+            BigDecimal materialId = (BigDecimal) map3.get("materialId");
+            //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
+            Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
+            // 新增装车实绩
+            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+            //添加主键Id
+            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+            //新增计量吨位 装车所装的重量
+            BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
+            tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
+            tmstruckLoadResult.setStatus(new BigDecimal(0));
+            tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
+            String resultIsclear = (String) (map.get("resultIsclear"));
+            tmstruckLoadResult.setResultIsclear(resultIsclear);
+            //根据运输订单号查找运输订单类型
+            Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber(orderNumber);
+            int i2 = 0;
+            int i1 = 0;
+            switch (orderType) {
+                case 3:
+                    tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
+                    //修改订单状态为执行中 1
+                    OmstruckOrder omstruckOrder = new OmstruckOrder();
+                    BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+                    omstruckOrder.setOrderId(orderId);
+                    omstruckOrder.setOrderStatus(new BigDecimal(1));
+                    i1 = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+                    //修改运力状态为执行中
+                    BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
+                    HashMap<String, Object> changeMap = new HashMap<>();
+                    changeMap.put("capacityId", capacityId);
+                    changeMap.put("capacityStatus", 0);
+                    i2 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeMap);
+                    //新增出库实绩 并修改实时库存
+                    BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
+                    if (portId != null) {
+                        BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(orderId);
+                        if (batchId != null) {
+                            HashMap<String, Object> hashMap = new HashMap<>();
+                            hashMap.put("batchId", batchId);
+                            hashMap.put("portId", portId);
+                            hashMap.put("resultTonnage", resultMeasuredTonnage);
+                            hashMap.put("isClean", resultIsclear);
+                            wmshBoundFeign.addResult(hashMap);
+                        }
+                    }
+                case 1:
+                    List list = tmstruckLoadResultMapper.selectResultIdByOrderNumber(orderNumber);
+                    //查询最大id和最小id
+                    Integer maxResultId = (Integer) Collections.max(list);
+                    Integer minResultId = (Integer) Collections.min(list);
+                    //根据最大id查找扫描时间
+                    Map map1 = tmstruckLoadResultMapper.selectLoadTimeByResultId(minResultId);
+                    Date startdate = (Date) map1.get("loadTime");
+                    Integer loaderId = tmstruckLoadResultMapper.selecLoadIdByresultId(minResultId);
+                    //根据最小id查找扫描时间
+                    Map map2 = tmstruckLoadResultMapper.selectLoadTimeByResultId(maxResultId);
+                    Date endDate = (Date) map2.get("loadTime");
+                    tmstruckLoadResult.setResultLoadStartTime(startdate);
+                    tmstruckLoadResult.setResultLoadEndTime(endDate);
+                    //开始时间
+                    long startTime = startdate.getTime();
+                    long endTime = endDate.getTime();
+                    long time = endTime - startTime;
+                    long l = time / 1000;
+                    tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
+                    tmstruckLoadResult.setLoaderId(new BigDecimal(loaderId));
+                    //新增出库实绩
+                    wmsFeign.insertOutBoundResult(map);
+
+            }
+            tmstruckLoadResult.setMaterialId(materialId);
+            tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+            int i3 = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+            return i3 + i1 + i2;
+        }
+
+        return 6;
+    }
+    
     /**
      * 修改装车作业
      * @param tmstruckLoadResult
@@ -149,4 +265,38 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setStatus(new BigDecimal(1));
         return tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
     }
+
+    /**
+     * 修改装车作业点 多个装车点随机分配给多个装车实绩
+     * @param mapList
+     * @return
+     */
+    @Override
+    public int updateLoadingId(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.getLoadResultIdList(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);
+    }
+
+
+
 }

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

@@ -32,12 +32,12 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     /**
      * 查询计量委托 0 ：计皮     1：计毛
-     * @param map
+     * @param map orderTypee 订单类型   type 是计皮还是计毛
      * @return
      */
     @Override
     public List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map) {
-        return tmstruckMeasureCommissionMapper.getAllMeasureCommission(map);
+        return tmstruckMeasureCommissionMapper.getMeasureCommission(map);
     }
 
     /**
@@ -49,17 +49,26 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         TmstruckMeasureCommission tmstruckMeasureCommission = new TmstruckMeasureCommission();
         //生成主键Id
         tmstruckMeasureCommission.setCommssionId(tmstruckMeasureCommissionMapper.selectMaxId());
-
         //添加实绩总表Id
         tmstruckMeasureCommission.setResultTotalId(totalId);
-
         //添加计量类型
         tmstruckMeasureCommission.setCommssionType(new BigDecimal(type));
-
         tmstruckMeasureCommission.setInsertTime(new Date());
         tmstruckMeasureCommission.setInsertUsername("admin");
         return tmstruckMeasureCommissionMapper.insertSelective(tmstruckMeasureCommission);
     }
 
 
+    /**
+     * 查询计量委托并向计量系统发送数据  调用他们接口
+     * @param map orderTypee 订单类型  type 计皮还是计毛类型  resultTotalId  总实绩ID
+     */
+    public void sendMeasureCommissionMes(Map<String, Object> map){
+        //查询计量委托
+        List<Map<String, Object>> allMeasureCommission = tmstruckMeasureCommissionMapper.getMeasureCommission(map);
+        Map<String, Object> mes = allMeasureCommission.get(0);
+        /*访问接口发送数据*/
+        /********************************************/
+    }
+
 }

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

@@ -0,0 +1,190 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
+
+import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
+import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
+import com.steerinfo.dil.model.OmstruckOrder;
+import com.steerinfo.dil.model.OmstruckOrderMaterial;
+
+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 OmstruckOrderMapper omstruckOrderMapper;
+
+    @Autowired
+    private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
+
+    @Autowired
+    private TmstruckTotalResultMapper tmstruckTotalResultMapper;
+
+    @Autowired
+    private TmstruckEnfactoryResultServiceImpl tmstruckEnfactoryResultService;
+    @Autowired
+    private TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
+    @Autowired
+    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
+    @Autowired
+    private TmstruckUnloadResultServiceImpl tmstruckUnloadResultService;
+
+    /**
+     * 添加常规字段
+     * @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);
+        //通过运输订单号获得 运输订单ID
+        map.putAll(tmstruckReturnResultMapper.getResultTotalIdByOrderNumber((String) map.get("orderNumber")));
+        tmstruckReturnResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        //设置首次新增时的常规字段
+        addRegularField(tmstruckReturnResult);
+        //新增退货实绩
+        int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
+        //逻辑删除运单
+        int i1 = deleteOrder(orderId);
+        //重新新增销售运输订单
+        int i2 = addNewOrder(orderId);
+        return i + i1 + i2;
+    }
+
+    /**
+     * 退货实绩添加完成后逻辑删除本次运单
+     * @param orderId 通过运单主键对其进行逻辑删除 （主键走索引）
+     * @return
+     */
+    public int deleteOrder(BigDecimal orderId){
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        omstruckOrder.setOrderId(orderId);
+        omstruckOrder.setOrderStatus(new BigDecimal(7));
+        return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+    }
+
+    /**
+     * 重新新增销售运输订单
+     * @param orderId
+     * @return
+     */
+    public int addNewOrder(BigDecimal orderId){
+        //通过运输订单ID查询上一个运输订单的相关信息
+        OmstruckOrder omstruckOrder = tmstruckReturnResultMapper.getOldOrderMesById(orderId);
+        //生成主键
+        BigDecimal maxId = omstruckOrderMapper.selectMaxId();
+        omstruckOrder.setOrderId(maxId);
+        //生成运输订单号
+        omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", maxId.intValue()));
+        //添加订单状态 1:执行中
+        omstruckOrder.setOrderStatus(new BigDecimal(4));
+        //添加常规字段
+        omstruckOrder.setInsertTime(new Date());
+        omstruckOrder.setInsertUsername("admin");
+        //新增新的运输订单
+        int i = omstruckOrderMapper.insertSelective(omstruckOrder);
+        //新增新的运输订单子表
+        int i1 = addNewOrderMaterial(orderId, maxId);
+        //新增总实绩 maxId为新订单ID
+        int i2 = addTotalResult(maxId);
+        //新增进厂、计重、出厂实绩
+        int i3 = addAllResult(maxId);
+        return i + 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 = omstruckOrderMapper.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<OmstruckOrderMaterial> oldOrderMaterialList = tmstruckReturnResultMapper.getOldOrderMaterialMesByOrderId(oldOrderId);
+        int count = 0;
+        for (OmstruckOrderMaterial omstruckOrderMaterial : oldOrderMaterialList) {
+            //获取主键
+            omstruckOrderMaterial.setMaterialId(omstruckOrderMaterialMapper.selectMaxId());
+            //设置新订单Id
+            omstruckOrderMaterial.setOrderId(newOrderId);
+            //添加常规字段
+            omstruckOrderMaterial.setInsertTime(new Date());
+            omstruckOrderMaterial.setInsertUsername("admin");
+            count += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+        }
+        return count;
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+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.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.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
+    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));
+        tmstruckSmsRusult.setResultSendingTime(new Date());
+        //根据运输订单号查找司机电话号码
+        String driverPhone=tmstruckSmsRusultMapper.selectCarDriverByOrderNumber(orderNumber);
+        tmstruckSmsRusult.setResultSmsContent("您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流");
+        //新增短信实绩
+        tmstruckSmsRusult.setInsertTime(new Date());
+        tmstruckSmsRusult.setInsertUsername(personnelName);
+        int i=tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
+        return i;
+    }
+
+    @Override
+    public List<Map<String, Object>> getSmsResult(Map<String, Object> map) {
+        return tmstruckSmsRusultMapper.selectSmsResult(map);
+    }
+}

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

@@ -74,15 +74,32 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Transactional
     public int addJiMaoResult(Map<String, Object> map) {
         TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
-        double resultGrossWeight = (double) map.get("resultGrossWeight");
-        //通过传来的运输订单号查询总实绩ID 计量实绩Id
+        //通过传来的运输订单号查询计重实绩
         map.putAll(tmstruckWeightResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
-        BigDecimal resultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
-        tmstruckWeightResult.setWeightTaskResultId(resultId);
+        BigDecimal weightTaskResultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
+        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
         //添加毛重
         DecimalFormat df =  new DecimalFormat("0.00");
-        String grossWeight = df.format(resultGrossWeight);
-        tmstruckWeightResult.setResultGrossWeight(new BigDecimal(grossWeight));
+        String resultGrossWeight = df.format((double) map.get("resultGrossWeight"));
+        tmstruckWeightResult.setResultGrossWeight(new BigDecimal(resultGrossWeight));
+        Integer lineSequence = null; //路段顺序号
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            //如果订单类型为销售订单 则执行销售订单计皮规则 resultTareWeight
+            case 1:
+                //计算净重  从map中获取皮重 tareWeight
+                double netWeight = ((BigDecimal) map.get("resultGrossWeight")).doubleValue() - ((Double) map.get("tareWeight"));
+                String resultNetWeight = df.format(netWeight);
+                tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+                addUpdateRegularField(tmstruckWeightResult); //插入第二次计重时间
+                lineSequence = 5; //设置路段顺序号为5：出厂
+                break;
+            //采购订单记录计毛为第一次计重
+            case 3:
+                addInsertRegularField(tmstruckWeightResult); //插入第一次计重时间
+                lineSequence = 5; //设置路段顺序号为5：出厂
+        }
+
         //通过汽车衡编号查询汽车衡ID
         Integer calculateId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("truckCalculateNumber"));
         //添加计毛汽车衡
@@ -94,15 +111,33 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //添加毛重时间
         long resultGrossWeightTime = (long) map.get("resultGrossWeightTime");
         tmstruckWeightResult.setResultGrossWeightTime(new Date(resultGrossWeightTime));
-        tmstruckWeightResult.setInsertTime(new Date());
-        tmstruckWeightResult.setInsertUsername("admin");
-        tmstruckWeightResult.setInsertUpdateRemark("无");
+
         int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //更新订单路段顺序号
-        int i2 = omstruckOrderService.updateOrderLineSequence(map, 2);
+        int i2 = omstruckOrderService.updateOrderLineSequence(map, lineSequence);
         return i +i2;
     }
 
+    /**
+     * 稽核销售计毛净重 与 物资理重是否相同
+     * @param map
+     * @return
+     */
+    public double checkWeight(Map<String, Object> map){
+        Integer orderId = (Integer) map.get("orderId");
+        double totalWeight = 0;
+        //通过订单Id查找该订单下所有物资的理重及件数
+        List<Map<String, Object>> materialMesList = tmstruckWeightResultMapper.getMaterialMes(orderId);
+        for (Map<String, Object> materialMes : materialMesList) {
+            //获取物资件数
+            int orderMaterialNumber = (Integer) materialMes.get("orderMaterialNumber");
+            //获取物资理重
+            Double materialTheoreticalWeight = (Double) materialMes.get("materialTheoreticalWeight");
+            totalWeight += orderMaterialNumber * materialTheoreticalWeight;
+        }
+        return totalWeight;
+    }
+
     /**
      * 查询所有计毛实绩
      * @param map
@@ -126,10 +161,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
 
     /**
      * 更新计皮实绩  需要采集的数据
-     * 运输订单号
-     * 汽车衡编号
-     * 皮重
-     * 皮重时间
+     * 运输订单号 orderNumber
+     * 汽车衡编号 truckCalculateNumber
+     * 皮重 resultTareWeight
+     * 皮重时间 resultTareWeightTime
      *
      * @param map
      * @return
@@ -138,7 +173,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Transactional
     public int addJiPiResult(Map<String, Object> map) {
         TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
-        //通过传来的运输订单号查询总实绩ID
+        //通过传来的运输订单号查询计重实绩
         map.putAll(tmstruckWeightResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
         BigDecimal resultId = (BigDecimal) map.get("weightTaskResultId");
         tmstruckWeightResult.setWeightTaskResultId(resultId);
@@ -149,28 +184,58 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //添加皮重时间
         long resultTareWeightTime = (long) map.get("resultTareWeightTime");
         tmstruckWeightResult.setResultTareWeightTime(new Date(resultTareWeightTime));
-        //计算净重  先获取毛重
-        double netWeight = ((BigDecimal) map.get("resultGrossWeight")).doubleValue() - ((Double) map.get("resultTareWeight"));
-        String resultNetWeight = df.format(netWeight);
-        tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+
+        int i1 = 0;
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            //如果订单类型为采购订单 则执行采购订单计皮规则
+            case 3:
+                //计算净重  先从map中获取毛重 grossWeight
+                double netWeight = ((BigDecimal) map.get("grossWeight")).doubleValue() - ((Double) map.get("resultTareWeight"));
+                String resultNetWeight = df.format(netWeight);
+                tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+                addUpdateRegularField(tmstruckWeightResult); // 添加更新常规字段 就是第二次计重时间
+                //计皮作业完成后自动完成签收
+                TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
+                tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+                tmstruckReceiptResult.setStatus(new BigDecimal(1));
+                tmstruckReceiptResult.setInsertUsername("admin");
+                tmstruckReceiptResult.setInsertTime(new Date());
+                i1 = tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
+                break;
+            //销售订单计皮为第一次计重
+            case 1:
+                addInsertRegularField(tmstruckWeightResult);// 添加插入常规字段 就是第一次计重时间
+        }
+
         //通过汽车衡编号查询汽车衡ID
         Integer calculateId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("truckCalculateNumber"));
         //添加计皮汽车衡
         if(calculateId != null){
             tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(calculateId));
         }
-        tmstruckWeightResult.setUpdateTime(new Date());
-        tmstruckWeightResult.setUpdateUsername("admin");
         int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
-        //计皮作业完成后自动完成签收
-        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-        tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        tmstruckReceiptResult.setStatus(new BigDecimal(1));
-        tmstruckReceiptResult.setInsertUsername("admin");
-        tmstruckReceiptResult.setInsertTime(new Date());
-        int i1 = tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
         //更新订单路段顺序号
         int i2 = omstruckOrderService.updateOrderLineSequence(map, 4);
         return i + i1 + i2;
     }
+
+    /**
+     * 添加首次计重时的常规字段
+     * @param tmstruckWeightResult
+     */
+    public void addInsertRegularField(TmstruckWeightResult tmstruckWeightResult){
+        tmstruckWeightResult.setInsertTime(new Date());
+        tmstruckWeightResult.setInsertUsername("admin");
+        tmstruckWeightResult.setInsertUpdateRemark("无");
+    }
+
+    /**
+     * 添加第二次计重时的常规字段
+     * @param tmstruckWeightResult
+     */
+    public void addUpdateRegularField(TmstruckWeightResult tmstruckWeightResult){
+        tmstruckWeightResult.setUpdateTime(new Date());
+        tmstruckWeightResult.setUpdateUsername("admin");
+    }
 }

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

@@ -0,0 +1,85 @@
+package com.steerinfo.dil.util;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 远程调用接口
+ * @ author    :TXF
+ * @ time      :2021/10/15 21:37
+ *
+ */
+/*
+1，创建HttpClient对象；
+
+2，指定请求URL，并创建请求对象，如果是get请求则创建HttpGet对象，post则创建HttpPost对象；
+
+3，如果请求带有参数，对于get请求可直接在URL中加上参数请求，或者使用setParam(HetpParams params)方法设置参数，
+   对于HttpPost请求，可使用setParam(HetpParams params)方法或者调用setEntity(HttpEntity entity)方法设置参数；
+
+4，调用httpClient的execute(HttpUriRequest request)执行请求，返回结果是一个response对象；
+
+5，通过response的getHeaders(String name)或getAllHeaders()可获得请求头部信息，getEntity()方法获取HttpEntity对象，该对象包装了服务器的响应内容。
+
+实例：
+
+使用了property文件来保存不同API对应的链接，也可以除去properties文件的读取代码，直接将变量
+API换成所需URL
+ */
+public class APIUtil {
+    /**
+     * 返回API调用结果
+     * @param APIName 接口在api.properties中的名称
+     * @param params 访问api所需的参数及参数值
+     * @return 此处返回的是JSON格式的数据
+     */
+    public static String API(String APIName, Map<String, Object> params) {
+        String content = "";
+        //请求结果
+        CloseableHttpResponse response = null;
+        //实例化httpclient
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+
+        try {
+            //读取配置文件的URL
+            Properties properties = new Properties();
+            URL fileURL = APIUtil.class.getClassLoader().getResource("api.properties");
+            properties.load(new FileInputStream(new File(fileURL.getFile())));
+            String API = properties.getProperty(APIName);
+            //构造url请求
+            StringBuilder url = new StringBuilder(API);
+            if(params!=null && params.size()>0) { //通过路径带过去
+                url.append("?");
+                for(Map.Entry<String, Object> entry : params.entrySet()) {
+                    url.append(entry.getKey()+"="+entry.getValue()+"&");
+                }
+                url.substring(0, url.length()-1);
+            }
+            //实例化POST方法
+            HttpPost httpPost = new HttpPost(url.toString());
+//            httpPost.setEntity();
+            //实例化get方法
+            HttpGet httpget = new HttpGet(url.toString());
+            //执行get请求
+            response = httpclient.execute(httpget);
+            if(response.getStatusLine().getStatusCode()==200) {
+                content = EntityUtils.toString(response.getEntity(),"utf-8");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return content;
+    }
+}

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

@@ -138,4 +138,26 @@ public class DataChange {
         long s = (between / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
         return day + "天"+  + hour+ "时" + min + "分"  + s + "秒";
     }
+
+    /**
+     * 生成带时间的八位数顺序号
+     * @param start 前缀
+     * @param id 顺序号  主键Id
+     * @return
+     */
+    public static String generateEightDigitsNumber(String start, Integer id){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
+        sb.append(
+                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
+        );
+        return sb.toString();
+    }
 }

src/main/resources/api.properties

@@ -0,0 +1 @@
+mg=https://www.baidu.com

src/main/resources/bootstrap.yml

@@ -23,7 +23,8 @@ openfeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   WmsBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
-
+  WMSFeign:
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
 
 
 #eureka设置

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

@@ -100,4 +100,14 @@
         from
             RMS_PORT RP
     </select>
+
+<!--   查询所有的月天 -->
+    <select id="getPlatformId" resultType="java.util.Map">
+        select
+            RPP.PLATFORM_ID "id",
+            RPP.PLATFORM_ID "value",
+            RPP. PLATFORM_NAME "label"
+        from
+            RMS_PWAREHOUSE_PLATFORM RPP
+    </select>
 </mapper>

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

@@ -21,24 +21,25 @@
         <result column="ORDER_LINE_SEQUENCE" jdbcType="DECIMAL" property="orderLineSequence" />
         <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
         <result column="ORDER_ENTRY_TIME" jdbcType="TIMESTAMP" property="orderEntryTime" />
+        <result column="DRIVER_CAPACITY_ID" jdbcType="DECIMAL" property="driverCapacityId" />
     </resultMap>
     <sql id="columns">
         ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS, 
     ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE, 
-    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME
+    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID
     </sql>
     <sql id="columns_alias">
         t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS, 
     t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME
+    t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.DRIVER_CAPACITY_ID
     </sql>
     <sql id="select">
-        SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER
+        SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER t
+        SELECT <include refid="columns_alias" /> FROM OMSTRUCK_ORDER t
     </sql>
     <sql id="where">
         <where>
@@ -99,6 +100,9 @@
             <if test="orderEntryTime != null">
                 and TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = #{orderEntryTime}
             </if>
+            <if test="driverCapacityId != null">
+                and DRIVER_CAPACITY_ID = #{driverCapacityId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -160,6 +164,9 @@
             <if test="orderEntryTime != null">
                 and TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = #{orderEntryTime}
             </if>
+            <if test="driverCapacityId != null">
+                and DRIVER_CAPACITY_ID = #{driverCapacityId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -223,6 +230,9 @@
         <if test="orderEntryTime != null">
             or TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = '#{orderEntryTime}'
         </if>
+        <if test="driverCapacityId != null">
+            or DRIVER_CAPACITY_ID = #{driverCapacityId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -231,14 +241,16 @@
                                     ORDER_STATUS, INSERT_USERNAME, INSERT_TIME,
                                     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                     DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
-                                    LINE_ID, ORDER_ENTRY_TIME)
+                                    LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID
+        )
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
                 #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
                 #{orderStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
-                #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP})
+                #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{driverCapacityId,jdbcType=DECIMAL}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -300,6 +312,9 @@
             <if test="orderEntryTime != null">
                 ORDER_ENTRY_TIME,
             </if>
+            <if test="driverCapacityId != null">
+                DRIVER_CAPACITY_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -359,6 +374,9 @@
             <if test="orderEntryTime != null">
                 #{orderEntryTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="driverCapacityId != null">
+                #{driverCapacityId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -380,7 +398,8 @@
             ORDER_TYPE = #{orderType,jdbcType=DECIMAL},
             ORDER_LINE_SEQUENCE = #{orderLineSequence,jdbcType=DECIMAL},
             LINE_ID = #{lineId,jdbcType=DECIMAL},
-            ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP}
+            ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
+            DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -440,20 +459,23 @@
             <if test="orderEntryTime != null">
                 ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="driverCapacityId != null">
+                DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into OMSTRUCK_ORDER
@@ -465,7 +487,8 @@
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
-        LINE_ID, ORDER_ENTRY_TIME)
+        LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.orderId,jdbcType=DECIMAL},
@@ -476,97 +499,102 @@
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
         #{item.deleted,jdbcType=DECIMAL}, #{item.orderType,jdbcType=DECIMAL}, #{item.orderLineSequence,jdbcType=DECIMAL},
-        #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP} from dual
+        #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.driverCapacityId,jdbcType=DECIMAL}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update OMSTRUCK_ORDER
         set
         ORDER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_PLAN_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderPlanId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_NUMBER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderNumber,jdbcType=VARCHAR}
         </foreach>
         ,CAPACITY_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_ISSUE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderIssueTime,jdbcType=TIMESTAMP}
         </foreach>
         ,ORDER_RECEIVE_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveStatus,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_RECEIVE_REFUSE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveRefuseTime,jdbcType=TIMESTAMP}
         </foreach>
         ,ORDER_COMMUNICATION_DURATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderCommunicationDuration,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderStatus,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_TYPE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderType,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_LINE_SEQUENCE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderLineSequence,jdbcType=DECIMAL}
         </foreach>
         ,LINE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_ENTRY_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderEntryTime,jdbcType=TIMESTAMP}
         </foreach>
+        ,DRIVER_CAPACITY_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverCapacityId,jdbcType=DECIMAL}
+        </foreach>
         where ORDER_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.orderId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from OMSTRUCK_ORDER
         where ORDER_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -1091,14 +1119,15 @@
     </select>
 
     <!--  通过运输订单号查询各路段预设作业点 以及总实绩ID -->
-    <select id="getPointIdByOrderNum" parameterType="string" resultType="java.util.Map">
+    <select id="getPointIdByOrderNum" parameterType="java.util.Map" resultType="java.util.Map">
         select
             RL.LINE_START_NODE_ID "lineStartNodeId",
             RL.LINE_END_NODE_ID     "lineEndNodeId",
             RLS1.SEGMENT_END_NODE_ID "truckCalculateIdMao",
             RLS2.SEGMENT_END_NODE_ID "truckCalculateIdPi",
             RLS3.SEGMENT_END_NODE_ID "resultUnloadPlaceId",
-            TTR.RESULT_TOTAL_ID "resultTotalId"
+            TTR.RESULT_TOTAL_ID "resultTotalId",
+            OO.ORDER_TYPE "orderType"
 
         from OMSTRUCK_ORDER OO
                  left join RMS_LINE RL
@@ -1116,7 +1145,13 @@
                  left join RMS_LINE_SEGEMNT RLS3 --查询卸货点
                            on RL.LINE_ID = RLS3.LINE_ID and RLS3.SEGMENT_END_NODE_TYPE = 3
 
-            where OO.ORDER_NUMBER = #{orderNumber}
+            where
+                  <if test="orderNumber != null">
+                      OO.ORDER_NUMBER = #{orderNumber}
+                  </if>
+                  <if test="orderId != null">
+                      OO.ORDER_ID = #{orderId}
+                  </if>
     </select>
 
 <!--  查询运输派单信息  -->
@@ -1240,4 +1275,59 @@
         </if>
     </select>
 
+    <!--根据id查找用户名    -->
+    <select id="selectPersonNameByPersonnelId" resultType="java.lang.String" parameterType="java.lang.Integer">
+        select RP.PERSONNEL_NAME "personnelName"
+        from  RMS_PERSONNEL RP
+        where RP.PERSONNEL_ID=#{personnelId}
+    </select>
+    <!--   通过车序号查找物资id -->
+    <select id="selectMaterialIdBysaleOrderMaterialId" resultType="java.util.Map"  parameterType="java.lang.Integer">
+        SELECT
+            ASTM.MATERIAL_ID "materialId"
+        FROM
+            AMS_SALE_ORDER_MATERIAL ASOM
+                LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.TRUCKNO_MATERIAL_ID
+        WHERE
+            ASOM.SALE_ORDER_MATERIAL_ID =#{saleOrderMaterialId}
+    </select>
+    <!--查询司机排班信息-->
+    <select id="selectCapacityAndDriver" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        RDC.CAPACITY_ID "capacityId",
+        RC.CAPACITY_NUMBER "number",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+        RCD.DRIVER_NAME "name"
+
+        FROM
+        RMS_DRIVER_CAPACITY RDC
+        LEFT JOIN RMS_CAPACITY RC ON RDC.CAPACITY_ID = RC.CAPACITY_ID
+        LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_CAR_DRIVER RCD ON RCD.DRIVER_ID = RDC.DRIVER_ID
+        WHERE
+        RC.CAPACITY_STATUS =0
+        <where>
+            <if test="capacityId != null">
+                <foreach collection="capacityId" item="item" open="(" separator="or" close=")">
+                    "capacityId" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="number != null">
+                <foreach collection="number" item="item" open="(" separator="or" close=")">
+                    "number" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityTypeName != null">
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="name != null">
+                <foreach collection="name" item="item" open="(" separator="or" close=")">
+                    "name" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+
+    </select>
 </mapper>

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

@@ -12,14 +12,17 @@
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="MATERIAL_DIRECTION" jdbcType="DECIMAL" property="materialDirection" />
   </resultMap>
   <sql id="columns">
     ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    MATERIAL_DIRECTION
   </sql>
   <sql id="columns_alias">
     t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.MATERIAL_DIRECTION
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER_MATERIAL
@@ -28,7 +31,7 @@
     SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER_MATERIAL t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="orderMaterialId != null">
         and ORDER_MATERIAL_ID = #{orderMaterialId}
       </if>
@@ -59,10 +62,13 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="materialDirection != null">
+        and MATERIAL_DIRECTION = #{materialDirection}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="orderMaterialId != null">
         and ORDER_MATERIAL_ID = #{orderMaterialId}
       </if>
@@ -93,6 +99,9 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
+      <if test="materialDirection != null">
+        and MATERIAL_DIRECTION = #{materialDirection}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -101,44 +110,49 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from OMSTRUCK_ORDER_MATERIAL
-    where 1!=1 
-      <if test="orderId != null">
-        or ORDER_ID = #{orderId}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="orderMaterialNumber != null">
-        or ORDER_MATERIAL_NUMBER = #{orderMaterialNumber}
-      </if>
-      <if test="orderMaterialWeight != null">
-        or ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
+    where 1!=1
+    <if test="orderId != null">
+      or ORDER_ID = #{orderId}
+    </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
+    <if test="orderMaterialNumber != null">
+      or ORDER_MATERIAL_NUMBER = #{orderMaterialNumber}
+    </if>
+    <if test="orderMaterialWeight != null">
+      or ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="materialDirection != null">
+      or MATERIAL_DIRECTION = #{materialDirection}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
-    insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, 
-      ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, 
-      #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+    insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
+                                         ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
+                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION
+    )
+    values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
+            #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
+            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -173,6 +187,9 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="materialDirection != null">
+        MATERIAL_DIRECTION,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderMaterialId != null">
@@ -205,19 +222,23 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="materialDirection != null">
+        #{materialDirection,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     update OMSTRUCK_ORDER_MATERIAL
     set ORDER_ID = #{orderId,jdbcType=DECIMAL},
-      MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      ORDER_MATERIAL_NUMBER = #{orderMaterialNumber,jdbcType=DECIMAL},
-      ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight,jdbcType=DECIMAL},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+        ORDER_MATERIAL_NUMBER = #{orderMaterialNumber,jdbcType=DECIMAL},
+        ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight,jdbcType=DECIMAL},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL}
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -250,6 +271,9 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="materialDirection != null">
+        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
+      </if>
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
@@ -266,78 +290,83 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into OMSTRUCK_ORDER_MATERIAL 
-      (ORDER_MATERIAL_ID, 
-      ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, 
-      ORDER_MATERIAL_WEIGHT, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.orderMaterialId,jdbcType=DECIMAL}, 
-      #{item.orderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.orderMaterialNumber,jdbcType=DECIMAL}, 
-      #{item.orderMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
+    insert into OMSTRUCK_ORDER_MATERIAL
+    (ORDER_MATERIAL_ID,
+    ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER,
+    ORDER_MATERIAL_WEIGHT, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    MATERIAL_DIRECTION)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.orderMaterialId,jdbcType=DECIMAL},
+    #{item.orderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.orderMaterialNumber,jdbcType=DECIMAL},
+    #{item.orderMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.materialDirection,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update OMSTRUCK_ORDER_MATERIAL
-     set
-       ORDER_MATERIAL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialId,jdbcType=DECIMAL}
-       </foreach>
-       ,ORDER_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,ORDER_MATERIAL_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialNumber,jdbcType=DECIMAL}
-       </foreach>
-       ,ORDER_MATERIAL_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialWeight,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-          when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where ORDER_MATERIAL_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.orderMaterialId,jdbcType=DECIMAL}
-     </foreach> 
+    update OMSTRUCK_ORDER_MATERIAL
+    set
+    ORDER_MATERIAL_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialId,jdbcType=DECIMAL}
+    </foreach>
+    ,ORDER_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
+    ,ORDER_MATERIAL_NUMBER=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialNumber,jdbcType=DECIMAL}
+    </foreach>
+    ,ORDER_MATERIAL_WEIGHT=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,MATERIAL_DIRECTION=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialDirection,jdbcType=DECIMAL}
+    </foreach>
+    where ORDER_MATERIAL_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.orderMaterialId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
-    where ORDER_MATERIAL_ID in 
+    where ORDER_MATERIAL_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
+
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <sql id="orderBy">

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

@@ -565,6 +565,7 @@
   <select id="selectEnFactoryResultId" parameterType="string" resultType="java.util.Map">
     select  TER.RESULT_ID "resultId",
             OO.ORDER_ID "orderId",
+            OO.ORDER_TYPE "orderTypee", --避免与筛选条件重名
             TER.RESULT_TOTAL_ID "resultTotalId"
     from OMSTRUCK_ORDER OO
            left join TMSTRUCK_TOTAL_RESULT TTR

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

@@ -555,7 +555,9 @@
     <select id="selectResultId" parameterType="string" resultType="java.util.Map">
         select TLFR.RESULT_ID "resultId",
                OO.ORDER_ID "orderId",
-               OO.CAPACITY_ID "capacityId"
+               OO.CAPACITY_ID "capacityId",
+               OO.ORDER_TYPE "orderType",
+               TTR.RESULT_TOTAL_ID "resultTotalId"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID
@@ -563,4 +565,36 @@
                            on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
+
+    <!--销售物流查询所有的出厂实绩-->
+    <select id="selectAllLeaveFacatoryForSale" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    TLFR.RESULT_ID "resultId",
+                    ARD.DAYPLAN_NO "dayplanNo",
+                    RM.MATERIAL_NAME "materialName",
+                    OO.ORDER_NUMBER "orderNumber",
+                    RC.CAPACITY_NUMBER "capacityNumber",
+                    RG.GATEPOST_NAME "gatepostName",
+                    ARD.DAYPLAN_MATERIAL_WEIGHT "materialWeight",
+                    TLFR.RESULT_OUT_MODE "resultOutMode",
+                    TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
+                    TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture"
+                FROM
+                    TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+                        LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_ID
+
+                        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+                        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                        LEFT JOIN RMS_GATEPOST RG ON RG.GATEPOST_ID = TLFR.GATEPOST_ID
+                        LEFT JOIN AMSTRUCK_RAIL_DAYPLAN  ARD ON ARD.DAYPLAN_ID=OO.ORDER_PLAN_ID
+                WHERE
+                    RESULT_OUT_GATE_TIME IS NOT NULL
+            )
+    </select>
 </mapper>

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

@@ -20,18 +20,19 @@
     <result column="STATUS" jdbcType="DECIMAL" property="status" />
     <result column="RESULT_MEASURED_TONNAGE" jdbcType="DECIMAL" property="resultMeasuredTonnage" />
     <result column="LOADING_ID" jdbcType="DECIMAL" property="loadingId" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
   </resultMap>
   <sql id="columns">
     RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION, 
     LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE, 
-    LOADING_ID
+    LOADING_ID, MATERIAL_ID
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_LOAD_START_TIME, t.RESULT_LOAD_END_TIME, 
     t.RESULT_LOAD_DURATION, t.LOAD_STANDARD_TIME_ID, t.LOADER_ID, t.RESULT_ISCLEAR, t.DELETE_NAME, 
     t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_MEASURED_TONNAGE, t.LOADING_ID
+    t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_MEASURED_TONNAGE, t.LOADING_ID, t.MATERIAL_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRUCK_LOAD_RESULT
@@ -95,6 +96,9 @@
       <if test="loadingId != null">
         and LOADING_ID = #{loadingId}
       </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -153,6 +157,9 @@
       <if test="loadingId != null">
         and LOADING_ID = #{loadingId}
       </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -213,6 +220,9 @@
     <if test="loadingId != null">
       or LOADING_ID = #{loadingId}
     </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
     insert into TMSTRUCK_LOAD_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME,
@@ -221,14 +231,14 @@
                                       DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
                                       INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                       INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
-                                      LOADING_ID)
+                                      LOADING_ID, MATERIAL_ID)
     values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultLoadStartTime,jdbcType=TIMESTAMP},
             #{resultLoadEndTime,jdbcType=TIMESTAMP}, #{resultLoadDuration,jdbcType=DECIMAL},
             #{loadStandardTimeId,jdbcType=DECIMAL}, #{loaderId,jdbcType=DECIMAL}, #{resultIsclear,jdbcType=VARCHAR},
             #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR},
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL}, #{resultMeasuredTonnage,jdbcType=DECIMAL},
-            #{loadingId,jdbcType=DECIMAL})
+            #{loadingId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
     insert into TMSTRUCK_LOAD_RESULT
@@ -287,6 +297,9 @@
       <if test="loadingId != null">
         LOADING_ID,
       </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -343,6 +356,9 @@
       <if test="loadingId != null">
         #{loadingId,jdbcType=DECIMAL},
       </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
@@ -363,7 +379,8 @@
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
         STATUS = #{status,jdbcType=DECIMAL},
         RESULT_MEASURED_TONNAGE = #{resultMeasuredTonnage,jdbcType=DECIMAL},
-        LOADING_ID = #{loadingId,jdbcType=DECIMAL}
+        LOADING_ID = #{loadingId,jdbcType=DECIMAL},
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
@@ -420,6 +437,9 @@
       <if test="loadingId != null">
         LOADING_ID = #{loadingId,jdbcType=DECIMAL},
       </if>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -445,7 +465,7 @@
     INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
-    LOADING_ID)
+    LOADING_ID, MATERIAL_ID)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -456,7 +476,7 @@
     #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
     #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.status,jdbcType=DECIMAL}, #{item.resultMeasuredTonnage,jdbcType=DECIMAL},
-    #{item.loadingId,jdbcType=DECIMAL} from dual
+    #{item.loadingId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -534,6 +554,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingId,jdbcType=DECIMAL}
     </foreach>
+    ,MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.resultId,jdbcType=DECIMAL}
@@ -549,16 +573,13 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-  <sql id="orderByResultLoadStartTime">
+  <sql id="orderBy">
     <if test="orderField != null and orderField != ''">
       order by "${orderField}"
       <if test="orderType != null and orderType != ''">
         ${orderType}
       </if>
     </if>
-    <if test="orderField == null  ">
-      order by "resultLoadStartTime" desc
-    </if>
   </sql>
 
 <!--  获取所有装车实绩  -->
@@ -648,7 +669,10 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderByResultLoadStartTime"></include>
+    <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "resultLoadStartTime" desc
+    </if>
   </select>
 
 
@@ -674,4 +698,86 @@
     on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
     where OO.ORDER_ID = #{orderId}
   </select>
+
+  <!--通过运输订单号查找运输订单类型-->
+  <select id="selectOrderTypeByOrderNumber" resultType="java.lang.Integer" parameterType="java.lang.String">
+    select OO.ORDER_TYPE "orderType"
+    from   OMSTRUCK_ORDER OO
+    where   OO.ORDER_NUMBER=#{oderNumber}
+  </select>
+
+  <!-- 根据运输订单号查找 -->
+  <select id="selectResultIdByOrderNumber" resultType="java.lang.Integer" parameterType="java.lang.String">
+    select  WOSR.RESULT_ID  "resultId"
+
+    from   OMSTRUCK_ORDER OO
+             left join WMSP_OUTBOUND_RESULT WOR
+                       on OO.ORDER_ID=WOR.BILL_LADING_ID
+             left join WMSP_OUTBOUND_SCAN_RESULT WOSR
+                       on WOSR.OUTBOUND_RESULT_ID=WOR.RESULT_ID
+    WHERE OO.ORDER_NUMBER=#{orderNumber} and WOSR.RESULT_CHECK=1
+  </select>
+
+  <!-- 根据实绩id查找扫描时间 -->
+  <select id="selectLoadTimeByResultId" resultType="java.util.Map" parameterType="java.lang.Integer">
+    select WOSR.RESULT_LOAD_TIME "loadTime"
+    from WMSP_OUTBOUND_SCAN_RESULT WOSR
+    where WOSR.RESULT_ID=#{resultId}
+  </select>
+
+  <!-- 根据扫描实绩id查询装卸工id -->
+  <select id="selecLoadIdByresultId" resultType="java.lang.Integer">
+    select WOSR.LOAD_ID "loadId"
+    from WMSP_OUTBOUND_SCAN_RESULT WOSR
+    where WOSR.RESULT_ID=#{resultId}
+  </select>
+
+  <!-- 销售装车实绩查询-->
+  <select id="selectLoadResultForSale" resultType="java.util.Map" parameterType="java.lang.Integer">
+    SELECT
+      ( SELECT ORDER_MATERIAL_NUMBER FROM OMSTRUCK_ORDER_MATERIAL OOM WHERE OOM.ORDER_ID = OO.ORDER_ID AND TLR.MATERIAL_ID = OOM.MATERIAL_ID ) "orderMaterialNumber",
+      TLR.RESULT_LOAD_START_TIME "startTime",
+      TLR.RESULT_LOAD_END_TIME "endTime",
+      TLR.RESULT_LOAD_DURATION "loadDuration",
+      RM.MATERIAL_NAME "materialName",
+      RP.PERSONNEL_NAME "name",
+      RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+      OO.ORDER_NUMBER "orderNumber",
+      ASO.SALE_NUMBER "saleNumber",
+      RC.CAPACITY_NUMBER "capacityNumber"
+    FROM
+      TMSTRUCK_LOAD_RESULT TLR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN RMS_MATERIAL_STEEL RMS ON RMS.MATERIAL_STEEL_ID = TLR.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = RMS.MATERIAL_ID
+        LEFT JOIN RMS_PERSONNEL RP ON TLR.LOADER_ID = RP.PERSONNEL_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+    where  TLR.STATUS = #{status} and OO.ORDER_TYPE=1
+  </select>
+
+  <!--通过运输订单号查找物资id-->
+  <select id="selectMaterialIdByOrderNumber" parameterType="java.lang.String" resultType="java.util.Map">
+    SELECT
+      OOM.MATERIAL_ID "materialId"
+    FROM
+      OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+    WHERE
+      OO.ORDER_NUMBER = #{orderNumber}
+  </select>
+
+<!--  通过订单ID 和物资Id 查询装车实绩ID 可能会有多条-->
+  <select id="getLoadResultIdList" parameterType="java.util.Map" resultType="java.lang.Integer">
+    select TLR.RESULT_ID
+    from OMSTRUCK_ORDER OO
+    left join TMSTRUCK_TOTAL_RESULT TTR
+    on TTR.ORDER_ID = OO.ORDER_ID
+    left join TMSTRUCK_LOAD_RESULT TLR
+    on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    where OO.ORDER_ID = #{orderId} and TLR.MATERIAL_ID = #{materialId}
+  </select>
+
 </mapper>

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

@@ -281,7 +281,7 @@
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from TMSTRUCK_MEASURE_COMMISSION
-    where COMMSSION_ID in 
+    where COMMSSION_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -297,36 +297,51 @@
         ${orderType}
       </if>
     </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
   </sql>
 
-  <!--  查询计量委托实绩 -->
-  <select id="getAllMeasureCommission" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+  <!--  通过总实绩ID 和 计量类型 查询计量委托实绩 -->
+  <select id="getMeasureCommission" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select
            TMC.COMMSSION_ID          "commssionId",
-           APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
+           <if test="orderTypee = 3">
+             APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
+             RS3.SUPPLIER_NAME          "supplierName",
+           </if>
+           <if test="orderTypee = 1">
+             ASO.SALE_NUMBER "saleNumber",
+             RS1.SHIPPER_NAME "shipperName",
+           </if>
+           RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
            RM.MATERIAL_NAME          "materialName",
            OO.ORDER_NUMBER           "orderNumber",
            RC.CAPACITY_NUMBER        "capacityNumber",
-           RS.SUPPLIER_NAME          "supplierName",
            RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
            OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
            OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
            TMC.COMMSSION_TYPE        "commssionType",
+
            TMC.INSERT_TIME           "insertTime"
     from TMSTRUCK_MEASURE_COMMISSION TMC
            left join TMSTRUCK_TOTAL_RESULT TTR
                      on TMC.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
            left join OMSTRUCK_ORDER OO
                      on OO.ORDER_ID = TTR.ORDER_ID
-           left join AMS_PURCHASE_ORDER APO
-                     on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-           left join DIL_BATCH DB
-                     on DB.BATCH_ID = APO.BATCH_ID
-           left join RMS_CAPACITY RC
-                     on RC.CAPACITY_ID = OO.CAPACITY_ID
+           <if test="orderTypee = 3">
+                left join AMS_PURCHASE_ORDER APO
+                    on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                left join RMS_SUPPLIER RS3 -- 发货单位
+                    on RS3.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                left join RMS_CONSIGNEE RCON -- 收货单位
+                    on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+           </if>
+           <if test="orderTypee = 1">
+                left join AMS_SALE_ORDER ASO
+                    on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+                left join RMS_SHIPPER RS1 -- 发货单位
+                    on RS1.SHIPPER_ID = ASO.SHIPPER_ID
+                left join RMS_CONSIGNEE RCON -- 收货单位
+                    on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+           </if>
            <if test="type == 0"> --计皮
              left join TMSTRUCK_WEIGHT_RESULT TWR
                        on TWR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
@@ -339,20 +354,29 @@
              left join RMS_TRUCK_CALCULATE RTC
                        on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
            </if>
-
+           left join RMS_CAPACITY RC
+           on RC.CAPACITY_ID = OO.CAPACITY_ID
            left join OMSTRUCK_ORDER_MATERIAL OOM
                      on OOM.ORDER_ID = OO.ORDER_ID
            left join RMS_MATERIAL RM
                      on RM.MATERIAL_ID = OOM.MATERIAL_ID
-           left join RMS_SUPPLIER RS
-                     on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-           where TMC.COMMSSION_TYPE = #{type}
+           where TMC.COMMSSION_TYPE = #{type} and TTR.RESULT_TOTAL_ID = #{resultTotalId}
     <where>
       <if test="purchaseOrderNo != null">
         <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
           "purchaseOrderNo" like '%${item}%'
         </foreach>
       </if>
+      <if test="shipperName != null">
+        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+          "shipperName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
       <if test="materialName != null">
         and
         <foreach collection="materialName" item="item" open="(" separator="or" close=")">
@@ -397,6 +421,9 @@
       </if>
     </where>
     <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
   </select>
 
 </mapper>

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

@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmstruckReturnResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckReturnResult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, RESULT_TOTAL_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.RESULT_TOTAL_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSTRUCK_RETURN_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSTRUCK_RETURN_RESULT t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSTRUCK_RETURN_RESULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRUCK_RETURN_RESULT
+    where 1!=1
+      <if test="resultTotalId != null">
+        or RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckReturnResult">
+    insert into TMSTRUCK_RETURN_RESULT (RESULT_ID, RESULT_TOTAL_ID, INSERT_USERNAME,
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+      INSERT_UPDATE_REMARK)
+    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckReturnResult">
+    insert into TMSTRUCK_RETURN_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTotalId != null">
+        #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckReturnResult">
+    update TMSTRUCK_RETURN_RESULT
+    set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckReturnResult">
+    update TMSTRUCK_RETURN_RESULT
+    <set>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSTRUCK_RETURN_RESULT
+      (RESULT_ID,
+      RESULT_TOTAL_ID, INSERT_USERNAME,
+      INSERT_TIME, UPDATE_USERNAME,
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.resultId,jdbcType=DECIMAL},
+      #{item.resultTotalId,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       from dual
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRUCK_RETURN_RESULT
+     set
+       RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TOTAL_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where RESULT_ID in
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRUCK_RETURN_RESULT
+    where RESULT_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+<!-- 通过运输订单号查询总实绩ID -->
+  <select id="getResultTotalIdByOrderNumber" parameterType="string" resultType="java.util.Map">
+    select TTR.RESULT_TOTAL_ID "resultTotalId",
+           OO.ORDER_ID "orderId"
+    from OMSTRUCK_ORDER OO
+           left join TMSTRUCK_TOTAL_RESULT TTR
+                     on TTR.ORDER_ID = OO.ORDER_ID
+  </select>
+
+<!-- 通过运输订单ID查询上一个订单的信息 -->
+  <select id="getOldOrderMesById" parameterType="java.math.BigDecimal" resultType="com.steerinfo.dil.model.OmstruckOrder">
+    select  OO.ORDER_TYPE "orderType",
+            OO.ORDER_PLAN_ID "orderPlanId",
+            OO.LINE_ID "lineId",
+            OO.CAPACITY_ID "capacityId",
+            OO.DRIVER_CAPACITY_ID "driverCapacityId",
+            OO.ORDER_ENTRY_TIME "orderEntryTime",
+            OO.ORDER_ISSUE_TIME "orderIssueTime",
+            OO.ORDER_RECEIVE_STATUS "orderReceiveStatus",
+            OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+            OO.ORDER_COMMUNICATION_DURATION "orderCommunicationDuration"
+    from OMSTRUCK_ORDER OO
+    where OO.ORDER_ID = #{orderId}
+  </select>
+
+  <!-- 通过运输订单Id查询查询上一个订单子表的信息 -->
+  <select id="getOldOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="com.steerinfo.dil.model.OmstruckOrderMaterial">
+      select OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+             OOM.MATERIAL_ID "materialId",
+             OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber"
+      from OMSTRUCK_ORDER_MATERIAL OOM
+      where OOM.ORDER_ID = #{orderId}
+  </select>
+
+
+</mapper>

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

@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmstruckSmsRusultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckSmsRusult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
+    <result column="SENDER_ID" jdbcType="DECIMAL" property="senderId" />
+    <result column="RESULT_SENDING_TIME" jdbcType="TIMESTAMP" property="resultSendingTime" />
+    <result column="RESULT_SMS_CONTENT" jdbcType="VARCHAR" property="resultSmsContent" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, TOTAL_RESULT_ID, SENDER_ID, RESULT_SENDING_TIME, RESULT_SMS_CONTENT, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.TOTAL_RESULT_ID, t.SENDER_ID, t.RESULT_SENDING_TIME, t.RESULT_SMS_CONTENT, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSTRUCK_SMS_RUSULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSTRUCK_SMS_RUSULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="senderId != null">
+        and SENDER_ID = #{senderId}
+      </if>
+      <if test="resultSendingTime != null">
+        and TO_CHAR(RESULT_SENDING_TIME,'yyyy-MM-dd') = #{resultSendingTime}
+      </if>
+      <if test="resultSmsContent != null and resultSmsContent != ''">
+        and RESULT_SMS_CONTENT = #{resultSmsContent}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="senderId != null">
+        and SENDER_ID = #{senderId}
+      </if>
+      <if test="resultSendingTime != null">
+        and TO_CHAR(RESULT_SENDING_TIME,'yyyy-MM-dd') = #{resultSendingTime}
+      </if>
+      <if test="resultSmsContent != null and resultSmsContent != ''">
+        and RESULT_SMS_CONTENT LIKE '%${resultSmsContent}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSTRUCK_SMS_RUSULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRUCK_SMS_RUSULT
+    where 1!=1 
+      <if test="totalResultId != null">
+        or TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="senderId != null">
+        or SENDER_ID = #{senderId}
+      </if>
+      <if test="resultSendingTime != null">
+        or TO_CHAR(RESULT_SENDING_TIME,'yyyy-MM-dd') = '#{resultSendingTime}'
+      </if>
+      <if test="resultSmsContent != null and resultSmsContent != ''">
+        or RESULT_SMS_CONTENT = #{resultSmsContent}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckSmsRusult">
+    insert into TMSTRUCK_SMS_RUSULT (RESULT_ID, TOTAL_RESULT_ID, SENDER_ID, 
+      RESULT_SENDING_TIME, RESULT_SMS_CONTENT, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{senderId,jdbcType=DECIMAL}, 
+      #{resultSendingTime,jdbcType=TIMESTAMP}, #{resultSmsContent,jdbcType=VARCHAR}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckSmsRusult">
+    insert into TMSTRUCK_SMS_RUSULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID,
+      </if>
+      <if test="senderId != null">
+        SENDER_ID,
+      </if>
+      <if test="resultSendingTime != null">
+        RESULT_SENDING_TIME,
+      </if>
+      <if test="resultSmsContent != null">
+        RESULT_SMS_CONTENT,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="totalResultId != null">
+        #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="senderId != null">
+        #{senderId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultSendingTime != null">
+        #{resultSendingTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultSmsContent != null">
+        #{resultSmsContent,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckSmsRusult">
+    update TMSTRUCK_SMS_RUSULT
+    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      SENDER_ID = #{senderId,jdbcType=DECIMAL},
+      RESULT_SENDING_TIME = #{resultSendingTime,jdbcType=TIMESTAMP},
+      RESULT_SMS_CONTENT = #{resultSmsContent,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckSmsRusult">
+    update TMSTRUCK_SMS_RUSULT
+    <set>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="senderId != null">
+        SENDER_ID = #{senderId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultSendingTime != null">
+        RESULT_SENDING_TIME = #{resultSendingTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultSmsContent != null">
+        RESULT_SMS_CONTENT = #{resultSmsContent,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSTRUCK_SMS_RUSULT 
+      (RESULT_ID, 
+      TOTAL_RESULT_ID, SENDER_ID, RESULT_SENDING_TIME, 
+      RESULT_SMS_CONTENT, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultId,jdbcType=DECIMAL}, 
+      #{item.totalResultId,jdbcType=DECIMAL}, #{item.senderId,jdbcType=DECIMAL}, #{item.resultSendingTime,jdbcType=TIMESTAMP}, 
+      #{item.resultSmsContent,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRUCK_SMS_RUSULT
+     set
+       RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,TOTAL_RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+       </foreach>
+       ,SENDER_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.senderId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_SENDING_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultSendingTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_SMS_CONTENT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultSmsContent,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where RESULT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRUCK_SMS_RUSULT
+    where RESULT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+<!-- 根据运输订单号查找托运方 -->
+  <select id="selectShipperIdByOrderNumber" parameterType="java.lang.String" resultType="java.lang.Integer">
+    select RS.SHIPPER_ID "shipperId"
+    from OMSTRUCK_ORDER OO
+    left join AMSTRUCK_RAIL_DAYPLAN ARD
+    on OO.ORDER_PLAN_ID=ARD.DAYPLAN_ID
+    left join RMS_SHIPPER RS
+    on RS.SHIPPER_ID=ARD.SHIPMENT_UNIT_ID
+    where OO.ORDER_NUMBER=#{orderNumber}
+  </select>
+<!-- 根据运输订单号查找司机电话号码 -->
+  <select id="selectCarDriverByOrderNumber" parameterType="java.lang.String" resultType="java.lang.String">
+    select RCD.DRIVER_PHONE "driverPhone"
+    from OMSTRUCK_ORDER OO
+    left join RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+    left join RMS_DRIVER_CAPACITY RDC ON RDC.CAPACITY_ID=RC.CAPACITY_ID
+    left join RMS_CAR_DRIVER RCD ON RDC.DRIVER_ID = RCD.DRIVER_ID
+    where OO.ORDER_NUMBER=#{orderNumber}
+  </select>
+<!-- 查询短信实绩 -->
+  <select id="selectSmsResult" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT  RS.SHIPPER_NAME "shipperName",
+            TSR.RESULT_SENDING_TIME "sendIngTime",
+            TSR.RESULT_SMS_CONTENT "content"
+    from TMSTRUCK_SMS_RUSULT TSR
+    left join RMS_SHIPPER RS
+    on TSR.SENDER_ID=RS.SHIPPER_ID
+  </select>
+</mapper>

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

@@ -543,8 +543,10 @@
   <select id="selectTotalIdByOrderNo" parameterType="java.lang.String" resultType="java.util.Map">
     select
            OO.ORDER_ID "orderId",
+           OO.ORDER_TYPE "orderTypee",
            TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-           TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+           TWR.RESULT_GROSS_WEIGHT "grossWeight",
+           TWR.RESULT_TARE_WEIGHT "tareWeight",
            TTR.RESULT_TOTAL_ID "resultTotalId"
     from OMSTRUCK_ORDER OO
            left join TMSTRUCK_TOTAL_RESULT TTR
@@ -687,7 +689,7 @@
         on OOM.ORDER_ID = OO.ORDER_ID
     left join RMS_MATERIAL RM
     on RM.MATERIAL_ID = OOM.MATERIAL_ID
-        where RESULT_TARE_WEIGHT_TIME is not null
+        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
     )
     <where>
       <if test="purchaseOrderNo != null">
@@ -768,4 +770,18 @@
     </if>
   </select>
 
+<!-- 通过订单Id查询订单下所有的物资理重及件数 -->
+  <select id="getMaterialMes" parameterType="int" resultType="java.util.Map">
+    select
+           OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+           RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight"
+    from OMSTRUCK_ORDER OO
+    left join OMSTRUCK_ORDER_MATERIAL OOM
+    on OO.ORDER_ID = OOM.ORDER_ID
+    left join RMS_MATERIAL RM
+    on RM.MATERIAL_ID = OOM.MATERIAL_ID
+    left join RMS_MATERIAL_STEEL RMS
+    on RMS.MATERIAL_ID = RM.MATERIAL_ID
+    where OO.ORDER_ID = #{orderId}
+  </select>
 </mapper>