修改退货

pom.xml

@@ -163,7 +163,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>MEASURE_JSON_DATA</param>-->
-                        <param>TMSTRUCK_TIME_TASK_RESULT</param>
+                        <param>TMSTRUCK_UNLOAD_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -57,6 +57,22 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
         int i = tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
         return success(i);
     }
+
+
+
+    @ApiOperation(value="发送零星退货计量委托给达州钢铁")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/addSporadicOddMeasureCommission")
+    public RESTfulResult addSporadicOddMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        int i = tmstruckMeasureCommissionService.addSporadicOddMeasureCommission(map);
+        if (i==0){
+            return failed("发送委托失败，请联系管理员");
+        }
+        return success(i);
+    }
+
     @ApiOperation(value="发送计量委托 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),

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

@@ -105,6 +105,8 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
             return failed("该订单没有卸货作业");
         }else if( i == -6) {
             return failed("请通知司机完成前序操作再来卸货！");
+        }else if (i==-4){
+            return failed("委托发送失败,无法卸货");
         }
         else{
             return failed("卸货失败，请联系管理员！");

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

@@ -117,6 +117,12 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="卸货人",required=false)
     private BigDecimal unloaderId;
 
+    /**
+     * 卸货支数(UNLOAD_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸货支数",required=false)
+    private BigDecimal unloadNumber;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -273,6 +279,14 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         this.unloaderId = unloaderId;
     }
 
+    public BigDecimal getUnloadNumber() {
+        return unloadNumber;
+    }
+
+    public void setUnloadNumber(BigDecimal unloadNumber) {
+        this.unloadNumber = unloadNumber;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -297,6 +311,7 @@ public class TmstruckUnloadResult implements IBasePO<BigDecimal> {
         sb.append(", segmentSqe=").append(segmentSqe);
         sb.append(", materialId=").append(materialId);
         sb.append(", unloaderId=").append(unloaderId);
+        sb.append(", unloadNumber=").append(unloadNumber);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -34,5 +34,8 @@ public interface ITmstruckMeasureCommissionService{
     //发送计量委托
     int sendMeasureCommssion(Map<String,Object> map);
 
+    //发送退货计量委托
+    int addSporadicOddMeasureCommission(Map<String,Object> map);
+
     Map<String, Object>  sendLiuPiMeasureCommission(String capacityNumber) throws InterruptedException;
 }

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

@@ -225,7 +225,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 12:
             case 13:
             case 14:
-            case 19:
                 //发送计量委托(查询物资顺序第一个装卸货的物资)
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
@@ -233,6 +232,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 20:
                 checkMeasureCommission += tmstruckMeasureCommissionService.sendMeasureCommissionByGatepost(map);
+                break;
+            case 19:
+                checkMeasureCommission = 1;
         }
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");

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

@@ -318,6 +318,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 break;
             case 12:
             case 13:
+            case 19:
             case 14:
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);

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

@@ -267,6 +267,51 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         return sendMesToMeasure(measureCommission);
     }
 
+    /**
+     * 零星退货-钢材进厂
+     */
+    /**
+     * 发送退货委托:1-老厂区钢材
+     * @param map
+     * @return
+     */
+    public int addSporadicOddMeasureCommission(Map<String, Object> map){
+        Map<String, Object> measureCommission = null;
+        if(map.get("firstMC") != null){ //进厂发送空委托
+            measureCommission = new HashMap<>();
+            measureCommission.put("flowTo","销售退货");
+            measureCommission.put("carNum", map.get("capacityNumber"));
+            measureCommission.put("transportNum", map.get("orderNumber"));
+        }else {
+           //发送零星委托
+            measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+            measureCommission.put("isDel", false);
+            measureCommission.put("isInsert", true);
+            measureCommission.put("isRelationEAS", false);
+            measureCommission.put("flowTo", "销售退货");
+            measureCommission.put("numberOfFurnaces",null);
+            String materiaName = (String) measureCommission.get("materiaName");
+            if(materiaName.contains("盘螺")){ //如果名字中包含盘螺则为磅重交货
+                measureCommission.put("deliveryMethod", "磅重");
+            }else {
+                measureCommission.put("deliveryMethod", "理重");
+            }
+            //查询已经计量物资
+            //Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
+            //查询有净重的条数，如果有净重的条数为0，则为false，否则发true
+            Integer materialNum = tmstruckMeasureCommissionMapper.getNoNetWeight(DataChange.dataToBigDecimal(map.get("orderId")));
+            if(materialNum == 0){
+                measureCommission.put("IsAssembly", false);
+            }else {
+                measureCommission.put("IsAssembly", true);
+            }
+        }
+        System.out.println(measureCommission);
+        return sendMesToMeasure(measureCommission);
+    }
+
+
+
     /**
      * 添加零星物资计量委托
      * @param map
@@ -723,7 +768,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 i+=sendMeasureCommissionByGatepost(map);
                 break;
             case 14:
-
                 break;
             case 20:
                 //发送计量委托(查询物资顺序第一个装卸货的物资)
@@ -781,6 +825,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     }
      **/
 
+
     /**
      * 发送留皮委托
      * @Author TXF

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

@@ -41,17 +41,24 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
 
     @Autowired
     private TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
+
     @Autowired
     private UtilsMapper utilsMapper;
+
     @Autowired
     private UtilsServiceImpl utilsService;
+
     @Autowired
     private OmsFeign omsFeign;
+
     @Autowired
     private BmsTruckFeign bmsTruckFeign;
+
     @Autowired
     private AmsFeign amsFeign;
+
     private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车,50吨吊车";
+
     private static final String FourHour="220吨吊车,130吨吊车,120吨吊车,150吨吊车,100吨吊车";
 
 

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

@@ -184,12 +184,22 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             return 1;
         }
         //如果是零星多拼订单 需要查询这个物资是否已经卸过了
-        if(orderType == 12 || orderType == 13){
-            map.put("updateLoadResult", 1); //需要路段顺序号查询
+        if(orderType == 12 || orderType == 13||orderType==19){
+            mesMap.put("updateLoadResult", 1); //需要路段顺序号查询
             Integer checkMaterial = tmstruckUnloadResultMapper.checkMaterialIdUnload(DataChange.dataToBigDecimal(mesMap.get("totalId")), DataChange.dataToBigDecimal(map.get("materialId")));
             if(checkMaterial != null){
                 return -2;  //已卸过此物资
             }
+            if (orderType==19){
+                //发送计量委托
+                Map<String,Object> sporadicMap=new HashMap<>();
+                sporadicMap.put("orderId",DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue());
+                sporadicMap.put("materialId",DataChange.dataToBigDecimal(map.get("materialId")));
+                int i = tmstruckMeasureCommissionService.addSporadicOddMeasureCommission(sporadicMap);
+                if (i==0){
+                    return -4;
+                }
+            }
         }
         Map<String, Object> dataMap = tmstruckUnloadResultMapper.selectUnloadMesByOrderNo(mesMap);
         if(dataMap == null){
@@ -203,8 +213,9 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             return -6;
         }
         map.putAll(dataMap);
-        updateUnloadResultBy(map); //更新卸货实绩
-        if(netWeight == 0 || (netWeight == 1 && (orderType == 10 || orderType == 20))){ //如果没有净重 则更新路段顺序号  有则不更新
+        updateUnloadResultBy(map);//更新卸货实绩
+
+        if(netWeight == 0 || (netWeight == 1 && (orderType == 10 || orderType == 20||orderType==19))){ //如果没有净重 则更新路段顺序号  有则不更新
             //路段顺序号 + 1
             map.put("orderId", mesMap.get("orderId"));
             utilsService.updateOrderLineSequence(map);
@@ -289,6 +300,9 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         if (map.get("materialId") != null){
             tmstruckUnloadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         }
+        if (map.get("unloadNumber")!=null){
+            tmstruckUnloadResult.setUnloadNumber(DataChange.dataToBigDecimal(map.get("unloadNumber")));
+        }
         //获得卸货时间
         tmstruckUnloadResult.setResultEndTime(new Date());
         //扫码后确认卸货所以卸货状态码为  同意

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

@@ -20,17 +20,19 @@
         <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe" />
         <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
         <result column="UNLOADER_ID" jdbcType="DECIMAL" property="unloaderId" />
+        <result column="UNLOAD_NUMBER" jdbcType="DECIMAL" property="unloadNumber" />
     </resultMap>
     <sql id="columns">
-        RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID, RESULT_START_TIME, RESULT_END_TIME, RESULT_DURATION, 
-    UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID, SEGMENT_SQE, MATERIAL_ID, UNLOADER_ID
+        RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID, RESULT_START_TIME, RESULT_END_TIME, RESULT_DURATION,
+    UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID, SEGMENT_SQE, MATERIAL_ID, UNLOADER_ID,
+    UNLOAD_NUMBER
     </sql>
     <sql id="columns_alias">
-        t.RESULT_ID, t.RESULT_NUMBER, t.RESULT_TOTAL_ID, t.RESULT_START_TIME, t.RESULT_END_TIME, 
-    t.RESULT_DURATION, t.UNLOAD_STATUS, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETE_NAME, t.DELETE_TIME, t.RESULT_UNLOAD_PLACE_ID, 
-    t.SEGMENT_SQE, t.MATERIAL_ID, t.UNLOADER_ID
+        t.RESULT_ID, t.RESULT_NUMBER, t.RESULT_TOTAL_ID, t.RESULT_START_TIME, t.RESULT_END_TIME,
+    t.RESULT_DURATION, t.UNLOAD_STATUS, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETE_NAME, t.DELETE_TIME, t.RESULT_UNLOAD_PLACE_ID,
+    t.SEGMENT_SQE, t.MATERIAL_ID, t.UNLOADER_ID, t.UNLOAD_NUMBER
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM TMSTRUCK_UNLOAD_RESULT
@@ -94,6 +96,9 @@
             <if test="unloaderId != null">
                 and UNLOADER_ID = #{unloaderId}
             </if>
+            <if test="unloadNumber != null">
+                and UNLOAD_NUMBER = #{unloadNumber}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -152,6 +157,9 @@
             <if test="unloaderId != null">
                 and UNLOADER_ID = #{unloaderId}
             </if>
+            <if test="unloadNumber != null">
+                and UNLOAD_NUMBER = #{unloadNumber}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -212,6 +220,9 @@
         <if test="unloaderId != null">
             or UNLOADER_ID = #{unloaderId}
         </if>
+        <if test="unloadNumber != null">
+            or UNLOAD_NUMBER = #{unloadNumber}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
         insert into TMSTRUCK_UNLOAD_RESULT (RESULT_ID, RESULT_NUMBER, RESULT_TOTAL_ID,
@@ -219,15 +230,15 @@
                                             UNLOAD_STATUS, INSERT_USERNAME, INSERT_TIME,
                                             UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                             DELETE_NAME, DELETE_TIME, RESULT_UNLOAD_PLACE_ID,
-                                            SEGMENT_SQE, MATERIAL_ID, UNLOADER_ID
-        )
+                                            SEGMENT_SQE, MATERIAL_ID, UNLOADER_ID,
+                                            UNLOAD_NUMBER)
         values (#{resultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, #{resultTotalId,jdbcType=DECIMAL},
                 #{resultStartTime,jdbcType=TIMESTAMP}, #{resultEndTime,jdbcType=TIMESTAMP}, #{resultDuration,jdbcType=DECIMAL},
                 #{unloadStatus,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{resultUnloadPlaceId,jdbcType=DECIMAL},
-                #{segmentSqe,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{unloaderId,jdbcType=DECIMAL}
-               )
+                #{segmentSqe,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{unloaderId,jdbcType=DECIMAL},
+                #{unloadNumber,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
         insert into TMSTRUCK_UNLOAD_RESULT
@@ -286,6 +297,9 @@
             <if test="unloaderId != null">
                 UNLOADER_ID,
             </if>
+            <if test="unloadNumber != null">
+                UNLOAD_NUMBER,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="resultId != null">
@@ -342,6 +356,9 @@
             <if test="unloaderId != null">
                 #{unloaderId,jdbcType=DECIMAL},
             </if>
+            <if test="unloadNumber != null">
+                #{unloadNumber,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
@@ -362,7 +379,8 @@
             RESULT_UNLOAD_PLACE_ID = #{resultUnloadPlaceId,jdbcType=DECIMAL},
             SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
             MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-            UNLOADER_ID = #{unloaderId,jdbcType=DECIMAL}
+            UNLOADER_ID = #{unloaderId,jdbcType=DECIMAL},
+            UNLOAD_NUMBER = #{unloadNumber,jdbcType=DECIMAL}
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
@@ -419,6 +437,9 @@
             <if test="unloaderId != null">
                 UNLOADER_ID = #{unloaderId,jdbcType=DECIMAL},
             </if>
+            <if test="unloadNumber != null">
+                UNLOAD_NUMBER = #{unloadNumber,jdbcType=DECIMAL},
+            </if>
         </set>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
@@ -444,8 +465,8 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETE_NAME,
         DELETE_TIME, RESULT_UNLOAD_PLACE_ID,
-        SEGMENT_SQE, MATERIAL_ID, UNLOADER_ID
-        )
+        SEGMENT_SQE, MATERIAL_ID, UNLOADER_ID,
+        UNLOAD_NUMBER)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
@@ -456,8 +477,8 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
         #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultUnloadPlaceId,jdbcType=DECIMAL},
-        #{item.segmentSqe,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.unloaderId,jdbcType=DECIMAL}
-        from dual
+        #{item.segmentSqe,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.unloaderId,jdbcType=DECIMAL},
+        #{item.unloadNumber,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -535,6 +556,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.unloaderId,jdbcType=DECIMAL}
         </foreach>
+        ,UNLOAD_NUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.unloadNumber,jdbcType=DECIMAL}
+        </foreach>
         where RESULT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.resultId,jdbcType=DECIMAL}
@@ -669,17 +694,17 @@
     <select id="selectUnloadMesByOrderNo" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-                 select
-                        TUR.RESULT_ID       "resultId",
-                        TUR.SEGMENT_SQE     "segmentSqe",
-                        TUR.RESULT_TOTAL_ID "resultTotalId"
-                 from TMSTRUCK_UNLOAD_RESULT TUR
-                 where TUR.RESULT_TOTAL_ID = #{resultTotalId}
-                   <if test="updateLoadResult != null">
-                       and TUR.RESULT_END_TIME is null
-                   </if>
-                 order by TUR.SEGMENT_SQE
-             )
+        select
+        TUR.RESULT_ID       "resultId",
+        TUR.SEGMENT_SQE     "segmentSqe",
+        TUR.RESULT_TOTAL_ID "resultTotalId"
+        from TMSTRUCK_UNLOAD_RESULT TUR
+        where TUR.RESULT_TOTAL_ID = #{resultTotalId}
+        <if test="updateLoadResult != null">
+            and TUR.RESULT_END_TIME is null
+        </if>
+        order by TUR.SEGMENT_SQE
+        )
         where rownum = 1
     </select>
 
@@ -879,8 +904,8 @@
         SELECT *
         FROM (
         SELECT
-               distinct
-               TUR.RESULT_ID             "resultId",
+        distinct
+        TUR.RESULT_ID             "resultId",
         OO.ORDER_NUMBER || RC.CAPACITY_NUMBER || RW.WAREHOUSE_NAME || RM.MATERIAL_NAME "mohu",
         OO.ORDER_NUMBER           "orderNumber",
         RC.CAPACITY_NUMBER        "capacityNumber",
@@ -917,7 +942,7 @@
         )
         <where>
             <if test="con !=null">
-                 and "mohu" like #{con}
+                and "mohu" like #{con}
             </if>
             <if test="orderNumber != null">
                 and
@@ -994,12 +1019,12 @@
         <if test="orderTypee == 100">
             AND OO.ORDER_TYPE in (12, 13 ,14,19)
         </if>
-         <if test="userId != null">
-             and ASO.INSERT_USERNAME=#{userId}
-         </if>
-         <if test="userIds!=null">
-              and ASO.UPDATE_USERNAME=#{userIds}
-         </if>
+        <if test="userId != null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        <if test="userIds!=null">
+            and ASO.UPDATE_USERNAME=#{userIds}
+        </if>
         )
         <where>
             <if test="orderNumber != null">
@@ -1066,10 +1091,10 @@
                oo.ORDER_NUMBER "orderNumber",
 
                TTR.RESULT_TOTAL_ID "totalId"
-               FROM OMSTRUCK_ORDER OO
-               LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-               ON TTR.ORDER_ID = OO.ORDER_ID
-               WHERE OO.ORDER_NUMBER = #{orderNumber}
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
     <select id="getNetWeightByTotalId" parameterType="java.math.BigDecimal" resultType="int">