修改

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

@@ -513,7 +513,12 @@ public class OffSiteTransportationController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null,receiptResultInfo);
         return success(pageList);
     }
-    @PostMapping("/createTotalResult")
+
+
+
+
+
+      @PostMapping("/createTotalResult")
     public RESTfulResult createTotalResult(@RequestBody(required=true) Map<String, Object> mapValue) throws Exception {
 
         //判断是否自提

src/main/java/com/steerinfo/route/util/SaleLogUtil.java

@@ -0,0 +1,135 @@
+//package com.steerinfo.route.util;
+//
+//import com.steerinfo.dil.mapper.SaleLogMapper;
+//import com.steerinfo.dil.model.SaleLog;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.math.BigDecimal;
+//import java.util.ArrayList;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Map;
+//
+//@Component
+//public class SaleLogUtil {
+//    @Autowired
+//    private SaleLogMapper saleLogMapper;
+//
+//    public final static int INSERT = 1;
+//
+//    public final static int UPDATE = 2;
+//
+//    public final static int DELETE = 3;
+//
+//    public final static int OPEN = 4;
+//
+//    public final static int CLOSE = 5;
+//
+//    /**
+//     * 插入运输订单的操作日志
+//     * @param orderId
+//     * @param descriptoin
+//     * @param oprationType 操作类型
+//     * @param map 可以传null
+//     * @return
+//     */
+//    public int logOrder(BigDecimal orderId,String descriptoin,Map<String,Object> map,int oprationType){
+//        try{
+//            SaleLog saleLog=new SaleLog();
+//            saleLog.setResultId(saleLogMapper.selectMaxId());
+//            saleLog.setOrderId(orderId);
+//            saleLog.setDescription(descriptoin);
+//            //saleLog.setJsonData(""+map);
+//            saleLog.setInsertTime(new Date());
+//            saleLog.setInsertUsername(getUserName(map));
+//            switch (oprationType){
+//                case INSERT:
+//                    saleLog.setOprationType("新增");
+//                    break;
+//                case UPDATE:
+//                    saleLog.setOprationType("修改");
+//                    break;
+//                case DELETE:
+//                    saleLog.setOprationType("删除");
+//                    break;
+//                case OPEN:
+//                    saleLog.setOprationType("启用");
+//                    break;
+//                case CLOSE:
+//                    saleLog.setOprationType("关闭");
+//                    break;
+//                default:
+//                    saleLog.setOprationType("未知操作");
+//            }
+//            return saleLogMapper.insertSelective(saleLog);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return -1;
+//        }
+//    }
+//
+//
+//    //插入销售订单操作日志
+//    public int logSaleOrder(BigDecimal saleOrderId,String descriptoin,String userName,int oprationType) {
+//        try {
+//            //List<BigDecimal> orderIds = saleLogMapper.getOrderIds(orderNumber);
+//            List<SaleLog> list = new ArrayList<>();
+//            //for(BigDecimal orderId:orderIds){
+//            SaleLog saleLog = new SaleLog();
+//            saleLog.setResultId(saleLogMapper.selectMaxId());
+//            //saleLog.setOrderId(orderId);
+//            saleLog.setSaleOrderId(saleOrderId);
+//            saleLog.setDescription(descriptoin);
+//            //saleLog.setJsonData(""+map);
+//            saleLog.setInsertTime(new Date());
+//            saleLog.setInsertUsername(userName);
+//            switch (oprationType) {
+//                case INSERT:
+//                    saleLog.setOprationType("新增");
+//                    break;
+//                case UPDATE:
+//                    saleLog.setOprationType("修改");
+//                    break;
+//                case DELETE:
+//                    saleLog.setOprationType("删除");
+//                    break;
+//                case OPEN:
+//                    saleLog.setOprationType("启用");
+//                    break;
+//                case CLOSE:
+//                    saleLog.setOprationType("关闭");
+//                    break;
+//                default:
+//                    saleLog.setOprationType("未知操作");
+//            }
+//            list.add(saleLog);
+//            //}
+//            return saleLogMapper.batchInsert(list);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return -1;
+//        }
+//    }
+//    /**
+//     * 处理插入用户名
+//     * @param map
+//     * @return
+//     */
+//    private String getUserName(Map<String,Object> map){
+//        try{
+//            if(map==null){
+//                return "system";
+//            }else if(map.get("userName")!=null){
+//                return ""+map.get("userName");
+//            }else if(map.get("userId")!=null){
+//                return saleLogMapper.getUserNameById(map);
+//            }else{
+//                return "未知用户";
+//            }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return "未知用户";
+//        }
+//    }
+//}

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

@@ -711,74 +711,60 @@
         where rownum = 1
     </select>
     <select id="getTruckFactoryResult" resultType="java.util.Map">
-                
-                SELECT   * from(
-                
-                 SELECT
-                    -- 出厂时间
-                    to_char(TLFR.RESULT_OUT_GATE_TIME,'yyyy-mm-dd hh24:mi:ss')  "resultOutGateTime",
-                    -- 签收时间
-                    to_char(TRR.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')  "receiptTime",
-                    --出厂抓拍图片
-                    TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture",
-                    --出厂方式
-                    TLFR.RESULT_OUT_MODE "resultOutMode",
-                    --门岗名称
-                    RG.GATEPOST_NAME "gatepostName",
-                    -- 运输订单号
-                    OO.ORDER_NUMBER "orderNumber",
-                    -- 车牌号
-                    RC.CAPACITY_NUMBER "capacityNumber",
-                    -- 运输订单id
-                    OO.ORDER_ID "orderId",
-                    -- 订单类型
-                    OO.ORDER_TYPE "orderType",
-                    -- 销售订单号
-                    ASO.SALE_NUMBER  "saleNum",
-                    -- 收货地址
-                     CONCAT( CONCAT(RRA.ADDRESS_PROVINCE,RRA.ADDRESS_DISTRICT),RRA.Address_Town) "receiveAddress",
-                    -- 收货单位
-                    RS.SUPPLIER_NAME  "supplierName" ,
-                    -- 发货单位
-                    RS2.SHIPPER_NAME "shipperName"
-                   
-                    
-                    
-                    
+        SELECT
+            *
+        FROM
+            (
+                SELECT-- 出厂时间
+                      to_char( CASE WHEN ASO.SALE_TYPE = 50 THEN OOR.INSERT_TIME ELSE TLFR.RESULT_OUT_GATE_TIME END, 'yyyy-mm-dd hh24:mi:ss' ) "resultOutGateTime",
+-- 签收时间
+                      to_char( TRR.INSERT_TIME, 'yyyy-mm-dd hh24:mi:ss' ) "receiptTime",
+--出厂抓拍图片
+                      TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture",
+--出厂方式
+                      TLFR.RESULT_OUT_MODE "resultOutMode",
+--门岗名称
+                      CASE
+
+                          WHEN ASO.SALE_TYPE = 50 THEN
+                              OOR.INBOUND_WAREHOUSE ELSE RG.GATEPOST_NAME
+                          END "gatepostName",
+-- 运输订单号
+                      OO.ORDER_NUMBER "orderNumber",
+-- 车牌号
+                      RC.CAPACITY_NUMBER "capacityNumber",
+-- 运输订单id
+                      OO.ORDER_ID "orderId",
+-- 订单类型
+                      OO.ORDER_TYPE "orderType",
+-- 销售订单号
+                      ASO.SALE_NUMBER "saleNum",
+-- 收货地址
+                      CONCAT( CONCAT( RRA.ADDRESS_PROVINCE, RRA.ADDRESS_DISTRICT ), RRA.Address_Town ) "receiveAddress",
+-- 收货单位
+                      RS.SUPPLIER_NAME "supplierName",
+-- 发货单位
+                      RS2.SHIPPER_NAME "shipperName"
                 FROM
-                    -- 出厂实绩
-                    TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                    --  总实绩
-                    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                    -- 签收实绩
-                    LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                    -- 运输订单
-                    LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
-                     -- 销售订单信息
-                    LEFT JOIN  AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                    -- 托运人
-                    LEFT JOIN RMS_SUPPLIER RS ON ASO.SHIPPER_ID = RS.SUPPLIER_ID
-                    --  门岗
-                    LEFT JOIN RMS_GATEPOST RG ON TLFR.GATEPOST_ID = RG.GATEPOST_ID
-                    -- 运力信息
-                    LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
-                     -- 销售订单中间表
-                    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON    ASOM.SALE_ORDER_MATERIAL_ID =OO.ORDER_PLAN_ID
-                    --收货地址
-                    left join RMS_RECEIVE_PLACE RRP  on ASOM.SALE_SHIPPING_ADDRESS_ID=RRP.PLACE_ID
-                    
-                    left join RMS_RECEIVE_ADDRESS RRA on RRP.ADDRESS_ID=RRA.ADDRESS_ID
-                    -- 收货单位
-                    LEFT JOIN RMS_SHIPPER RS2 ON ASO.SHIPPER_ID = RS2.SHIPPER_ID
-                    
+                    AMS_SALE_ORDER ASO
+                        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                        LEFT JOIN OMSTRUCK_ORDER OO ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+                        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID -- 托运人
+                        LEFT JOIN RMS_SUPPLIER RS ON ASO.SHIPPER_ID = RS.SUPPLIER_ID --  门岗
+                        LEFT JOIN RMS_GATEPOST RG ON TLFR.GATEPOST_ID = RG.GATEPOST_ID -- 运力信息
+                        LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID --收货地址
+                        LEFT JOIN RMS_RECEIVE_PLACE RRP ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRP.PLACE_ID
+                        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRP.ADDRESS_ID = RRA.ADDRESS_ID -- 收货单位
+                        LEFT JOIN RMS_SHIPPER RS2 ON ASO.SHIPPER_ID = RS2.SHIPPER_ID
+                        LEFT JOIN OYE_OUTBOUND_RESULT OOR ON OOR.ORDER_ID = OO.ORDER_ID
                 WHERE
-                    -- 判断出厂实绩的出厂时间不为空
-                    TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
-                    --   并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
-                    AND OO.ORDER_NUMBER=#{orderNumber}
-                    
-                    )
-                FETCH NEXT 1 ROWS ONLY
+                        ( CASE WHEN ASO.SALE_TYPE = 50 THEN OOR.INSERT_TIME ELSE TLFR.RESULT_OUT_GATE_TIME END ) IS NOT NULL -- 判断出厂实绩的出厂时间不为空
+--   并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
+
+                  AND OO.ORDER_NUMBER = #{orderNumber}
+            ) FETCH NEXT 1 ROWS ONLY
     </select>