钢材修改

pom.xml

@@ -147,7 +147,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TMSTRUCK_TARE_RETURN_RESULT</param>
+                        <param>AMS_CONTAACT_PRICE_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -131,10 +131,18 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     })
     @PostMapping("/addSaleLoadResult")
     public RESTfulResult addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map){
-        int i = tmstruckLoadResultService.addXSLoadResult(map);
-        if(i > 0){
-            return success("装车成功");
-        }else{
+        try {
+            int i = tmstruckLoadResultService.addXSLoadResult(map);
+            if(i == 1){
+                return success("装货成功");
+            }else if(i == 0){
+                return failed("委托发送失败");
+            }else if(i == -1){
+                return failed("装货失败，该订单无装货实绩");
+            }else {
+                return failed("装车失败！请联系管理员");
+            }
+        } catch (Exception e) {
             return failed("装车失败！请联系管理员");
         }
     }

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

@@ -51,6 +51,8 @@ public interface OmsFeign {
     Map<String,Object> addNewTransportOrder(@RequestParam BigDecimal orderId);
 
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
-    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId, @RequestParam("sqe") Integer sqe);
+    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId,
+                                        @RequestParam("sqe") Integer sqe,
+                                        @RequestParam("resultNetWeight") String resultNetWeight);
 
 }

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

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

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

@@ -127,5 +127,5 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     Integer checkMaterialIdLoad(@Param("resultTotalId") BigDecimal resultTotalId,@Param("materialId") BigDecimal materialId);
 
     //通过钢材运输订单号查询装车实绩
-    Map<String, Object> getSteelLoadResult(String orderNumber);
+    Map<String, Object> getSteelLoadResult(Map<String, Object> map);
 }

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

@@ -109,4 +109,10 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
 
     //查询最后一个发委托的物资 通过这个物资查询是否含有净重 或者是没有计量实绩
     Map<String, Object> checkoutWeightCommission2(Map<String, Object> map);
+
+    //查询钢材委托
+    Map<String, Object> getSteelMeasureCommission(Map<String, Object> map);
+
+    //查询还没计重的物资
+    Integer getAlreadyWeightMaterialNum(BigDecimal orderId);
 }

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

@@ -30,7 +30,7 @@ public interface ITmstruckLoadResultService{
     int addLoadResult(Map<String, Object> map);
 
     //修改销售装车实绩  （如果是多种物资【多拼】，通过物资Id和运输订单号来确定唯一的装车实绩进行修改）
-    int addXSLoadResult(Map<String, Object> map);
+    int addXSLoadResult(Map<String, Object> map) throws Exception;
 
     //修改销售钢渣、水渣、危化品装车实绩
     int addXS2LoadResult(Map<String, Object> map) throws Exception;

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

@@ -52,7 +52,7 @@ public class RulesServiceImpl implements IRulesService {
             if(judgeTime){
                 //更新出厂实绩门岗ID
                 //通过运输订单号获取出厂实绩ID
-                Map<String, Object> map2 = tmstruckLeaveFactoryResultMapper.selectResultId((String) map.get("orderNumber"));
+                Map<String, Object> map2 = tmstruckLeaveFactoryResultMapper.selectResultId(null);
                 TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
                 tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(map2.get("resultId")));
                 tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(mes.get("gatepostId")));

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

@@ -181,6 +181,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         switch (orderType){
             case 1:
                 //发送空委托
+                map.put("firstMC", 1); //空委托依据
                 checkMeasureCommission = tmstruckMeasureCommissionService.addSteelMeasureCommission(map);
                 break;
             case 2:

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

@@ -162,7 +162,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
      * @param map
      * @return
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int leaveFactoryByPDA(Map<String, Object> map) throws Exception{
         int i = 0;
         String orderNumber = (String) map.get("orderNumber");
@@ -176,7 +176,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         }else if(orderType == 21){
             return tmstruckEnfactoryResultService.orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
         }
-        Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber);
+        Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
         if(selectMap == null){
             throw new Exception("该车已出厂！！");
         }else{
@@ -187,6 +187,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 throw  new Exception("该车作业环节未全部完成！");
             }
         }
+        map.putAll(mesMap);
         map.putAll(selectMap);
         map.put("orderNumber", orderNumber);
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
@@ -195,6 +196,10 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         i += utilsService.updateOrderLineSequence(map);
         switch (orderType){
             case 1:
+                Integer driverConfirmationSteel = utilsMapper.getDriverConfirmation(orderId);
+                if(driverConfirmationSteel == null){
+                    throw new Exception("请提醒司机确认订单！");
+                }
                 break;
             case 2:
             case 3:

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

@@ -141,40 +141,45 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 钢材装车
-     * orderNumber materialId loadStartTime loadEndTime  personnelSsoId warehouseId insertUpdateRemark
+     * orderId materialId loadStartTime  loadId warehouseId insertUpdateRemark
      * @param map
      * @return
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int addXSLoadResult(Map<String, Object> map){
         //通过运输订单号查询实绩
-        String orderNumber = (String) map.get("orderNumber");
-        Map<String, Object> steelMesMap = tmstruckLoadResultMapper.getSteelLoadResult(orderNumber);
+        Map<String, Object> steelMesMap = tmstruckLoadResultMapper.getSteelLoadResult(map);
         if(steelMesMap == null){
             return -1;
         }
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //总实绩ID 开始时间 结束时间 装车时长 物资Id 装卸工ID 装货点Id 备注
         tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(steelMesMap.get("resultId")));
-        long loadStartTime = (long) map.get("loadStartTime");
-        tmstruckLoadResult.setResultLoadStartTime(new Date(loadStartTime));
-        long loadEndTime = (long) map.get("loadEndTime");
-        tmstruckLoadResult.setResultLoadEndTime(new Date(loadEndTime));
-        long duration = (loadEndTime - loadStartTime) / (60000);
+        Date loadStartTime = DataChange.dataToDate(map.get("loadStartTime"));
+        loadStartTime = loadStartTime == null ? new Date() : loadStartTime;
+        tmstruckLoadResult.setResultLoadStartTime(loadStartTime);
+        Date loadEndTime = new Date();
+        tmstruckLoadResult.setResultLoadEndTime(loadEndTime);
+        long duration = (loadEndTime.getTime() - loadStartTime.getTime()) / 60000;
         tmstruckLoadResult.setResultLoadDuration(new BigDecimal(duration));
-        if(map.get("personnelSsoId") != null){
-            //通过SSo主键查询人员管理主键
-            Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String) map.get("personnelSsoId"));
-            if(personnelId != null){
-                tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
-            }
+        Object loadId = map.get("loadId");
+        if(loadId != null){
+            tmstruckLoadResult.setLoaderId(DataChange.dataToBigDecimal(map.get("loadId")));
         }
-        tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
+        tmstruckLoadResult.setMaterialId(materialId);
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+        steelMesMap.put("materialId", materialId);
+        //给达钢发送委托
+        int i = tmstruckMeasureCommissionService.addSteelMeasureCommission(steelMesMap);
+        if(i == 0){
+            return i;
+        }
         tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //更新路段顺序号
         utilsService.updateOrderLineSequence(steelMesMap); //orderId segmentSqe
+        //推送数据
         utilsService.pushMesToWebsocket((String) steelMesMap.get("capacityNumber"), "装货");
         return 1;
     }
@@ -185,7 +190,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      * @param map
      * @return
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int addXS2LoadResult(Map<String, Object> map) throws Exception {
 
         //通过运输订单号查询订单类型

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

@@ -161,16 +161,41 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addSteelMeasureCommission(Map<String, Object> map){
+        Map<String, Object> measureCommission = null;
         if(map.get("firstMC") != null){ //进厂发送空委托
-            Map<String, Object> measureCommission = new HashMap<>();
+            measureCommission = new HashMap<>();
             measureCommission.put("flowTo","出厂钢材");
-            measureCommission.put("isDel", false);
-            measureCommission.put("isInsert", true);
             measureCommission.put("carNum", map.get("capacityNumber"));
             measureCommission.put("transportNum", map.get("orderNumber"));
-            return sendMesToMeasure(measureCommission);
+        }else {
+            measureCommission = tmstruckMeasureCommissionMapper.getSteelMeasureCommission(map);
+            measureCommission.put("isDel", false);
+            measureCommission.put("isInsert", true);
+            measureCommission.put("isRelationEAS", true);
+            measureCommission.put("flowTo ", "出厂钢材");
+            measureCommission.put("theoryWeight", 3077);
+            Object isPoundSale = measureCommission.get("isPoundSale");
+            if(isPoundSale != null){
+                if(DataChange.dataToBigDecimal(isPoundSale).intValue() == 0){
+                    measureCommission.put("deliveryMethod", "磅重交货");
+                }else {
+                    measureCommission.put("deliveryMethod", "理重交货");
+                }
+            }else { //如果为空 则默认理重
+                measureCommission.put("deliveryMethod", "理重交货");
+            }
+            measureCommission.put("steelyardNum", "罗棒好帅");
+            //查询已经计量物资
+            Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
+            if(materialNum >= 1){
+                measureCommission.put("IsAssembly", true);
+            }else {
+                measureCommission.put("IsAssembly", false);
+            }
         }
-        return 0;
+        System.out.println(measureCommission);
+        return 1;
+//        return sendMesToMeasure(measureCommission);
     }
 
     /**

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

@@ -164,7 +164,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 mesMap.put("orderLineSequence",sqe);
                 utilsService.updateOrderLineSqeByOrderNumber(mesMap);
             }else {
-                omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe);
+                omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
             }
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
@@ -186,7 +186,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 return -2;  //已卸过此物资
             }
         }
-        Map<String, Object> dataMap = tmstruckUnloadResultMapper.selectUnloadMesByOrderNo(map);
+        Map<String, Object> dataMap = tmstruckUnloadResultMapper.selectUnloadMesByOrderNo(mesMap);
         if(dataMap == null){
             return -3;  //该订单没有卸货作业
         }

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

@@ -7,6 +7,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 /**
  * @ author    :TXF
@@ -17,19 +18,45 @@ public class DataChange {
 
 
     /**
-     * 解析前端传来的日期字符串
+     * 时间转换类
+     * 处理了三种类型 yyyy-MM-dd HH:mm:ss  yyyy/MM/dd HH:mm:ss  时间戳类型（带毫秒数时间戳13位）
      * @param vueDate
      * @return
      */
     public static Date dataToDate(Object vueDate){
         if(vueDate instanceof Date){
             return (Date) vueDate;
-        } else if (vueDate instanceof String) {
-
+        } else {
+            try {
+                String str = String.valueOf(vueDate);
+                if(judgeNumber(str) && str.length() == 13){
+                    return new Date(Long.parseLong(str));
+                }else if(str.contains("-")){
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    return sdf.parse(str);
+                }else if(str.contains("/")){
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                    return sdf.parse(str);
+                }
+            }catch (Exception e){
+                System.out.println("时间解析错误！返回null");
+                return null;
+            }
         }
         return null;
     }
 
+    /**
+     * 判断是否纯数字（不带小数点）仅供上面方法使用
+     * @param str
+     * @return
+     */
+    public static boolean judgeNumber(String str){
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
+
     /**
      * 数据转换成BigDecimal
      * @param data

src/main/resources/application-dev.yml

@@ -25,13 +25,13 @@ openfeign:
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:

src/main/resources/bootstrap.yml

@@ -17,6 +17,8 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
   instance:
     prefer-ip-address: true

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

@@ -593,22 +593,13 @@
     </select>
 
     <!--  通过运输订单号获取实绩ID -->
-    <select id="selectResultId" parameterType="string" resultType="java.util.Map">
+    <select id="selectResultId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select *
         from (
                  select TLFR.RESULT_ID      "resultId",
-                        OO.ORDER_ID         "orderId",
-                        OO.ORDER_TYPE       "orderTypee",
-                        TTR.RESULT_TOTAL_ID "resultTotalId",
-
-                        TLFR.SEGMENT_SQE    "segmentSqe",
-
-                 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
-                 where OO.ORDER_NUMBER = #{orderNumber} and TLFR.RESULT_OUT_GATE_TIME is null
+                        TLFR.SEGMENT_SQE    "segmentSqe"
+                 from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                 where TLFR.RESULT_TOTAL_ID = #{resultTotalId} and TLFR.RESULT_OUT_GATE_TIME is null
                  order by TLFR.SEGMENT_SQE
              )
         where rownum = 1

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

@@ -1670,7 +1670,7 @@
         and  TLR.MATERIAL_ID = #{materialId}
   </select>
 
-  <select id="getSteelLoadResult" parameterType="string" resultType="java.util.Map">
+  <select id="getSteelLoadResult" parameterType="java.math.BigDecimal" resultType="java.util.Map">
     SELECT *
     FROM (
            SELECT OO.ORDER_ID         "orderId",
@@ -1684,7 +1684,13 @@
                   LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
                   LEFT JOIN TMSTRUCK_LOAD_RESULT TLR ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
                   LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
-           WHERE OO.ORDER_NUMBER = #{orderNumber} AND TLR.RESULT_LOAD_END_TIME IS NULL
+           WHERE TLR.RESULT_LOAD_END_TIME IS NULL
+                 <if test="orderId != null">
+                   AND  OO.ORDER_ID = #{orderId}
+                 </if>
+                 <if test="orderNumber != null">
+                   AND  OO.ORDER_NUMBER = #{orderNumber}
+                 </if>
            ORDER BY TLR.SEGMENT_SQE
          )
     WHERE ROWNUM = 1

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

@@ -742,10 +742,11 @@
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
     
-<!--  采购辅料计量委托  -->
+<!--  采购计量委托  -->
     <select id="purchaseMeasure" parameterType="map" resultType="java.util.Map">
         select
             APO.PURCHASE_ORDER_NO   "purchaseOrder",
+            APO.SUPPLIER_SCREEN_INFO    "supplierScreenInfo",
             OO.ORDER_NUMBER         "transportNum",
             RC.CAPACITY_NUMBER      "carNum",
             RTC.TRUCK_CALCULATE_NUMBER "steelyardNum",
@@ -1296,4 +1297,45 @@
         where rownum = 1
     </select>
 
+    <select id="getSteelMeasureCommission" parameterType="map" resultType="map">
+        select ASO.SALE_NUMBER                                      "purchaseOrder",
+               OO.ORDER_NUMBER                                      "transportNum",
+               RM.MATERIAL_ID                                       "materialId",
+               RM.MATERIAL_NAME                                     "materiaName",
+               concat(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
+               RS.SHIPPER_NAME                                      "sendUnit",
+               OOM.ORDER_MATERIAL_WEIGHT                           "packagesNum",
+               RCON.CONSIGNEE_COMPANY_NAME                            "ReceivUnit",
+               RC.CAPACITY_NUMBER                                  "carNum",
+               ASO.SALE_REMARK                                      "shipNum",
+               OO.INSERT_UPDATE_REMARK                              "demo",
+               ASM.EAS_PRIMARY_ID                                   "FLID",
+               ASM.IS_POUND_SALE                                    "isPoundSale"
+        from OMSTRUCK_ORDER OO
+                 left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID
+                 left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
+                 left join AMS_SALE_ORDER_MATERIAL ASOM on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 left join AMS_SALE_ORDER ASO on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 left join AMS_SALE_MATERIAL ASM on ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                 left join RMS_SHIPPER RS on ASO.SHIPPER_ID = RS.SHIPPER_ID
+                 left join RMS_CONSIGNEE RCON on ASO.RECEIVE_ID = RCON.CONSIGNEE_ID
+                 left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
+
+        where OO.ORDER_ID = #{orderId} and OOM.MATERIAL_ID = #{materialId} and ASM.MATERIAL_ID = #{materialId}
+
+    </select>
+
+    <select id="getAlreadyWeightMaterialNum" parameterType="java.math.BigDecimal" resultType="int">
+        select count(OOM.MATERIAL_ID)
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        where OOM.ORDER_ID = #{orderId}
+          AND EXISTS(select TWR.MATERIAL_ID
+                         from TMSTRUCK_TOTAL_RESULT TTR
+                                  left join TMSTRUCK_WEIGHT_RESULT TWR
+                                            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                         where TTR.ORDER_ID = OOM.ORDER_ID
+                           and OOM.MATERIAL_ID = TWR.MATERIAL_ID
+            )
+    </select>
+
 </mapper>

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

@@ -198,14 +198,16 @@
 
     <select id="getOrderTypeByOrderNumber" parameterType="string" resultType="map">
         select OO.ORDER_TYPE "orderType",
-               OO.ORDER_TYPE              "orderTypee",
-               TTR.RESULT_TOTAL_ID "totalId",
-               TTR.RESULT_TOTAL_ID "resultTotalId",
+               OO.ORDER_TYPE "orderTypee",
                OO.ORDER_ID      "orderId",
                OO.ORDER_LINE_SEQUENCE "Sqe",
                OO.LINE_ID           "lineId",
+               OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe",
+               OO.PRICE_ID      "priceId",
+               OO.CAPACITY_ID   "capacityId",
                RC.CAPACITY_NUMBER   "capacityNumber",
-               OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe"
+               TTR.RESULT_TOTAL_ID "totalId",
+               TTR.RESULT_TOTAL_ID "resultTotalId"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID