Merge remote-tracking branch 'origin/master'

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/StatisticalReportController.java

@@ -544,12 +544,18 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     Integer pageSize,
                                                     String startTime,
                                                     String endTime,
-                                                    String con
+                                                    String con,
+                                                    String isPage
     ){
         if (con != null && !"undefined".equals(con)) {
             mapValue.put("con",con);
         }
+
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        if(isPage != null && !"".equals(isPage)){
+            List<Map<String, Object>> report = statisticalReportService.getLoaderForResultDetail(mapValue);
+            return success(report);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getLoaderForResultDetail(mapValue);
@@ -628,7 +634,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         }
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> report = statisticalReportService.getCapacityByDefend(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
         return success(pageList);
     }
 

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/TmstruckSelfMachineController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +33,16 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
        return map;
     }
 
+    /**
+     * 打印提货单
+     * @param orderNumber
+     * @return
+     */
+    @PostMapping("/getBillOrderForPrinter")
+    public List<Map<String, Object>> getBillOrderForPrinter(@RequestParam String orderNumber){
+        return tmstruckSelfMachineService.getBillOrderForPrinter(orderNumber);
+    }
+
     /**
      * 送货单
      * @param orderNumber

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

@@ -56,6 +56,8 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     Map<String, Object> getBillOrder(String orderNumber);
 
+    List<Map<String, Object>> getBillOrderForPrinter(String orderNumber);
+
     List<Map<String, Object>>getBillOrderMaterial(String orderNumber);
 
      //通过运输订单获取零星物资进厂实绩

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/ITmstruckSelfMachineService.java

@@ -14,4 +14,6 @@ public interface ITmstruckSelfMachineService {
     Map<String, Object> getBillOrder(String orderNumber);
 
     Map<String, Object> getDeliveryOrder(String orderNumber);
+
+    List<Map<String, Object>> getBillOrderForPrinter(String orderNumber);
 }

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

@@ -196,8 +196,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             }
         }
         if(orderType == 2){
-            //根据总实绩ID查询该车有没有装货
             Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            //根据总实绩ID查询该车有没有装货
             if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
                 throw new Exception("该车未扫装货，请提醒司机去扫装货");
             }
@@ -215,6 +215,12 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
             }
         }
+        //if(orderType == 13){
+        //    Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+        //    if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
+        //        throw new Exception("该车未扫装货，请提醒司机去扫装货");
+        //    }
+        //}
         map.putAll(mesMap);
         map.putAll(selectMap);
         map.remove("Sqe");
@@ -231,7 +237,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
                 try {
                     //发送短信
-                    Map<String,Object>messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
+                    Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
                     if(messageMap.get("saleOrderConsigneeTEL") != null){
                             String capacityNum = (String) messageMap.get("capacityNumber");
                             String mobile = (String)messageMap.get("saleOrderConsigneeTEL");
@@ -318,6 +324,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/TmstruckSelfMachineService.java

@@ -40,6 +40,10 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
         }
         return map;
     }
+    @Override
+    public List<Map<String, Object>> getBillOrderForPrinter(String orderNumber) {
+        return tmstruckEnfactoryResultMapper.getBillOrderForPrinter(orderNumber);
+    }
 
     @Override
     public Map<String, Object> getDeliveryOrder(String orderNumber) {

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

@@ -70,6 +70,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String mobile1 = mobile;
         String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。退订";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
+        System.out.println(mobile1);
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();
         jsonData = HTTPRequestUtils.send(sendUrl,jsonObject,"utf-8");

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吨吊车";
 
 
@@ -317,7 +324,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 int Time1 = dateTime3.intValue() - resultPauseTime.intValue();
                 Map<String, Object> requirementInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId);
                 String capacityTypeName =(String) requirementInfo.get("capacityTypeName");
-                if (capacityTypeName.contains("吊车")) {
+                if (capacityTypeName != null && capacityTypeName.contains("吊车")) {
                     //100吨以下
                     int hours=Time1/60;
                     BigDecimal minutes=new BigDecimal(Time1%60);
@@ -369,10 +376,10 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 //如果车辆类型为100 吨以下吨位吊车作业时间以2小时为起点计算，超过2小时以实际作业时间计算
                 Map<String, Object> requirementInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId);
                 String capacityTypeName =(String) requirementInfo.get("capacityTypeName");
-                if (capacityTypeName.contains("吊车")) {
+                if (capacityTypeName != null && capacityTypeName.contains("吊车")) {
                     //100吨以下
-                    BigDecimal hours=new BigDecimal(dateTime1 / (1000*60*60));
-                    BigDecimal minutes=new BigDecimal(dateTime3.intValue()%60);
+                    BigDecimal hours =new BigDecimal(dateTime1 / (1000*60*60));
+                    BigDecimal minutes =new BigDecimal(dateTime3.intValue()%60);
                     int hour = Integer.parseInt(String.valueOf(hours));
                     if (TwoHour.contains(capacityTypeName)) {
                         //判断是否小于2个小时

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/StatisticalReportMapper.xml

@@ -1308,8 +1308,8 @@
         <if test="endDate != null" >
             and to_date(#{endDate},'yyyy-mm-dd hh24:mi:ss') >= tlfr.RESULT_OUT_GATE_TIME
         </if>
-        <if test="con != null">
-            and (instr(rc.CAPACITY_NUMBER, #{con}) > 0 or instr(rg1.GATEPOST_NAME, #{con}) > 0 or instr(rg2.GATEPOST_NAME, #{con}) > 0 )
+        <if test="con != null and con!=''.toString()">
+            and (instr(rc.CAPACITY_NUMBER, #{con}) > 0 or instr(rg2.GATEPOST_NAME, #{con}) > 0 )
         </if>
         </where>
 		order by ter.RESULT_ENTRY_GATE_TIME desc
@@ -1328,6 +1328,7 @@
                 </foreach>
             </if>
         </where>
+        <include refid="orderBy"></include>
     </select>
     <select id="getInwardReportForAssemble" resultType="java.util.Map" parameterType="java.util.Map">
         select *
@@ -1344,14 +1345,14 @@
         twr.result_tare_weight_time  "tareWeightTime",
         twr.result_net_weight        "resultNetWeight",
         RC.CARRIER_NAME "carrierName",
-        RL.LINE_NAME "lineName",
         db.RESULT_FOREIGN_SHIP_NAME "shipName",
-        rw2.WAREHOUSE_NAME  "warehouseName"
+        rw2.WAREHOUSE_NAME  "unloadName",
+        rw.WAREHOUSE_NAME   "loadName",
+        decode(OO.ORDER_TYPE,15,'拼装车皮进厂',16,'一焦化采购内转') "orderType",
+        decode(oo.ORDER_TYPE,15,'达钢厂区内转',16,'达钢厂区内转') "rangeValue"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
-        LEFT JOIN RMS_LINE RL
-        ON RL.LINE_ID=OO.LINE_ID
         left join rms_material rm
         on rm.material_id = oom.material_id
         left join rms_capacity rc
@@ -1376,20 +1377,14 @@
         on ttr.order_id = oo.order_id
         left join tmstruck_weight_result twr
         on twr.result_total_id = ttr.result_total_id
-        left join rms_truck_calculate rtc1
-        on rtc1.truck_calculate_id = twr.result_tare_place_id
         left join tmstruck_load_result tlr
         on tlr.result_total_id = ttr.result_total_id
         left join rms_warehouse rw
         on rw.warehouse_id = tlr.loading_id
-        left join rms_truck_calculate rtc2
-        on rtc2.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 rw2
         on rw2.warehouse_id = tur.result_unload_place_id
-        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1
-        ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where
         twr.result_net_weight IS NOT NULL
         AND  OO.ORDER_STATUS = 2
@@ -1583,12 +1578,18 @@
                      twr4.result_net_weight        "resultNetWeight",
                      GREATEST(TWR4.RESULT_GROSS_WEIGHT_TIME,TWR4.RESULT_TARE_WEIGHT_TIME) "netTime",
                      RC.CARRIER_NAME "carrierName",
-                     RL.LINE_NAME "lineName"
+                     RL.LINE_NAME "lineName",
+                     rw.WAREHOUSE_NAME  "loadName",
+                     rw2.WAREHOUSE_NAME "unloadName",
+                     RTR.TRANS_RANGE_VALUE "rangeValue",
+                     DECODE(ORDER_TYPE,10,'化工园区铁专线-焦化二厂采购内转',20,'化工园区铁专线-达钢老厂采购内转') "orderType"
                        from omstruck_order oo
                        left join omstruck_order_material oom
                        on oom.order_id = oo.order_id
                        LEFT JOIN RMS_LINE RL
                         ON RL.LINE_ID=OO.LINE_ID
+                       LEFT JOIN RMS_TRANS_RANGE RTR
+                        ON RTR.TRANS_RANGE_ID = RL.TRANS_RANGE_ID
                        left join rms_material rm
                        on rm.material_id = oom.material_id
                        left join rms_capacity rc
@@ -1611,16 +1612,12 @@
                                  on ttr.order_id = oo.order_id
                        left join tmstruck_weight_result twr1
                                  on twr1.result_total_id = ttr.result_total_id
-                       left join rms_truck_calculate rtc1
-                                 on rtc1.truck_calculate_id = twr1.result_tare_place_id
                        left join tmstruck_load_result tlr
                                  on tlr.result_total_id = ttr.result_total_id
                        left join rms_warehouse rw
                                  on rw.warehouse_id = tlr.loading_id
                        left join tmstruck_weight_result twr2
                                  on twr2.result_total_id = ttr.result_total_id
-                       left join rms_truck_calculate rtc2
-                                 on rtc2.truck_calculate_id = twr2.result_gross_place_id
                        left join tmstruck_weight_result twr3
                                  on twr3.result_total_id = ttr.result_total_id
                        left join rms_truck_calculate rtc3
@@ -1680,12 +1677,17 @@
                RL.LINE_NAME "lineName",
                RC3.CARRIER_NAME "carrierName",
                GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
-               DB.RESULT_FOREIGN_SHIP_NAME  "shipName"
+               DB.RESULT_FOREIGN_SHIP_NAME  "shipName",
+               RTR.TRANS_RANGE_VALUE    "rangeValue",
+               RW.WAREHOUSE_NAME        "loadName",
+               RW2.WAREHOUSE_NAME       "unloadName"
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OO.ORDER_ID=OOM.ORDER_ID
         LEFT JOIN RMS_LINE RL
         ON RL.LINE_ID=OO.LINE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = RL.TRANS_RANGE_ID
         LEFT JOIN RMS_CAPACITY RC
         ON OO.CAPACITY_ID=RC.CAPACITY_ID
         LEFT JOIN RMS_MATERIAL RM
@@ -1703,11 +1705,17 @@
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON  TTR.ORDER_ID=OO.ORDER_ID
         left join TMSTRUCK_LOAD_RESULT TLR
-         ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+         ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+        left join RMS_WAREHOUSE RW
+        on rw.WAREHOUSE_ID = tlr.LOADING_ID
+        left join TMSTRUCK_UNLOAD_RESULT TUR
+        ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW2
+        ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         <where>
-        OO.ORDER_TYPE IN (6,7) and  TWR.RESULT_NET_WEIGHT IS NOT NULL and RL.LINE_ID IN (129988,129989,129991,129992,89992)
+        OO.ORDER_TYPE IN (6,7) and  TWR.RESULT_NET_WEIGHT IS NOT NULL and RL.LINE_ID IN (129988,129989,129991,129992,89992,169984)
         <if test="orgCode!=null">
         AND   OO.OPTIONER_CODE=#{orgCode}
         </if>
@@ -1742,19 +1750,21 @@
         greatest(TWR.RESULT_TARE_WEIGHT_TIME,TWR.RESULT_GROSS_WEIGHT_TIME) "netTime",
         TWR.RESULT_GROSS_WEIGHT_TIME "grossweightTime",
         TWR.RESULT_GROSS_WEIGHT "grossWeight",
-        RL.LINE_NAME "lineName",
+        RW1.WAREHOUSE_NAME "unloadName",
+        RW2.WAREHOUSE_NAME "loadName",
         RC2.CARRIER_NAME "carrierName",
-        RMT.MATERIAL_TYPE_NAME "materialTypeName"
+        RMT.MATERIAL_TYPE_NAME "materialTypeName",
+        RTR.TRANS_RANGE_VALUE   "rangeValue",
+        decode(ORDER_TYPE,11,'纯内转') "orderType"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
-        left join RMS_LINE RL ON OO.LINE_ID=RL.LINE_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
         left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC1 on RTC1.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join RMS_TRUCK_CALCULATE RTC2 on RTC2.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         left join AMSTRUCK_INWARD_PLAN AIP on AIP.PLAN_ID = OO.ORDER_PLAN_ID
         left join AMSTRUCK_REQUIREMENT_PLAN ARP on AIP.PLAN_ID = ARP.PLAN_ID
-        left join RMS_CARRIER RC2 ON RC2.CARRIER_ID=AIP.CARRIER_ID
+        left join RMS_CARRIER RC2 ON RC2.CARRIER_ID = AIP.CARRIER_ID
         left join AMSTRUCK_INWARD_REQUIREMENT AIR on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         left join RMS_SHIPPER RS on AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
         left join AMSTRUCK_REQUIREMENT_MATERIAL ARM on AIR.REQUIREMENT_ID = ARM.REQUIREMENT_ID
@@ -1762,6 +1772,7 @@
         left join RMS_WAREHOUSE RW1 on ARM.REQUIREMENT_UNLOAD_UNIT_ID = RW1.WAREHOUSE_ID
         left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
         left join RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         <where>
             TWR.RESULT_NET_WEIGHT IS NOT NULL
             AND  OO.ORDER_STATUS = 2
@@ -1800,14 +1811,19 @@
         twr.result_net_weight        "resultNetWeight",
         GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
         RC.CARRIER_NAME "carrierName",
-        RL.LINE_NAME "lineName",
         DB.RESULT_FOREIGN_SHIP_NAME "shipName",
-        rw2.WAREHOUSE_NAME  "warehouseName"
+        rw2.WAREHOUSE_NAME  "unloadName",
+        rw.WAREHOUSE_NAME  "loadName",
+        RL.LINE_NAME    "lineName",
+        RTR.TRANS_RANGE_VALUE   "rangeValue",
+        DECODE(OO.ORDER_TYPE,23,'厂外内转-老厂',24,'厂外内转-二厂') "orderType"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
         LEFT JOIN RMS_LINE RL
         ON RL.LINE_ID=OO.LINE_ID
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = RL.TRANS_RANGE_ID
         left join rms_material rm
         on rm.material_id = oom.material_id
         left join rms_capacity rc
@@ -1832,14 +1848,10 @@
         on ttr.order_id = oo.order_id
         left join tmstruck_weight_result twr
         on twr.result_total_id = ttr.result_total_id
-        left join rms_truck_calculate rtc1
-        on rtc1.truck_calculate_id = twr.result_tare_place_id
         left join tmstruck_load_result tlr
         on tlr.result_total_id = ttr.result_total_id
         left join rms_warehouse rw
         on rw.warehouse_id = tlr.loading_id
-        left join rms_truck_calculate rtc2
-        on rtc2.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 rw2

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

@@ -1500,5 +1500,56 @@
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getBillOrderForPrinter" resultType="java.util.Map">
+        SELECT distinct
+            OO.ORDER_NUMBER "orderNumber",
+            R_CARRIER.CARRIER_NAME "carrierName",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            RM.MATERIAL_NAME || ' ' || RW.WAREHOUSE_NAME || ' ' || ASM.STEEL_METER || '米'  "materialName",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+            ASM.STEEL_METER "steelMeter",
+            ASM.MATERIAL_NUMBER "materialNum",
+            RS.SHIPPER_NAME "shipperName",
+            RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+            ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+            RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+            RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+            ASOM.SALE_DATE_OF_RECEIPT "deadLine",
+            TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) "billDate",
+            OO.DRIVER_TEL "capacityTel"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                 LEFT JOIN RMS_RECEIVE_PLACE RRP
+                           ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                 LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_CARRIER R_CARRIER
+                           ON R_CARRIER.CARRIER_ID = ADSO.CARRIER_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID=OO.ORDER_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        WHERE
+            oo.order_number = #{orderNumber}
+          --and oo.ORDER_STATUS = 5
+          --and oo.ORDER_PRINT_STATUS is null
+    </select>
 
 </mapper>

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

@@ -1281,6 +1281,7 @@
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
           AND RM.MATERIAL_NAME = '钒渣'
+          AND OO.ORDER_TYPE = 2
           AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
     </select>
 

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">