辅料修改

pom.xml

@@ -147,11 +147,11 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TMSTRUCK_ENFACTORY_RESULT</param>
-                        <param>TMSTRUCK_LOAD_RESULT</param>
-                        <param>TMSTRUCK_LEAVE_FACTORY_RESULT</param>
-                        <param>TMSTRUCK_UNLOAD_RESULT</param>
-                        <param>TMSTRUCK_WEIGHT_RESULT</param>
+<!--                        <param>TMSTRUCK_MEASURE_COMMISSION</param>-->
+<!--                        <param>TMSTRUCK_LOAD_RESULT</param>-->
+<!--                        <param>TMSTRUCK_LEAVE_FACTORY_RESULT</param>-->
+<!--                        <param>TMSTRUCK_UNLOAD_RESULT</param>-->
+<!--                        <param>TMSTRUCK_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -1,11 +1,13 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
+import com.steerinfo.dil.service.impl.TmstruckMeasureCommissionServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.route.service.impl.RouteServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
@@ -18,6 +20,9 @@ public class TestController extends BaseRESTfulController {
     private RouteServiceImpl routeService;
     @Autowired
     private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
+
+    @Autowired
+    TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
     @PostMapping("/savePath")
     public String savePath() throws Exception {
 
@@ -42,4 +47,9 @@ public class TestController extends BaseRESTfulController {
         mapValue.put("orderNumber",orderNumber);
         return routeService.fullPathVisualization(mapValue);
     }
+
+    @PostMapping("/addMao")
+    public int addMaoMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        return tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+    }
 }

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

@@ -64,7 +64,7 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
-                String index="get_receive_list";//设置要查询的索引名称
+                String index="get_receivee_list";//设置要查询的索引名称
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
             }
         }
@@ -75,7 +75,7 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
             allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
             Map<String, Object> map = new HashMap<>();
             //添加索引
-            map.put("index","get_receive_list");
+            map.put("index","get_receivee_list");
             //添加id
             map.put("indexId","receiveId");
             allReceiveResult.add(map);

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

@@ -1,11 +1,20 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckReturnResultService;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,10 +37,67 @@ public class TmstruckReturnResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckReturnResultService tmstruckReturnResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
     @ApiOperation(value = "新增退货实绩", notes = "需要运输订单号")
     @PostMapping(value = "/addReturnGoodsResult")
     public RESTfulResult addReturnGoodsResult(@RequestBody(required = false) Map<String, Object> map) {
         int i = tmstruckReturnResultService.addReturnGoodsResult(map);
         return success(i);
     }
+
+    @ApiOperation(value="查询所有的退货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllReturnResult")
+    public RESTfulResult getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con
+    ){
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_return_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllReturnResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            AllReturnResult = tmstruckReturnResultService.getAllReturnResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_return_list");
+            //添加id
+            map.put("indexId","returnId");
+            AllReturnResult.add(map);
+            //新建索引
+            esFeign.insertIndex(AllReturnResult);
+            //删除
+            AllReturnResult.remove(AllReturnResult.size()-1);
+        }
+        if(AllReturnResult == null)
+            AllReturnResult = tmstruckReturnResultService.getAllReturnResult(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> returnResult = tmstruckReturnResultService.getAllReturnResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllReturnResult,returnResult);
+        return success(pageList);
+    }
 }

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

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

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

@@ -46,4 +46,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
 
     //采购查询计毛
     Map<String, Object> selectMakesureTareForPurchase(Map<String, Object> map);
+
+    //采购辅料计量委托
+    Map<String, Object> purchaseMaoMeasure(Map<String, Object> map);
 }

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

@@ -27,4 +27,7 @@ public interface TmstruckReturnResultMapper extends IBaseMapper<TmstruckReturnRe
 
     //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
     Map<String, Object> getPointIdByOrderNum(Map<String, Object> map);
+
+    //查询辅料退货实绩
+    List<Map<String, Object>> getFLReturnResult(Map<String, Object> map);
 }

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

@@ -56,4 +56,13 @@ public interface UtilsMapper {
 
     //通过运输订单号查询总实绩ID
     BigDecimal getTotalIdByOrderNumber(String orderNumber);
+
+    //通过总实绩ID查找订单类型
+    Integer getOrderTypeByTotalId(BigDecimal resultTotalId);
+
+    //查询最大路段顺序号 以及当前订单路段顺序号（执行到哪一步）
+    Map<String, Object> getLineSeqAndOrderSeq(Map<String, Object> map);
+
+    //通过订单ID查询物资ID（针对单拼）
+    List<Integer> getMaterialIdByOrderId(BigDecimal orderId);
 }

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

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

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

@@ -130,10 +130,16 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     private BigDecimal isquality;
 
     /**
-     * 路段顺序号(SEGMENT_SQE,DECIMAL,0)
+     * 毛重路段顺序号(GROSS_SEGMENT_SQE,DECIMAL,0)
      */
-    @ApiModelProperty(value="路段顺序号",required=false)
-    private BigDecimal segmentSqe;
+    @ApiModelProperty(value="毛重路段顺序号",required=false)
+    private BigDecimal grossSegmentSqe;
+
+    /**
+     * 皮重路段顺序号(TARE_SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="皮重路段顺序号",required=false)
+    private BigDecimal tareSegmentSqe;
 
     private static final long serialVersionUID = 1L;
 
@@ -307,12 +313,20 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         this.isquality = isquality;
     }
 
-    public BigDecimal getSegmentSqe() {
-        return segmentSqe;
+    public BigDecimal getGrossSegmentSqe() {
+        return grossSegmentSqe;
+    }
+
+    public void setGrossSegmentSqe(BigDecimal grossSegmentSqe) {
+        this.grossSegmentSqe = grossSegmentSqe;
+    }
+
+    public BigDecimal getTareSegmentSqe() {
+        return tareSegmentSqe;
     }
 
-    public void setSegmentSqe(BigDecimal segmentSqe) {
-        this.segmentSqe = segmentSqe;
+    public void setTareSegmentSqe(BigDecimal tareSegmentSqe) {
+        this.tareSegmentSqe = tareSegmentSqe;
     }
 
     @Override
@@ -341,7 +355,8 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         sb.append(", materialId=").append(materialId);
         sb.append(", isdeduct=").append(isdeduct);
         sb.append(", isquality=").append(isquality);
-        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", grossSegmentSqe=").append(grossSegmentSqe);
+        sb.append(", tareSegmentSqe=").append(tareSegmentSqe);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -23,7 +23,7 @@ public interface ITmstruckMeasureCommissionService{
     List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map);
 
     //新增计量委托实绩 当进厂作业完成后
-    int addMeasureCommission(BigDecimal totalId, Integer type);
+    int addMeasureCommission(Map<String, Object> map, Integer type);
 
     //添加计毛委托
     int addMaoMeasureCommission(Map<String, Object> map);

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,4 +20,7 @@ import java.util.Map;
 public interface ITmstruckReturnResultService{
     //添加退货实绩
     int addReturnGoodsResult(Map<String, Object> map);
+
+    //查询退货实绩
+    List<Map<String, Object>> getAllReturnResult(Map<String, Object> map);
 }

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

@@ -20,14 +20,14 @@ public interface IUtilsService {
     //通过运力ID 修改运力状态
     int updateCapacityStatus(Map<String, Object> map, Integer status);
 
-    //修改运输订单状态
-    int updateOrderStatus(Map<String, Object> map, Integer status);
+    //正常关闭订单
+    int closeOrderNormally(Map<String, Object> map);
 
     //通过仓库名称查询仓库Id
     Integer queryWarehouseIdByName(String warehouseName);
 
     //用于更新路段顺序号
-    int updateOrderLineSequence(Map<String, Object> map, Integer num);
+    int updateOrderLineSequence(Map<String, Object> map);
 
     //通过月台名称查找月台Id platformName
     Integer queryPlatformIdByName(String platformName);
@@ -40,4 +40,7 @@ public interface IUtilsService {
 
     //通过总实绩Id查询订单Id
     Integer getOrderIdByTotalId(Integer resultTotalId);
+
+    //推送消息给websocket
+    void pushMesToWebsocket(String capacityNumber, String pushMes);
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -46,6 +47,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     @Autowired
     OmsFeign omsFeign;
 
+    @Autowired
+    UtilsMapper utilsMapper;
+
 
     /**
      * 派单时新增进厂实绩
@@ -56,15 +60,18 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     @Override
     public int addEnFactoryResult(Map<String, Object> map) {
         TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
         //生成进厂作业主键Id
         //添加主键
         tmstruckEnfactoryResult.setResultId(tmstruckEnfactoryResultMapper.selectMaxId());
-        //如果有门岗ID  添加门岗ID 路线起点就是进厂门岗
-        if(map.get("gatepostId") != null){
-            tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("gatepostId")));
+        //通过总实绩ID查询订单类型
+        Integer orderType = utilsMapper.getOrderTypeByTotalId(resultTotalId);
+        if(!"123".contains(orderType.toString())){
+            //通过物资计算门岗 (暂时定死)
+            tmstruckEnfactoryResult.setGatepostId(new BigDecimal(1));
         }
         //添加实绩总表Id
-        tmstruckEnfactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        tmstruckEnfactoryResult.setResultTotalId(resultTotalId);
         // 添加路段顺序号
         tmstruckEnfactoryResult.setSegmenSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
         return tmstruckEnfactoryResultMapper.insertSelective(tmstruckEnfactoryResult);
@@ -141,7 +148,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateEnFactoryResultByPDA(map); //添加进厂实绩
-        //发计毛委托 计算添加汽车衡
+        //路段顺序号 + 1
+        i += utilsService.updateOrderLineSequence(map);
         switch (orderType.intValue()){
             case 1:
             case 4:
@@ -188,15 +196,16 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
                 map.put("grossPlaceId", 3);
                 i += tmstruckWeightResultService.updateWeightResult(map);
-//                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
-                //路段顺序号 + 1
-                i += utilsService.updateOrderLineSequence(map, 2);
+                //通过物资ID查询物资Id
+                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialIdList.get(0));
+                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 10: // 采购内转（老区-厂内） 没有进厂
                 break;
             case 11:
         }
-        omsFeign.pushMesToWebsocket(map);
+        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;
     }
 

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

@@ -146,8 +146,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         String orderNumber = (String) map.get("orderNumber");
         String substring = orderNumber.substring(0, orderNumber.length() - 1);
         map.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(substring));
+        map.put("orderNumber", substring);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
+        //路段顺序号 + 1
+        i += utilsService.updateOrderLineSequence(map);
         switch (orderType.intValue()){
             case 1:
                 break;
@@ -162,7 +165,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 7:
             case 8:
             case 9:
-                i += utilsService.updateOrderStatus(map, 2); // 修改运输订单状态 2：已结束
+                //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
+                i += utilsService.closeOrderNormally(map);
+//                i += utilsService.updateOrderStatus(map); // 修改运输订单状态 2：已结束
 //                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
                 //采购出厂 通过feign调用新增详单
 //                try {
@@ -176,9 +181,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 break;
             case 11:
         }
-        //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map, 1);
-        omsFeign.pushMesToWebsocket(map);
+        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
         return i;
     }
 

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

@@ -1,16 +1,18 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.HTTPRequestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstruckMeasureCommission服务实现：
@@ -26,7 +28,7 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 @Service(value = "tmstruckMeasureCommissionService")
-public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCommissionService {
+public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCommissionService{
 
     @Autowired
     private TmstruckMeasureCommissionMapper tmstruckMeasureCommissionMapper;
@@ -75,11 +77,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addMaoMeasureCommission(Map<String, Object> map){
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        int i = addMeasureCommission(resultTotalId, 1); // 添加计毛委托
+        int i = addMeasureCommission(map, 1); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id
         map.put("type", 1);
-        sendMeasureCommissionMes(map);
+        i += sendMeasureCommissionMes(map);
         return i;
     }
 
@@ -89,11 +90,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addPiMeasureCommission(Map<String, Object> map){
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        int i = addMeasureCommission(resultTotalId, 0); // 添加计皮委托
+        int i = addMeasureCommission(map, 0); // 添加计皮委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id
         map.put("type", 0);
-        sendMeasureCommissionMes(map);
+        i += sendMeasureCommissionMes(map);
         return i;
     }
 
@@ -103,12 +103,21 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     @Override
-    public int addMeasureCommission(BigDecimal totalId, Integer type) {
+    public int addMeasureCommission(Map<String, Object> map, Integer type) {
         TmstruckMeasureCommission tmstruckMeasureCommission = new TmstruckMeasureCommission();
         //生成主键Id
         tmstruckMeasureCommission.setCommssionId(tmstruckMeasureCommissionMapper.selectMaxId());
+        //添加物资ID
+        tmstruckMeasureCommission.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        //添加汽车衡Id
+        if(map.get("grossPlaceId") != null){
+            tmstruckMeasureCommission.setCalculateId(DataChange.dataToBigDecimal(map.get("grossPlaceId")));
+        }
+        if(map.get("tarePlaceId") != null){
+            tmstruckMeasureCommission.setCalculateId(DataChange.dataToBigDecimal(map.get("tarePlaceId")));
+        }
         //添加实绩总表Id
-        tmstruckMeasureCommission.setResultTotalId(totalId);
+        tmstruckMeasureCommission.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //添加计量类型
         tmstruckMeasureCommission.setCommssionType(new BigDecimal(type));
         tmstruckMeasureCommission.setInsertTime(new Date());
@@ -123,7 +132,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  resultTotalId  总实绩ID
      */
-    public void sendMeasureCommissionMes(Map<String, Object> map){
+    public int sendMeasureCommissionMes(Map<String, Object> map){
         Map<String, Object> measureCommission = null;
         //查询计量委托
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
@@ -155,14 +164,56 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 8:
             case 9:
                 if(type == 0) {
-                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForPurchase(map);
+                    measureCommission =  tmstruckMeasureCommissionMapper.purchaseMaoMeasure(map);
+                    measureCommission.put("isRelationEAS", true);
+                    measureCommission.put("flowTo", "出厂");
+                    measureCommission.put("isDel", false);
+                    measureCommission.put("isInsert", true);
+                    measureCommission.put("IsAssembly", false);
+                    measureCommission.put("deliveryMethod", "磅重交货");
+                    measureCommission.put("packagesNum", 0);
                 }else {
-                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForPurchase(map);
+                    measureCommission =  tmstruckMeasureCommissionMapper.purchaseMaoMeasure(map);
+                    measureCommission.put("isRelationEAS", true);
+                    measureCommission.put("flowTo", "进厂");
+                    measureCommission.put("isDel", false);
+                    measureCommission.put("isInsert", true);
+                    measureCommission.put("IsAssembly", false);
+                    measureCommission.put("deliveryMethod", "磅重交货");
+                    measureCommission.put("packagesNum", 0);
                 }
-
         }
         /*访问接口发送数据*/
-        /********************************************/
+        return sendMesToMeasure(measureCommission);
     }
 
+    /**
+     * 访问计量接口方法
+     * @param map
+     * @return
+     */
+    public int sendMesToMeasure(Map<String, Object> map){
+        List<Map<String, Object>> sendMap = new ArrayList<>();
+        sendMap.add(map);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", sendMap);
+
+        String url = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
+        String jsonData = null;
+        try {
+            jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            boolean success = (boolean) hashMap.get("success");
+            System.out.println(hashMap.get("msg"));
+            if(success){
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

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

@@ -53,6 +53,8 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 
+
+
     /**
      * 添加常规字段
      * @param tmstruckReturnResult
@@ -90,6 +92,36 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
         return i;
     }
 
+    /**
+     * 查询退货实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllReturnResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+            case 2:
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                return tmstruckReturnResultMapper.getFLReturnResult(map); //apiId: 377
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+                break;
+        }
+        return null;
+    }
+
 
     /**
      * 重新新增销售运输订单

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

@@ -1,28 +1,15 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.OmsFeign;
-import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
-import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
-import com.steerinfo.dil.mapper.TmstruckUnloadResultMapper;
-import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
-import com.steerinfo.dil.model.TmstruckReceiptResult;
+import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.dil.service.ITmstruckUnloadResultService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.controller.RESTfulResult;
-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.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -63,6 +50,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     @Autowired
     OmsFeign omsFeign;
 
+    @Autowired
+    UtilsMapper utilsMapper;
     /**
      * 新增卸货实绩
      * 总实绩ID、卸货点
@@ -154,18 +143,25 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 9:
                 i += updateUnloadResultBy(map); //更新卸货实绩
                 //计算计皮汽车衡 (当前无法计算汽车衡)
-                map.put("tarePlaceId", 3);
+                map.put("tarePlaceId", 6);
                 i += tmstruckWeightResultService.updateWeightResult(map);
-//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
+                //通过物资ID查询物资Id
+                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialIdList.get(0));
+                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
             case 10:
                 break;
             case 11:
+                //判断出厂路段顺序号是否为最后一个
+                i += utilsService.closeOrderNormally(map);
 
         }
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map, 1);
+        i += utilsService.updateOrderLineSequence(map);
+        //卸货成功后推送消息给websocket
+        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
         return i;
     }
 
@@ -187,8 +183,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         }
         //获得卸货时间
-        tmstruckUnloadResult.setResultStartTime(new Date());
-        //扫码后确认卸货所以卸货状态码为  1 同意
+        tmstruckUnloadResult.setResultEndTime(new Date());
+        //扫码后确认卸货所以卸货状态码为  同意
         tmstruckUnloadResult.setUnloadStatus("同意");
         tmstruckUnloadResult.setInsertTime(new Date());
         tmstruckUnloadResult.setInsertUsername("admin");
@@ -220,15 +216,16 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         long l = time / 1000;
         //设置标准时长
         tmstruckUnloadResult.setResultDuration(new BigDecimal(l));
-        int i=tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
+        int i = tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
         return i;
-
     }
+
     //根据运输订单查找装车实绩id
     @Override
     public Map<String, Object> selectLoadResultIdByOrderNumber(String orderNumber) {
         return tmstruckUnloadResultMapper.selectUnloadResultIdByOrderNumber(orderNumber);
     }
+
     //内转物流新增卸车实绩
     @Override
     public int addUnloadresultForconverted(Map<String, Object> map) {

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

@@ -147,9 +147,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //添加是否需要扣水扣杂
         tmstruckWeightResult.setIsdeduct(DataChange.dataToBigDecimal(map.get("isdeduct")));
         // 添加物资Id (销售、内转到异地库）
-        tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        if(map.get("materialId") != null)
+            tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         // 添加路段顺序号
-        tmstruckWeightResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
+        if(map.get("grossSegmentSqe") != null) //毛重路段顺序号
+            tmstruckWeightResult.setGrossSegmentSqe(DataChange.dataToBigDecimal(map.get("grossSegmentSqe")));
+        if(map.get("tareSegmentSqe") != null) //皮重路段顺序号
+            tmstruckWeightResult.setTareSegmentSqe(DataChange.dataToBigDecimal(map.get("tareSegmentSqe")));
         return tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
     }
 
@@ -216,7 +220,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map, 1);
         omsFeign.pushMesToWebsocket(map);
         return i;
     }
@@ -323,7 +326,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map, 1);
+        i += utilsService.updateOrderLineSequence(map);
         return i;
     }
 
@@ -471,18 +474,18 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * 添加计量实绩
      * 传参样式：
      * {
-     *     "orderNumber":"WYSDD2021091000000002",
-     *      "resultTareCalculateNumber":"1号汽车衡",
-     *     "resultCrossCalculateNumber":"1号汽车衡",
-     *      "resultTareWeight":40.00,
-     *     "resultCrossWeight":40.00,
-     *      "resultNetWeight":0,
-     *     "resultTareWeightTime":"2021-09-10 09:05:22",
-     *     "resultCrossWeightTime":"2021-09-10 09:05:22",
-     *     "resultNetWeightTime":"2021-09-10 09:05:22",
-     *     "resultPoundNo":"Bd123456780",
-     *      "materialId":40
-     *      --“IsAssembly”:”false”
+         "orderNumber":"WYSDD2021091000000002",
+         "resultTareCalculateNumber":"1号汽车衡",
+         "resultCrossCalculateNumber":"1号汽车衡",
+         "resultTareWeight":40.00,
+         "resultCrossWeight":40.00,
+         "resultNetWeight":0,
+         "resultTareWeightTime":"2021-09-10 09:05:22",
+         "resultCrossWeightTime":"2021-09-10 09:05:22",
+         "resultNetWeightTime":"2021-09-10 09:05:22",
+         "resultPoundNo":"Bd123456780",
+         "materialId":40
+          --“IsAssembly”:”false”
      * }
      * @param mapList
      * @return
@@ -497,6 +500,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             try {
                 TmstruckWeightResult tmstruckWeightResult = generateWeightResult(map);
                 count += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+                utilsService.pushMesToWebsocket((String) stringObjectMap.get("capacityNumber"), "计量");
             } catch (ParseException e) {
                 e.printStackTrace();
             }

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

@@ -1,16 +1,14 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIgnoredError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ author    :TXF
@@ -22,6 +20,8 @@ public class UtilsServiceImpl implements IUtilsService {
     @Autowired
     private UtilsMapper utilsMapper;
 
+    @Autowired
+    private IMFeign imFeign;
     /**
      * 查询运输订单ID主键
      * @return
@@ -54,12 +54,19 @@ public class UtilsServiceImpl implements IUtilsService {
 
     /**
      * 修改订单状态为结束
-     * @param map {orderId 订单Id
+     * @param map {orderId 订单Id 或运输订购单号
      * @return
      */
-    public int updateOrderStatus(Map<String, Object> map, Integer status){
-        map.put("orderStatus", status);
-        return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+    public int closeOrderNormally(Map<String, Object> map){
+        //查询订单路段顺序号以及查询路段顺序号
+        Map<String, Object> mesMap = utilsMapper.getLineSeqAndOrderSeq(map);
+        BigDecimal orderSeq = DataChange.dataToBigDecimal(mesMap.get("orderSeq"));
+        BigDecimal maxSeq = DataChange.dataToBigDecimal(mesMap.get("maxSeq"));
+        if(orderSeq.intValue() == maxSeq.intValue()){
+            map.put("orderStatus", 2);
+            return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+        }
+        return 0;
     }
 
     /**
@@ -73,11 +80,11 @@ public class UtilsServiceImpl implements IUtilsService {
     }
 
     /**
-     * 用于更新路段顺序号
+     * 用于更新路段顺序号 + 1
      * @param map 运输订单号 或者是运输订单ID
      * @return
      */
-    public int updateOrderLineSequence(Map<String, Object> map, Integer num){
+    public int updateOrderLineSequence(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         if(orderId.intValue() == 0){
             //如果没有传入运输订单Id则需要传入了运输订单号
@@ -86,7 +93,7 @@ public class UtilsServiceImpl implements IUtilsService {
         Integer lineSequence = getLineSequenceByOrderId(orderId);
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
-        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + num);
+        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + 1);
         return utilsMapper.updateLineSeqByOrderIdOrNum(mesMap);
     }
 
@@ -131,5 +138,30 @@ public class UtilsServiceImpl implements IUtilsService {
         return utilsMapper.getOrderIdByTotalId(resultTotalId);
     }
 
+    /**
+     * 推送消息给websocket
+     * @param capacityNumber
+     * @param pushMes
+     */
+    @Override
+    public void pushMesToWebsocket(String capacityNumber, String pushMes) {
+
+        //添加消息实体
+        HashMap<Object, Object> mesMap = new HashMap<>();
+        mesMap.put("messageType", 4); //用于进厂后 刷新消息
+        mesMap.put("sendPerson", "system");
+        mesMap.put("receivePerson", capacityNumber);
+        mesMap.put("messageContent", pushMes + new Date());
+        mesMap.put("createTime", new Date());
+        ArrayList<Object> list = new ArrayList<>();
+        list.add(mesMap);
+        //调用websocket接口推送
+        HashMap<Object, Object> sendMap = new HashMap<>();
+        //将消息实体放入list中存到map中
+        sendMap.put("messages", list);
+        imFeign.sendToUser(sendMap);
+    }
+
+
 
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.util;
 
 import org.apache.poi.ss.formula.functions.T;
+import org.omg.IOP.Encoding;
+import org.springframework.web.context.request.WebRequest;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;

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

@@ -0,0 +1,131 @@
+package com.steerinfo.dil.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HTTPRequestUtils {
+    /**
+     * 发送post请求
+     * @param url  路径
+     * @param json  参数(json类型)
+     * @param encoding 编码格式
+     * @return
+     * @throws ParseException
+     * @throws IOException
+     */
+    public static String send(String url, JSONObject json, String encoding) throws ParseException, IOException {
+        String body = "";
+
+        //创建httpclient对象
+        CloseableHttpClient client = HttpClients.createDefault();
+        //创建post方式请求对象
+        HttpPost httpPost = new HttpPost(url);
+
+        //装填参数
+        StringEntity s = new StringEntity(json.toString(), "utf-8");
+        s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,"application/json"));
+        //设置参数到请求对象中
+        httpPost.setEntity(s);
+        System.out.println("请求地址：" + url);
+        System.out.println(json);
+//        System.out.println("请求参数："+nvps.toString());
+
+        //设置header信息
+        //指定报文头【Content-type】、【User-Agent】
+//        httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
+        httpPost.setHeader("Content-type", "application/json");
+        httpPost.setHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+        //执行请求操作，并拿到结果（同步阻塞）
+        CloseableHttpResponse response = client.execute(httpPost);
+        System.out.println(response);
+        //获取结果实体
+        HttpEntity entity = response.getEntity();
+        System.out.println(entity);
+        if (entity != null) {
+            //按指定编码转换结果实体为String类型
+            body = EntityUtils.toString(entity, encoding);
+        }
+        EntityUtils.consume(entity);
+        //释放链接
+        response.close();
+        return body;
+    }
+
+
+    public static String getJsonData(JSONObject jsonParam,String urls) {
+        StringBuffer sb=new StringBuffer();
+        try {
+            // 创建url资源
+            URL url = new URL(urls);
+            // 建立http连接
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            // 设置允许输出
+            conn.setDoOutput(true);
+            // 设置允许输入
+            conn.setDoInput(true);
+            // 设置不用缓存
+            conn.setUseCaches(false);
+            // 设置传递方式
+            conn.setRequestMethod("POST");
+            // 设置维持长连接
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            // 设置文件字符集:
+            conn.setRequestProperty("Charset", "UTF-8");
+            // 转换为字节数组
+            byte[] data = (jsonParam.toString()).getBytes();
+            // 设置文件长度
+            conn.setRequestProperty("Content-Length", String.valueOf(data.length));
+            // 设置文件类型:
+            conn.setRequestProperty("contentType", "application/json");
+            // 开始连接请求
+            conn.connect();
+            OutputStream out = new DataOutputStream(conn.getOutputStream()) ;
+            // 写入请求的字符串
+            out.write((jsonParam.toString()).getBytes());
+            out.flush();
+            out.close();
+            System.out.println(conn.getResponseCode());
+
+            // 请求返回的状态
+            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()){
+                System.out.println("连接成功");
+                // 请求返回的数据
+                InputStream in1 = conn.getInputStream();
+                try {
+                    String readLine = new String();
+                    BufferedReader responseReader=new BufferedReader(new InputStreamReader(in1,"UTF-8"));
+                    while((readLine=responseReader.readLine())!=null){
+                        sb.append(readLine).append("\n");
+                    }
+                    responseReader.close();
+                    System.out.println(sb.toString());
+
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            } else {
+                System.out.println("error++");
+            }
+        } catch (Exception e) {
+
+        }
+        return sb.toString();
+
+    }
+
+
+}

src/main/resources/bootstrap.yml

@@ -31,6 +31,8 @@ openfeign:
     url: ${JOINFEIGN_URL:localhost:8066}
   QmsFeign:
     url: ${QMSFEIGN_URL:localhost:8087}
+  Im:
+    url: ${AMSFEIGN_URL:172.16.33.161:8099}
 
 
 #eureka设置

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

@@ -658,12 +658,15 @@
         select TER.RESULT_ID       "resultId",
                OO.ORDER_ID         "orderId",
                OO.ORDER_TYPE       "orderTypee", --避免与筛选条件重名
-               TER.RESULT_TOTAL_ID "resultTotalId"
+               TER.RESULT_TOTAL_ID "resultTotalId",
+               RC.CAPACITY_NUMBER   "capacityNumber"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID
                  left join TMSTRUCK_ENFACTORY_RESULT TER
                            on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join RMS_CAPACITY RC
+                            on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 

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

@@ -574,12 +574,15 @@
                OO.ORDER_ID "orderId",
                OO.ORDER_TYPE "orderTypee",
                TTR.RESULT_TOTAL_ID "resultTotalId",
-               OO.CAPACITY_ID "capacityId"
+               OO.CAPACITY_ID "capacityId",
+               RC.CAPACITY_NUMBER   "capacityNumber"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID
                  left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                            on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 

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

@@ -2,32 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckMeasureCommission">
-        <id column="COMMSSION_ID" jdbcType="DECIMAL" property="commssionId"/>
-        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId"/>
-        <result column="COMMSSION_TYPE" jdbcType="DECIMAL" property="commssionType"/>
-        <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"/>
+        <id column="COMMSSION_ID" jdbcType="DECIMAL" property="commssionId" />
+        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+        <result column="COMMSSION_TYPE" jdbcType="DECIMAL" property="commssionType" />
+        <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" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="CALCULATE_ID" jdbcType="DECIMAL" property="calculateId" />
     </resultMap>
     <sql id="columns">
-        COMMSSION_ID, RESULT_TOTAL_ID, COMMSSION_TYPE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK
+        COMMSSION_ID, RESULT_TOTAL_ID, COMMSSION_TYPE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_ID, CALCULATE_ID
     </sql>
     <sql id="columns_alias">
-        t.COMMSSION_ID, t.RESULT_TOTAL_ID, t.COMMSSION_TYPE, t.INSERT_USERNAME, t.INSERT_TIME,
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+        t.COMMSSION_ID, t.RESULT_TOTAL_ID, t.COMMSSION_TYPE, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.MATERIAL_ID, t.CALCULATE_ID
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM TMSTRUCK_MEASURE_COMMISSION
+        SELECT <include refid="columns"/> FROM TMSTRUCK_MEASURE_COMMISSION
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSTRUCK_MEASURE_COMMISSION t
+        SELECT <include refid="columns_alias"/> FROM TMSTRUCK_MEASURE_COMMISSION t
     </sql>
     <sql id="where">
         <where>
@@ -55,6 +53,12 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="calculateId != null">
+                and CALCULATE_ID = #{calculateId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -83,11 +87,16 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="calculateId != null">
+                and CALCULATE_ID = #{calculateId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from TMSTRUCK_MEASURE_COMMISSION
+        delete from TMSTRUCK_MEASURE_COMMISSION
         where COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -114,15 +123,22 @@
         <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
             or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
         </if>
+        <if test="materialId != null">
+            or MATERIAL_ID = #{materialId}
+        </if>
+        <if test="calculateId != null">
+            or CALCULATE_ID = #{calculateId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckMeasureCommission">
         insert into TMSTRUCK_MEASURE_COMMISSION (COMMSSION_ID, RESULT_TOTAL_ID, COMMSSION_TYPE,
                                                  INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                                 UPDATE_TIME, INSERT_UPDATE_REMARK)
+                                                 UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_ID,
+                                                 CALCULATE_ID)
         values (#{commssionId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{commssionType,jdbcType=DECIMAL},
-                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR},
-                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialId,jdbcType=DECIMAL},
+                #{calculateId,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckMeasureCommission">
         insert into TMSTRUCK_MEASURE_COMMISSION
@@ -151,6 +167,12 @@
             <if test="insertUpdateRemark != null">
                 INSERT_UPDATE_REMARK,
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID,
+            </if>
+            <if test="calculateId != null">
+                CALCULATE_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="commssionId != null">
@@ -177,17 +199,25 @@
             <if test="insertUpdateRemark != null">
                 #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
+            <if test="materialId != null">
+                #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="calculateId != null">
+                #{calculateId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckMeasureCommission">
         update TMSTRUCK_MEASURE_COMMISSION
-        set RESULT_TOTAL_ID      = #{resultTotalId,jdbcType=DECIMAL},
-            COMMSSION_TYPE       = #{commssionType,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}
+        set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+            COMMSSION_TYPE = #{commssionType,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},
+            CALCULATE_ID = #{calculateId,jdbcType=DECIMAL}
         where COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckMeasureCommission">
@@ -214,6 +244,12 @@
             <if test="insertUpdateRemark != null">
                 INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="calculateId != null">
+                CALCULATE_ID = #{calculateId,jdbcType=DECIMAL},
+            </if>
         </set>
         where COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
     </update>
@@ -235,14 +271,16 @@
         RESULT_TOTAL_ID, COMMSSION_TYPE,
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK)
+        INSERT_UPDATE_REMARK, MATERIAL_ID,
+        CALCULATE_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.commssionId,jdbcType=DECIMAL},
         #{item.resultTotalId,jdbcType=DECIMAL}, #{item.commssionType,jdbcType=DECIMAL},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.materialId,jdbcType=DECIMAL},
+        #{item.calculateId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -280,6 +318,14 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
             when #{item.commssionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
+        ,MATERIAL_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+        </foreach>
+        ,CALCULATE_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.calculateId,jdbcType=DECIMAL}
+        </foreach>
         where COMMSSION_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.commssionId,jdbcType=DECIMAL}
@@ -452,10 +498,8 @@
         on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
         left join DIL_BATCH DB
         on APO.BATCH_ID = DB.BATCH_ID
-        left join RMS_DRIVER_CAPACITY RDC
-        on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = RDC.CAPACITY_ID
+        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
@@ -499,10 +543,8 @@
         on OO.ORDER_ID = TTR.ORDER_ID
         left join AMS_SALE_ORDER ASO
         on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
-        left join RMS_DRIVER_CAPACITY RDC
-        on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = RDC.CAPACITY_ID
+        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
@@ -544,10 +586,8 @@
             OMSTRUCK_ORDER OO
                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                 LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                          ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                 LEFT JOIN RMS_CAPACITY RC
-                          ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                          ON  RC.CAPACITY_ID = OO.CAPACITY_ID
                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                 LEFT JOIN RMS_TRUCK_CALCULATE RTC ON TWR.RESULT_GROSS_PLACE_ID = RTC.TRUCK_CALCULATE_ID
                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
@@ -574,10 +614,8 @@
             OMSTRUCK_ORDER OO
                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                 LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                          ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                 LEFT JOIN RMS_CAPACITY RC
-                          ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                          ON  RC.CAPACITY_ID = OO.CAPACITY_ID
                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                 LEFT JOIN RMS_TRUCK_CALCULATE RTC ON TWR.RESULT_TARE_PLACE_ID = RTC.TRUCK_CALCULATE_ID
                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
@@ -603,10 +641,8 @@
         FROM  OMSTRUCK_ORDER OO
                   LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
                   LEFT JOIN  AMSTRUCK_INWARD_REQUIREMENT ARP  ON ARP.REQUIREMENT_ID=OO.ORDER_PLAN_ID
-                  LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                   LEFT JOIN RMS_CAPACITY RC
-                            ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                            ON  RC.CAPACITY_ID = OO.CAPACITY_ID
                   LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
                   LEFT JOIN  RMS_LINE RL ON ARP.LINE_ID = RL.LINE_ID
                   LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
@@ -630,10 +666,8 @@
         FROM  OMSTRUCK_ORDER OO
                   LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
                   LEFT JOIN  AMSTRUCK_INWARD_REQUIREMENT ARP  ON ARP.REQUIREMENT_ID=OO.ORDER_PLAN_ID
-                  LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                   LEFT JOIN RMS_CAPACITY RC
-                            ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                            ON  RC.CAPACITY_ID = OO.CAPACITY_ID
                   LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
                   LEFT JOIN  RMS_LINE RL ON ARP.LINE_ID = RL.LINE_ID
                   LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
@@ -670,10 +704,8 @@
                            ON RRA.ADDRESS_ID=APO.RECEIVE_UNIT_ID
                  LEFT JOIN RMS_MATERIAL_STEEL RMS
                            ON  RMS.MATERIAL_ID=OOM.MATERIAL_ID
-                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                  LEFT JOIN RMS_CAPACITY RC
-                           ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                           ON  RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -705,10 +737,51 @@
                              ON RRA.ADDRESS_ID = APO.RECEIVE_UNIT_ID
                    LEFT JOIN RMS_MATERIAL_STEEL RMS
                              ON  RMS.MATERIAL_ID = OOM.MATERIAL_ID
-                   LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                             ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                    LEFT JOIN RMS_CAPACITY RC
-                             ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                             ON  RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
+    
+<!--  采购辅料计量委托  -->
+    <select id="purchaseMaoMeasure" parameterType="map" resultType="java.util.Map">
+        select
+            APO.PURCHASE_ORDER_NO   "purchaseOrder",
+            OO.ORDER_NUMBER         "transportNum",
+            RC.CAPACITY_NUMBER      "carNum",
+            RTC.TRUCK_CALCULATE_NUMBER "steelyardNum",
+            RS.SUPPLIER_NAME            "sendUnit",
+            RSH.SHIPPER_NAME            "ReceivUnit",
+            RM.MATERIAL_NAME            "materiaName",
+            RM.MATERIAL_ID              "materialId",
+            CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
+            RW.WAREHOUSE_NAME           "unloadPlace",
+            TWR.INSERT_UPDATE_REMARK    "demo",
+            DB.RESULT_FOREIGN_SHIP_NAME "shipNum"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+            on TTR.ORDER_ID = OO.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_SUPPLIER RS
+            on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_SHIPPER RSH
+            on RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+        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_CAPACITY RC
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+            on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        left join RMS_TRUCK_CALCULATE RTC
+            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        left join TMSTRUCK_UNLOAD_RESULT TUR
+            on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_WAREHOUSE RW
+            on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>

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

@@ -332,4 +332,107 @@
      and OO.ORDER_ID = #{orderId}
     </if>
   </select>
+
+<!-- 查询辅料退货实绩 -->
+    <select id="getFLReturnResult" parameterType="map" resultType="java.util.Map">
+      select
+             *
+      from (
+             select APO.PURCHASE_ORDER_NO   "purchaseOrderNo",
+                    RS.SHIPPER_NAME         "shipperName",
+                    RSU.SUPPLIER_NAME       "supplierName",
+                    RM.MATERIAL_NAME        "materialName",
+                    (case
+                       when OOM.ORDER_MATERIAL_WEIGHT is not null
+                         then OOM.ORDER_MATERIAL_WEIGHT || 't'
+                       else OOM.ORDER_MATERIAL_NUMBER || 'n'
+                      end
+                      )                     "materialNumWei",
+                    OO.ORDER_NUMBER         "orderNumber",
+                    RC.CAPACITY_NUMBER      "capacityNumber",
+                    TRR.INSERT_UPDATE_REMARK "returnReason",
+                    TRR.INSERT_TIME          "insertTime"
+
+             from TMSTRUCK_RETURN_RESULT TRR
+                    left join TMSTRUCK_TOTAL_RESULT TTR
+                              on TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
+                    left join OMSTRUCK_ORDER OO
+                              on OO.ORDER_ID = TTR.ORDER_ID
+                    left join RMS_CAPACITY RC
+                              on RC.CAPACITY_ID = OO.CAPACITY_ID
+                    left join AMS_PURCHASE_ORDER APO
+                              on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                    left join RMS_SHIPPER RS
+                              on RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                    left join RMS_SUPPLIER RSU
+                              on RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_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
+             where OO.ORDER_TYPE = #{orderTypee}
+           )
+      <where>
+        <if test="purchaseOrderNo != null">
+          <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+            "purchaseOrderNo" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="shipperName != null">
+          and
+          <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+            "shipperName" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="supplierName != null">
+          and
+          <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+            "supplierName" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="materialName != null">
+          and
+          <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+            "materialName" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="materialNumWei != null">
+          and
+          <foreach collection="materialNumWei" item="item" open="(" separator="or" close=")">
+            "materialNumWei" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="orderNumber != null">
+          and
+          <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+            "orderNumber" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="capacityNumber != null">
+          and
+          <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+            "capacityNumber" like '%${item}%'
+          </foreach>
+        </if>
+        <if test="returnReason != null">
+          and
+          <foreach collection="returnReason" item="item" open="(" separator="or" close=")">
+            "returnReason" like '%${item}%'
+          </foreach>
+        </if>
+      </where>
+    <include refid="orderBy"></include>
+    </select>
+
+  <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 "insertTime" desc
+    </if>
+  </sql>
 </mapper>

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

@@ -506,7 +506,7 @@
             </if>
         </if>
         <if test="orderField == null  ">
-            order by "resultStartTime" desc
+            order by "resultEndTime" desc
         </if>
     </sql>
 
@@ -522,7 +522,7 @@
                 RM.MATERIAL_NAME "materialName",
                 TWR.RESULT_NET_WEIGHT "resultNetWeight",
                 RW.WAREHOUSE_NAME "warehouseName",
-                TUR.RESULT_START_TIME "resultStartTime",
+                TUR.RESULT_END_TIME "resultEndTime",
                 TUR.INSERT_TIME "insertTime"
         from TMSTRUCK_UNLOAD_RESULT TUR
         left join TMSTRUCK_TOTAL_RESULT TTR
@@ -537,13 +537,11 @@
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
         on OOM.MATERIAL_ID = RM.MATERIAL_ID
-        left join RMS_DRIVER_CAPACITY RDC
-        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_WAREHOUSE RW
         on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        where RESULT_START_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
+        where RESULT_END_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
             <if test="purchaseOrderNo != null">
@@ -609,12 +607,15 @@
         select OO.ORDER_ID         "orderId",
                OO.ORDER_TYPE       "orderTypee",
                TUR.RESULT_ID       "resultId",
-               TTR.RESULT_TOTAL_ID "resultTotalId"
+               TTR.RESULT_TOTAL_ID "resultTotalId",
+               RC.CAPACITY_NUMBER "capacityNumber"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID
                  left join TMSTRUCK_UNLOAD_RESULT TUR
                            on TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+                 left join RMS_CAPACITY RC
+                            on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -662,10 +663,8 @@
                                     on OOM.ORDER_ID = OO.ORDER_ID
                           left join RMS_MATERIAL RM
                                     on OOM.MATERIAL_ID = RM.MATERIAL_ID
-                          left join RMS_DRIVER_CAPACITY RDC
-                                    on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                           left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = RDC.CAPACITY_ID
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                           left join RMS_WAREHOUSE RW
                                     on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
                  where RESULT_START_TIME is not null
@@ -753,10 +752,8 @@
                                     ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
                           LEFT JOIN OMSTRUCK_ORDER OO
                                     ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                                    ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                           LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                                    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
@@ -826,10 +823,8 @@
                                     ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
                           LEFT JOIN OMSTRUCK_ORDER OO
                                     ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                                    ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                           LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                                    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

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

@@ -2,50 +2,48 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.TmstruckWeightResultMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckWeightResult">
-        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId"/>
-        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId"/>
-        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo"/>
-        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight"/>
-        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime"/>
-        <result column="RESULT_TARE_WEIGHT" jdbcType="DECIMAL" property="resultTareWeight"/>
-        <result column="RESULT_TARE_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultTareWeightTime"/>
-        <result column="RESULT_NET_WEIGHT" jdbcType="DECIMAL" property="resultNetWeight"/>
-        <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"/>
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
-        <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime"/>
-        <result column="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId"/>
-        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId"/>
-        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct"/>
-        <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality"/>
-        <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe"/>
+        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId" />
+        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo" />
+        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight" />
+        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime" />
+        <result column="RESULT_TARE_WEIGHT" jdbcType="DECIMAL" property="resultTareWeight" />
+        <result column="RESULT_TARE_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultTareWeightTime" />
+        <result column="RESULT_NET_WEIGHT" jdbcType="DECIMAL" property="resultNetWeight" />
+        <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" />
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+        <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+        <result column="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId" />
+        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
+        <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality" />
+        <result column="GROSS_SEGMENT_SQE" jdbcType="DECIMAL" property="grossSegmentSqe" />
+        <result column="TARE_SEGMENT_SQE" jdbcType="DECIMAL" property="tareSegmentSqe" />
     </resultMap>
     <sql id="columns">
-        WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
-    RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME,
-    RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT, ISQUALITY, SEGMENT_SQE
+        WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME, 
+    RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME, 
+    RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT, ISQUALITY, GROSS_SEGMENT_SQE, 
+    TARE_SEGMENT_SQE
     </sql>
     <sql id="columns_alias">
-        t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT,
-    t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_WEIGHT, t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT,
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
-    t.DELETE_NAME, t.DELETE_TIME, t.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID, t.MATERIAL_ID,
-    t.ISDEDUCT, t.ISQUALITY, t.SEGMENT_SQE
+        t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT, 
+    t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_WEIGHT, t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.DELETE_NAME, t.DELETE_TIME, t.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID, t.MATERIAL_ID, 
+    t.ISDEDUCT, t.ISQUALITY, t.GROSS_SEGMENT_SQE, t.TARE_SEGMENT_SQE
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM TMSTRUCK_WEIGHT_RESULT
+        SELECT <include refid="columns"/> FROM TMSTRUCK_WEIGHT_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSTRUCK_WEIGHT_RESULT t
+        SELECT <include refid="columns_alias"/> FROM TMSTRUCK_WEIGHT_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -109,8 +107,11 @@
             <if test="isquality != null">
                 and ISQUALITY = #{isquality}
             </if>
-            <if test="segmentSqe != null">
-                and SEGMENT_SQE = #{segmentSqe}
+            <if test="grossSegmentSqe != null">
+                and GROSS_SEGMENT_SQE = #{grossSegmentSqe}
+            </if>
+            <if test="tareSegmentSqe != null">
+                and TARE_SEGMENT_SQE = #{tareSegmentSqe}
             </if>
         </where>
     </sql>
@@ -176,14 +177,16 @@
             <if test="isquality != null">
                 and ISQUALITY = #{isquality}
             </if>
-            <if test="segmentSqe != null">
-                and SEGMENT_SQE = #{segmentSqe}
+            <if test="grossSegmentSqe != null">
+                and GROSS_SEGMENT_SQE = #{grossSegmentSqe}
+            </if>
+            <if test="tareSegmentSqe != null">
+                and TARE_SEGMENT_SQE = #{tareSegmentSqe}
             </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-        delete
-        from TMSTRUCK_WEIGHT_RESULT
+        delete from TMSTRUCK_WEIGHT_RESULT
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -246,8 +249,11 @@
         <if test="isquality != null">
             or ISQUALITY = #{isquality}
         </if>
-        <if test="segmentSqe != null">
-            or SEGMENT_SQE = #{segmentSqe}
+        <if test="grossSegmentSqe != null">
+            or GROSS_SEGMENT_SQE = #{grossSegmentSqe}
+        </if>
+        <if test="tareSegmentSqe != null">
+            or TARE_SEGMENT_SQE = #{tareSegmentSqe}
         </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
@@ -258,19 +264,17 @@
                                             UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                             DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
                                             RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT,
-                                            ISQUALITY, SEGMENT_SQE)
+                                            ISQUALITY, GROSS_SEGMENT_SQE, TARE_SEGMENT_SQE
+        )
         values (#{weightTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
-                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL},
-                #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL}, #{resultGrossWeightTime,jdbcType=TIMESTAMP},
                 #{resultTareWeight,jdbcType=DECIMAL}, #{resultTareWeightTime,jdbcType=TIMESTAMP},
-                #{resultNetWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR},
-                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
-                #{resultGrossPlaceId,jdbcType=DECIMAL},
+                #{resultNetWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{resultGrossPlaceId,jdbcType=DECIMAL},
                 #{resultTarePlaceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{isdeduct,jdbcType=DECIMAL},
-                #{isquality,jdbcType=DECIMAL}, #{segmentSqe,jdbcType=DECIMAL})
+                #{isquality,jdbcType=DECIMAL}, #{grossSegmentSqe,jdbcType=DECIMAL}, #{tareSegmentSqe,jdbcType=DECIMAL}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         insert into TMSTRUCK_WEIGHT_RESULT
@@ -335,8 +339,11 @@
             <if test="isquality != null">
                 ISQUALITY,
             </if>
-            <if test="segmentSqe != null">
-                SEGMENT_SQE,
+            <if test="grossSegmentSqe != null">
+                GROSS_SEGMENT_SQE,
+            </if>
+            <if test="tareSegmentSqe != null">
+                TARE_SEGMENT_SQE,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -400,33 +407,37 @@
             <if test="isquality != null">
                 #{isquality,jdbcType=DECIMAL},
             </if>
-            <if test="segmentSqe != null">
-                #{segmentSqe,jdbcType=DECIMAL},
+            <if test="grossSegmentSqe != null">
+                #{grossSegmentSqe,jdbcType=DECIMAL},
+            </if>
+            <if test="tareSegmentSqe != null">
+                #{tareSegmentSqe,jdbcType=DECIMAL},
             </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         update TMSTRUCK_WEIGHT_RESULT
-        set RESULT_TOTAL_ID          = #{resultTotalId,jdbcType=DECIMAL},
-            RESULT_POUND_NO          = #{resultPoundNo,jdbcType=VARCHAR},
-            RESULT_GROSS_WEIGHT      = #{resultGrossWeight,jdbcType=DECIMAL},
+        set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+            RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+            RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
             RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
-            RESULT_TARE_WEIGHT       = #{resultTareWeight,jdbcType=DECIMAL},
-            RESULT_TARE_WEIGHT_TIME  = #{resultTareWeightTime,jdbcType=TIMESTAMP},
-            RESULT_NET_WEIGHT        = #{resultNetWeight,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},
-            DELETE_NAME              = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME              = #{deleteTime,jdbcType=TIMESTAMP},
-            RESULT_GROSS_PLACE_ID    = #{resultGrossPlaceId,jdbcType=DECIMAL},
-            RESULT_TARE_PLACE_ID     = #{resultTarePlaceId,jdbcType=DECIMAL},
-            MATERIAL_ID              = #{materialId,jdbcType=DECIMAL},
-            ISDEDUCT                 = #{isdeduct,jdbcType=DECIMAL},
-            ISQUALITY                = #{isquality,jdbcType=DECIMAL},
-            SEGMENT_SQE              = #{segmentSqe,jdbcType=DECIMAL}
+            RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=DECIMAL},
+            RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+            RESULT_NET_WEIGHT = #{resultNetWeight,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},
+            DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+            RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+            RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+            MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+            ISQUALITY = #{isquality,jdbcType=DECIMAL},
+            GROSS_SEGMENT_SQE = #{grossSegmentSqe,jdbcType=DECIMAL},
+            TARE_SEGMENT_SQE = #{tareSegmentSqe,jdbcType=DECIMAL}
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
@@ -489,8 +500,11 @@
             <if test="isquality != null">
                 ISQUALITY = #{isquality,jdbcType=DECIMAL},
             </if>
-            <if test="segmentSqe != null">
-                SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
+            <if test="grossSegmentSqe != null">
+                GROSS_SEGMENT_SQE = #{grossSegmentSqe,jdbcType=DECIMAL},
+            </if>
+            <if test="tareSegmentSqe != null">
+                TARE_SEGMENT_SQE = #{tareSegmentSqe,jdbcType=DECIMAL},
             </if>
         </set>
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
@@ -518,8 +532,8 @@
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
         RESULT_TARE_PLACE_ID, MATERIAL_ID,
-        ISDEDUCT, ISQUALITY, SEGMENT_SQE
-        )
+        ISDEDUCT, ISQUALITY, GROSS_SEGMENT_SQE,
+        TARE_SEGMENT_SQE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.weightTaskResultId,jdbcType=DECIMAL},
@@ -529,120 +543,102 @@
         #{item.resultNetWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
-        #{item.resultGrossPlaceId,jdbcType=DECIMAL},
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultGrossPlaceId,jdbcType=DECIMAL},
         #{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
-        #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, #{item.segmentSqe,jdbcType=DECIMAL}
-        from dual
+        #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, #{item.grossSegmentSqe,jdbcType=DECIMAL},
+        #{item.tareSegmentSqe,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update TMSTRUCK_WEIGHT_RESULT
         set
         WEIGHT_TASK_RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.weightTaskResultId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TOTAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_POUND_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_GROSS_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_GROSS_WEIGHT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_TARE_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_WEIGHT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_NET_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_GROSS_PLACE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_PLACE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
         </foreach>
         ,MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
         </foreach>
         ,ISDEDUCT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
         </foreach>
         ,ISQUALITY=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isquality,jdbcType=DECIMAL}
         </foreach>
-        ,SEGMENT_SQE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID"
-                 close="end">
-            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
+        ,GROSS_SEGMENT_SQE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.grossSegmentSqe,jdbcType=DECIMAL}
+        </foreach>
+        ,TARE_SEGMENT_SQE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.tareSegmentSqe,jdbcType=DECIMAL}
         </foreach>
         where WEIGHT_TASK_RESULT_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
@@ -674,12 +670,15 @@
         select OO.ORDER_ID "orderId",
         OO.ORDER_TYPE "orderTypee",
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        TTR.RESULT_TOTAL_ID "resultTotalId"
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        RC.CAPACITY_NUMBER  "capacityNumber"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-        on OO.ORDER_ID = TTR.ORDER_ID
+            on OO.ORDER_ID = TTR.ORDER_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
-        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_CAPACITY RC
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
         <if test="materialId != null">
             and TWR.MATERIAL_ID = #{materialId}

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

@@ -20,13 +20,14 @@
     <update id="updateOrderStatusByOrderIdOrNum" parameterType="java.util.Map">
         update OMSTRUCK_ORDER OO
         set OO.ORDER_STATUS = #{orderStatus}
-        where
-        <if test="orderId != null">
-            OO.ORDER_ID = #{orderId}
-        </if>
-        <if test="orderNumber != null">
-        and  OO.ORDER_NUMBER = #{orderNumber}
-        </if>
+        <where>
+            <if test="orderId != null">
+                OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and  OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
     </update>
 
 <!--  通过运输Id 或者运输订单号修改 路段顺序号  -->
@@ -106,4 +107,39 @@
             on OO.ORDER_ID = TTR.ORDER_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
+
+
+<!--   通过总实绩ID查询订单类型 -->
+    <select id="getOrderTypeByTotalId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OO.ORDER_TYPE
+        from TMSTRUCK_TOTAL_RESULT TTR
+        left join OMSTRUCK_ORDER OO
+            on OO.ORDER_ID = TTR.ORDER_ID
+        where TTR.RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
+
+<!--  查询最大路段顺序号 以及当前订单路段顺序号（执行到哪一步）  -->
+    <select id="getLineSeqAndOrderSeq" parameterType="java.util.Map" resultType="java.util.Map">
+        select OO.ORDER_LINE_SEQUENCE "orderSeq",
+               (select max(RLS.SEGMENT_SQE)
+                    from RMS_LINE_SEGEMNT RLS
+                   where RLS.LINE_ID = OO.LINE_ID
+                   ) "maxSeq"
+        from OMSTRUCK_ORDER OO
+        <where>
+            <if test="orderId != null">
+                OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
+
+<!--  通过订单ID查询物资ID（针对单拼）  -->
+    <select id="getMaterialIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OOM.MATERIAL_ID
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        where OOM.ORDER_ID = #{orderId}
+    </select>
 </mapper>