修改

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

@@ -801,7 +801,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
     })
     @PostMapping("/closeOmstruckOrder")
     public RESTfulResult closeOmstruckOrder(@RequestParam Integer orderId) {
-        int result = omstruckOrderService.closeOmstruckOrder(new BigDecimal(orderId));
+        int result = 0;
+        try {
+            result = omstruckOrderService.closeOmstruckOrder(new BigDecimal(orderId));
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
         return success(result);
     }
 
@@ -1281,4 +1286,50 @@ public class OmstruckOrderController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, diverInfoForSaleorder);
         return success(pageList);
     }
+
+    @ApiOperation(value = "通过运单id或者运单号查询车辆是否放行")
+    @PostMapping("/canCapacityEnfactory")
+    public RESTfulResult canCapacityEnfactory(@RequestBody Map<String,Object> mapValue) {
+        String result = omstruckOrderMapper.canCapacityEnfactory(mapValue);
+        Integer orderType = (Integer) mapValue.get("orderType");
+        if (orderType != 1) {
+            return success("OK");
+        }
+        else {
+            return success(result);
+        }
+    }
+
+    //销售物流接收订单，订单类型为已下发，司机接单状态为已下发，未下发。
+    @ApiOperation(value = "出库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWarehouseMes")
+    public RESTfulResult getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         String startTime,
+                                         String endTime,
+                                         String con
+    ) {
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        if (con != null && (con.equals("") || con.equals("undefined") || con.equals("null"))) {
+            con = null;
+        }
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        //分页数据
+        List<Map<String, Object>> mapList = omstruckOrderService.getWarehouseMes(mapValue);
+        return success(mapList);
+    }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/closeInwardOrderByPlan")
+    public RESTfulResult closeInwardOrderByPlan(@RequestParam Integer planId) {
+        int result = omstruckOrderMapper.closeInwardOrderByPlan(new BigDecimal(planId));
+        return success(result);
+    }
 }

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

@@ -1,15 +1,16 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.druid.support.json.JSONUtils;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.service.impl.OmstruckOrderMaterialServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +41,15 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
 
+    @Autowired
+    JoinFeign joinFeign;
+
+    @Autowired
+    EASUtil easUtil;
+
+    @Autowired
+    EASDeleteTestUtil easDeleteTestUtil;
+
     @ApiOperation(value = "查询钢材订单号")
     @GetMapping("getSteelOrderNum")
     public RESTfulResult getSteelOrderNum(String capacityId){
@@ -54,10 +64,26 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
         return success(map);
     }
 
-    @ApiOperation(value = "查询钢材订单信息")
+    @ApiOperation(value = "修改提货单信息")
     @PostMapping("updateMaterialMes")
     public RESTfulResult updateMaterialMes(@RequestBody(required = false) Map<String, Object> map){
         int i = omstruckOrderMaterialService.updateMaterialMes(map);
+        BigDecimal saleOrderId = DataChange.dataToBigDecimal(map.get("saleOrderId"));
+//         调用金蝶接口，将销售订单推送到金蝶系统
+        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+        Map<String, Object> head = (Map<String, Object>) input.get("head");
+        head.put("status", "update");
+        // 获得金蝶接口配置:正式
+        Map<String, Object> totalMap = easUtil.getTotalMap();
+//        // 获得金蝶接口配置:测试
+//        Map<String, Object> totalMap = easDeleteTestUtil.getTotalMap();
+        // 组装报文
+        totalMap.put("input", input);
+        System.out.println(totalMap);
+        String json = JSONUtils.toJSONString(totalMap);
+        System.out.println(json);
+        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
+        System.out.println(resultMap);
         return success(i);
     }
 }

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

@@ -17,7 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -211,9 +214,38 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
     @PostMapping("/getCapacityAllOrder")
     public RESTfulResult getCapacityAllOrder(String capacityNumber,String date){
         Map<String, Object> map = new HashMap<>();
+        date += "-01 00:00:00";
         map.put("capacityNumber",capacityNumber);
-        if(date != null){
-            map.put("date",date);
+        DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime ldt = LocalDateTime.parse(date,sdf);
+        try {
+            if(date != null){
+                int month = ldt.getMonth().getValue();
+                int year = ldt.getYear();
+                // 判断是否是一月，一月则减一年，月份回到12
+                if (month == 1) {
+                    map.put("startDate", (year - 1) + "-" + 12 + "-" + 26);
+                }
+                // 非一月只需减少一个月份
+                if (month != 1){
+                    if (month > 10) {
+                        map.put("startDate", year + "-" + (month - 1) + "-" + 26);
+                    }
+                    else {
+                        map.put("startDate", year + "-0" + (month - 1) + "-" + 26);
+                    }
+                }
+                if (month >= 10) {
+                    // 结束时间为当月25号
+                    map.put("endDate", year + "-" + month + "-" + 25);
+                }
+                if (month < 10) {
+                    // 结束时间为当月25号
+                    map.put("endDate", year + "-0" + month + "-" + 25);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         List<Map<String, Object>> capacityAllOrderList = omstruckOrderSeparateService.getCapacityAllOrder(map);
         return success(capacityAllOrderList);

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

@@ -33,4 +33,8 @@ public interface JoinFeign {
     // 查询车牌号和金蝶分录
     @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderId")
     Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    // 减少物资件数同步金蝶接口
+    @PostMapping("/api/v1/join/wsface/downMaterialNumber")
+    Map<String,Object> downMaterialNumber(@RequestBody Map<String, Object> map);
 }

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

@@ -346,4 +346,12 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //判断是否为达钢厂区内转
     Map<String,Object> isInwardLine(BigDecimal orderId);
+
+    // 通过运单id或者运单号查询车辆是否放行
+    String canCapacityEnfactory(Map<String, Object> mapValue);
+    // 出库信息
+    List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
+    // 通过运单下的物资信息
+    int closeInwardOrderByPlan(BigDecimal bigDecimal);
+>>>>>>> d53c1c0a3177870b86ae0684d6cb20ac4c5f6eed
 }

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

@@ -53,8 +53,10 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     int updateOutBoundResult(OmstruckOrderMaterial omstruckOrderMaterial);
 
     //修改出库实绩
-    Map<String, Object> getSaleOrderMaterialNum(@Param("orderId")BigDecimal orderId,@Param("materialId") BigDecimal materialId);
+    Map<String, Object> getSaleOrderMaterialNum(Map<String,Object> map);
 
 
     int updateSaleOrderMaterialMes(BigDecimal saleMaterialId, BigDecimal materialNum, BigDecimal newWeight);
+
+    Map<String,Object> findDownMaterial(BigDecimal saleMaterialId);
 }

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

@@ -130,4 +130,9 @@ public interface OmstruckOrderSeparateMapper {
 
     Map<String, Object> getPriceInfo(Integer orderId);
 
+    //查询订单发货日期（订单类型为1）
+    Integer getDeliveryDatePass(Object orderId);
+
+    BigDecimal getWeightTask(BigDecimal orderId);
+
 }

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

@@ -143,7 +143,7 @@ public interface IOmstruckOrderService {
     int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber,Integer carrierId);
 
     // 根据运单id关闭订单
-    int closeOmstruckOrder(BigDecimal orderId);
+    int closeOmstruckOrder(BigDecimal orderId) throws Exception;
 
     // 查询所有车牌号和司机
     List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue);
@@ -208,4 +208,6 @@ public interface IOmstruckOrderService {
     List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
+    // 出库信息
+    List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
 }

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.druid.support.json.JSONUtils;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
@@ -9,6 +11,7 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.EASMaterialNumberUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +49,12 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
     @Autowired
     RmsPwarehouseGridMapper rmsPwarehouseGridMapper;
 
+    @Autowired
+    JoinFeign joinFeign;
+
+    @Autowired
+    EASMaterialNumberUtil easMaterialNumberUtil;
+
     /**
      * 远程调用订单子表新增
      *
@@ -289,36 +298,54 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
      * @return
      */
     @Transactional
-    public int updateMaterialMes(Map<String, Object> map){
+    public int updateMaterialMes(Map<String, Object> map) {
         OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
         List<Map<String,Object>>mapList = (List<Map<String, Object>>) map.get("mapList");
+        Object orderIds = map.get("orderId");
+        Object saleOrderMaterialId = map.get("saleOrderMaterialId");
         for (Map<String, Object>map1 : mapList) {
-            BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-            BigDecimal materialId = DataChange.dataToBigDecimal(map1.get("materialId"));
-            BigDecimal materialNum = DataChange.dataToBigDecimal(map1.get("materialNum"));
-            //修改物资子表总理重 通过订单ID找到件数和总理重，算出单件理重
-            Map<String, Object> saleMaterialMes = omstruckOrderMaterialMapper.getSaleOrderMaterialNum(orderId, materialId);
-            BigDecimal saleMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("saleMaterialId"));//销售订单存放物资子表id
-            BigDecimal materialWeight = DataChange.dataToBigDecimal(saleMaterialMes.get("materialWeight"));//旧总理重
-            BigDecimal newWeight = null;
-            if(materialWeight.intValue() != 0){ //如果总重量不为0，才进行重量更新
-                BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialNumber"));//旧件数
-                BigDecimal theoreticalWeight = materialWeight.divide(orderMaterialNumber, 4);
-                newWeight = theoreticalWeight.multiply(theoreticalWeight); //得到现有理重
-
-                omstruckOrderMaterial.setOrderMaterialWeight(newWeight);
+            if (orderIds != null) {
+                BigDecimal orderId = DataChange.dataToBigDecimal(orderIds);
+                BigDecimal materialId = DataChange.dataToBigDecimal(map1.get("materialId"));
+                BigDecimal materialNum = DataChange.dataToBigDecimal(map1.get("materialNum"));
+                map1.put("orderId",orderId);
+                //修改物资子表总理重 通过订单ID找到件数和总理重，算出单件理重
+                Map<String, Object> saleMaterialMes = omstruckOrderMaterialMapper.getSaleOrderMaterialNum(map1);
+                BigDecimal saleMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("saleMaterialId"));//销售订单存放物资子表id
+                BigDecimal materialWeight = DataChange.dataToBigDecimal(saleMaterialMes.get("materialWeight"));//旧总理重
+                BigDecimal newWeight = null;
+                if (materialWeight.intValue() != 0) { //如果总重量不为0，才进行重量更新
+                    BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialNumber"));//旧件数
+                    BigDecimal theoreticalWeight = materialWeight.multiply(materialNum);
+                    newWeight =  theoreticalWeight.divide(orderMaterialNumber,3, 4);//得到现有理重
+                    omstruckOrderMaterial.setOrderMaterialWeight(newWeight);
+                }
+                //修改销售订单物资子表
+                omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
+                //修改订单物资子表 与出库实绩
+                omstruckOrderMaterial.setOrderId(orderId);
+                omstruckOrderMaterial.setMaterialId(materialId);
+                omstruckOrderMaterial.setOrderMaterialNumber(materialNum);
+                omstruckOrderMaterial.setUpdateTime(new Date());
+                omstruckOrderMaterialMapper.updateMaterialMes(omstruckOrderMaterial);
+                omstruckOrderMaterialMapper.updateOutBoundResult(omstruckOrderMaterial);
+            }
+            else {
+                BigDecimal materialNum = DataChange.dataToBigDecimal(map1.get("materialNum"));
+                map1.put("saleOrderMaterialId",saleOrderMaterialId);
+                //修改物资子表总理重 通过订单ID找到件数和总理重，算出单件理重
+                Map<String, Object> saleMaterialMes = omstruckOrderMaterialMapper.getSaleOrderMaterialNum(map1);
+                BigDecimal saleMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("saleMaterialId"));//销售订单存放物资子表id
+                BigDecimal materialWeight = DataChange.dataToBigDecimal(saleMaterialMes.get("materialWeight"));//旧总理重
+                BigDecimal newWeight = null;
+                if (materialWeight.intValue() != 0) { //如果总重量不为0，才进行重量更新
+                    BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("materialNumber"));//旧件数
+                    BigDecimal theoreticalWeight = materialWeight.multiply(materialNum);
+                    newWeight =  theoreticalWeight.divide(orderMaterialNumber,2, 4);//得到现有理重
+                }
+                //修改销售订单物资子表
+                omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
             }
-            //修改销售订单物资子表
-            omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
-
-            //修改订单物资子表 与出库实绩
-            omstruckOrderMaterial.setOrderId(orderId);
-            omstruckOrderMaterial.setMaterialId(materialId);
-            omstruckOrderMaterial.setOrderMaterialNumber(materialNum);
-            omstruckOrderMaterial.setUpdateTime(new Date());
-            omstruckOrderMaterialMapper.updateMaterialMes(omstruckOrderMaterial);
-            omstruckOrderMaterialMapper.updateOutBoundResult(omstruckOrderMaterial);
-
         }
         return 1;
     }

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

@@ -686,13 +686,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 }
             }
         }
-        //根据订单ID查找需求里面的承运范围和物资
-        Map<String,Object>priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
-        if(priceMap.get("rangeId") ==null){
-            priceMap.put("rangeId",new BigDecimal(1));
-        }
-        Map<String,Object>priceValueMap = null;
+        //根据订单ID查找需求里面的承运范围和物资ID、物资品类ID
         try {
+            Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
+            Map<String,Object> priceValueMap = null;
             priceValueMap = amsFeign.getInwardPriceBy(priceMap);
             if(priceValueMap != null){
                 priceValueMap.put("netWeight", resultNetWeight);
@@ -701,6 +698,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             }
         } catch (Exception e) {
             e.printStackTrace();
+            System.out.println(e.getMessage());
         }
         return i;
     }
@@ -747,8 +745,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public Integer getCapacityTypeByUserId(Map<String, Object> map) {
         String userId =(String) map.get("userId");
         BigDecimal capacityType = rmsCapacityMapper.getCapacityTypeByUserId(userId);
-//        System.out.println("capacityType"+capacityType);
-        return capacityType.intValue();
+        if(capacityType != null){
+            return capacityType.intValue();
+        }else{
+            return -1;
+        }
+
     }
 
     /**

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

@@ -12,6 +12,7 @@ import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.EASCapacityTestUtil;
 import io.swagger.models.auth.In;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -576,13 +577,21 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
+        if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1){
+            throw new Exception("钢材订单不允许撤销!");
+        }
+        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
+            throw new Exception("撤单失败");
+        }
         BigDecimal orderPlanId = DataChange.dataToBigDecimal(mesMap.get("orderPlanId"));
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(8));
-        omstruckOrder.setInsertUpdateRemark("司机撤销订单将订单删除");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateStr = sdf.format(new Date());
+        omstruckOrder.setInsertUpdateRemark(map.get("capacityNumber") + "司机撤销订单将订单删除," + "撤销时间:" + dateStr + "撤销时路段顺序号为:" + mesMap.get("lineSqe"));
         //讲路段顺序号设为空，适应进厂以后扫码
         omstruckOrder.setOrderLineSequence(new BigDecimal(0));
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
@@ -631,9 +640,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderSeparateMapper.updateTranTimes(orderPlanId, transTimes.intValue() - 1);
             }
         }
-        System.out.println(orderId + "撤单成功");
+        System.out.println(map.get("capacityNumber") + "司机撤销订单将订单删除" + "撤销时间:" + dateStr + "撤销订单号为:" + orderId);
         return result;
     }
+
    //修改运力
     @Override
     public int updateCapacityId(Map<String,Object> map) {
@@ -778,6 +788,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return omstruckOrderMapper.getTransportOrder(mapValue);
     }
 
+    /**
+     * 出库信息
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue) {
+        return omstruckOrderMapper.getWarehouseMes(mapValue);
+    }
+
     /**
      * 销售物流，下发订单
      *
@@ -1484,7 +1504,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      * @return
      */
     @Override
-    public int closeOmstruckOrder(BigDecimal orderId) {
+    public int closeOmstruckOrder(BigDecimal orderId) throws Exception {
+        BigDecimal i = omstruckOrderSeparateMapper.getWeightTask(orderId);
+        if(i != null){
+            throw new Exception("存在计量实绩,无法删除");
+        }
         OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(orderId);
         omstruckOrder.setOrderStatus(new BigDecimal(7));
         int result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
@@ -2086,6 +2110,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            if (orderType == 1) {
+                Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDatePass(orderMesMap.get("orderId"));
+                if(judgeDate == null){ // 数据为空则是已过截止日期 关闭订单
+                    omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
+                    continue;
+                }
+            }
             if(orderType == 10|| orderType == 20 || orderType == 15 || orderType == 16 || orderType == 23 || orderType == 24){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效

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

@@ -38,7 +38,7 @@ public class ZJXLUtilServiceImpl {
 
     private String lonlat = "107.4628199,31.1925279"; //中心点坐标
 
-    private String radius = "3000"; //半径
+    private String radius = "15000"; //半径
 
     /**
      * 车辆订阅接口

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

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASDeleteTestUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASDeleteUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶测试环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASMaterialNumberUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "changeActualQtyHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "1";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

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

@@ -1891,7 +1891,7 @@
     <!--销售，查看运输订单(钢材销售订单)并根据司机接受或者拒绝时间进行排序  -->
     <select id="selectTransportOrderForSale" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT * FROM (
-        SELECT *from(
+        SELECT DISTINCT *from(
         select
         OO.ORDER_NUMBER "orderNumber",
         ASO.SALE_NUMBER "saleNumber",
@@ -1908,7 +1908,8 @@
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel",
         OO.DRIVER_TEL "drivelTel",
-        ASM.SALE_WAREHOUSE "saleWarehouse"
+        ASM.SALE_WAREHOUSE "saleWarehouse",
+        ASM.MATERIAL_NUMBER "materialNumber"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1935,9 +1936,9 @@
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
         ON OO.PRICE_ID=ACTP.PRICE_ID
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-        ON OOM.ORDER_ID=ASO.SALE_ORDER_ID
+        ON OOM.ORDER_ID=OO.ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
@@ -2032,9 +2033,10 @@
         ASM.SALE_WAREHOUSE "warehouse",
         ASM.MATERIAL_WEIGHT "materialWeight",
         TWR.RESULT_NET_WEIGHT "netWeight",
-        OO.ORDER_LINE_SEQUENCE "lineSequence"
-        FROM OMSTRUCK_ORDER OO
-        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        OO.ORDER_LINE_SEQUENCE "lineSequence",
+        ASM.DELETED "materialStatus"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN OMSTRUCK_ORDER OO
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
@@ -3990,5 +3992,91 @@
      WHERE  OO.ORDER_ID =#{orderId}
     </select>
 
+    <select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
+        SELECT
+        TER.INSERT_UPDATE_REMARK AS "isOk"
+        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
+        <where>
+            <if test="orderId != null">
+                AND OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                AND OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
+
+    <select id="getWarehouseMes" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT * FROM (
+        SELECT OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        WOR.RESULT_ID "outboudId",
+        WORM.RESULT_MATERIAL_ID "outboudMaterialId",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+        TWR.RESULT_GROSS_WEIGHT "grossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
+        TWR.RESULT_TARE_WEIGHT       "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "netWeight",
+        TLR.RESULT_LOAD_END_TIME     "loadTime",
+        TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
+        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        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 TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TLR.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT WOR
+        ON WOR.BILL_LADING_ID = OO.ORDER_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
+        ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+        AND WORM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OO.ORDER_STATUS = 5
+        AND OO.ORDER_TYPE = 1
+        <if test="con != null">
+            and RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL LIKE #{con}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
+        )
+        ORDER BY "orderNumber" DESC
+    </select>
+    
+    <update id="closeInwardOrderByPlan" parameterType="DECIMAL" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 7
+        WHERE OO.ORDER_PLAN_ID = #{planId}
+        AND OO.ORDER_TYPE = 11
+    </update>
 
 </mapper>

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

@@ -542,14 +542,22 @@
 
   <select id="getSaleOrderMaterialNum" resultType="java.util.Map">
     select OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-           ASM.MATERIAL_WEIGHT "materialWeight",
-           ASM.SALE_MATERIAL_ID "saleMaterialId"
-    from OMSTRUCK_ORDER OO
-        left join AMS_SALE_ORDER_MATERIAL ASOM on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        left join AMS_SALE_TRUCKNO_MATERIAL ASTM on ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
-        left join AMS_SALE_MATERIAL ASM on ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
-        left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID
-    where OO.ORDER_ID = #{orderId} and OOM.MATERIAL_ID = #{materialId} and ASM.MATERIAL_ID = #{materialId}
+    ASM.MATERIAL_WEIGHT "materialWeight",
+    ASM.SALE_MATERIAL_ID "saleMaterialId",
+    ASM.MATERIAL_NUMBER "materialNumber"
+    from AMS_SALE_ORDER_MATERIAL ASOM
+    left join OMSTRUCK_ORDER OO on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    left join AMS_SALE_TRUCKNO_MATERIAL ASTM on ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+    left join AMS_SALE_MATERIAL ASM on ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+    left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID
+    where ASM.MATERIAL_ID = #{materialId}
+    <if test="saleOrderMaterialId != null">
+      AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </if>
+    <if test="orderId != null">
+      AND OO.ORDER_ID = #{orderId}
+      AND OOM.MATERIAL_ID = #{materialId}
+    </if>
   </select>
 
 
@@ -561,4 +569,16 @@
     </if>
     where SALE_MATERIAL_ID = #{saleMaterialId}
   </update>
+
+  <select id="findDownMaterial" parameterType="DECIMAL" resultType="java.util.Map" >
+    SELECT ASO.SALE_NUMBER      "number",
+           ASM.EAS_PRIMARY_ID   "changeEntryId",
+           ASM.SALE_MATERIAL_ID "wlEntryId"
+    FROM AMS_SALE_MATERIAL ASM
+           LEFT JOIN AMS_SALE_ORDER ASO
+                     ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON ASM.MATERIAL_ID = RM.MATERIAL_ID
+    WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+  </select>
 </mapper>

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

@@ -458,8 +458,9 @@
                    and OO.ORDER_STATUS = 2
                  order by OO.ORDER_RECEIVE_REFUSE_TIME desc
              )
-        <if test="date != null">
-            Where to_char("orderDate",'YYYY-MM') = #{date}
+        <if test="startDate != null">
+            Where to_char("orderDate",'YYYY-MM-DD') &gt;= #{startDate}
+            AND to_char("orderDate",'YYYY-MM-DD') &lt;= #{endDate}
         </if>
     </select>
 
@@ -750,7 +751,8 @@
         select OO.ORDER_TYPE    "orderType",
                OO.ORDER_PLAN_ID "orderPlanId",
                TTR.RESULT_TOTAL_ID  "resultTotalId",
-               OO.INSERT_UPDATE_REMARK  "insertUpdateRemark"
+               OO.INSERT_UPDATE_REMARK  "insertUpdateRemark",
+               OO.ORDER_LINE_SEQUENCE   "lineSqe"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
         where OO.ORDER_ID = #{orderId}
@@ -779,7 +781,8 @@
         ARM.MATERIAL_ID "materialId",
         AIR.LINE_ID     "rangeId",
         AIR.REQUIREMENT_TYPE    "requirementType",
-        AIR.IS_MINERAL  "isMineral"
+        AIR.IS_MINERAL  "isMineral",
+        RMT.MATERIAL_TYPE_ID    "materialTypeId"
         from OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
@@ -789,7 +792,12 @@
         ON ARP.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ARM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT
+        ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         where oo.ORDER_ID = #{orderId}
+        and RMT.MATERIAL_ISINWARD = 1
     </select>
 
     <select id="getTwoDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -874,4 +882,22 @@
                 (select MAX(RLS.SEGMENT_SQE) - 1 from RMS_LINE_SEGEMNT RLS where OO.LINE_ID = RLS.LINE_ID)
         where OO.ORDER_ID = #{orderId}
     </update>
+
+    <!--  查询订单发货日期 （订单类型为1） -->
+    <select id="getDeliveryDatePass" parameterType="object" resultType="int">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+                 join AMS_SALE_ORDER_MATERIAL ASOM
+                      on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        where OO.ORDER_ID = #{orderId}
+          and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD hh24:mi:ss') >= TO_CHAR(SYSDATE - 1, 'YYYY-MM-DD hh24:mi:ss')
+    </select>
+    <select id="getWeightTask" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT twr.RESULT_TARE_WEIGHT FROM TMSTRUCK_WEIGHT_RESULT TWR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>