2022年1月4日19:49:45

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

@@ -69,4 +69,7 @@ public interface UtilsMapper {
     //查询订单ID查询第一个计量的物资Id（物资子表）
     Integer getLxFirstMaterialId(BigDecimal orderId);
 
+    //通过人员管理SSOID查询人员ID
+    Integer getPersonnelIdBySsoId(String personnelSsoId);
+
 }

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

@@ -98,7 +98,7 @@ public class RulesServiceImpl implements IRulesService {
             //针对新厂区
             int orderType = DataChange.dataToBigDecimal(map.get("orderType")).intValue();
 
-            if(orderType == 1){//销售
+            if(orderType == 1 || orderType == 2){//销售
                 //通过订单ID获取线路类型为哪种类型 钢材 焦炭 危化品
                 Integer isSteel = rulesMapper.getLineIsSteel(orderId);
                 if(isSteel == 3){
@@ -314,7 +314,7 @@ public class RulesServiceImpl implements IRulesService {
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         //针对新厂区
         int orderType = DataChange.dataToBigDecimal(map.get("orderType")).intValue();
-        if(orderType == 1){ //销售
+        if(orderType == 1 || orderType == 2){ //销售
             //通过订单ID获取线路类型为哪种类型 钢材 焦炭 危化品
             Integer isSteel = rulesMapper.getLineIsSteel(orderId);
             if(isSteel == 3){

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

@@ -213,9 +213,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
         tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(mapValue.get("resultId")));
         //通过门岗名称获取门岗ID
-        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName((String) mapValue.get("gatepostName"));
-        if(gatepostId != null){
-            tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
+        if(mapValue.get("gatepostId") == null){
+            Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName((String) mapValue.get("gatepostName"));
+            if(gatepostId != null){
+                tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
+            }
+        }else {
+            tmstruckLeaveFactoryResult.setGatepostId(DataChange.dataToBigDecimal(mapValue.get("gatepostId")));
         }
         //设置常规字段 添加 出厂时间 和 出厂方式
         tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
 import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -51,7 +52,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     private WmshBoundFeign wmshBoundFeign;
 
     @Autowired
-    private WMSFeign wmsFeign;
+    private UtilsMapper utilsMapper;
 
     @Autowired
     OmsFeign omsFeign;
@@ -271,6 +272,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //计算装车时长 取分钟
         long differentTime = (loadEndTime.getTime() - loadStartTime.getTime()) / 60000;
         tmstruckLoadResult.setResultLoadDuration(new BigDecimal(differentTime));
+        if(map.get("personnelSsoId") != null){
+            //通过SSo主键查询人员管理主键
+            Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String) map.get("personnelSsoId"));
+            if(personnelId != null){
+                tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
+            }
+        }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));

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

@@ -157,6 +157,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendUnitId == 1){
                 //给达钢发送委托
+
             }else if (sendUnitId == 2){
                 //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);

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

@@ -79,11 +79,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         Integer orderType = (Integer) map.get("orderTypee");
         switch (orderType){
             case 1:
-                return tmstruckWeightResultMapper.getXSAllJiMaoResult(map); // apiID:212
             case 2:
-                break;
             case 3:
-                break;
+                return tmstruckWeightResultMapper.getXSAllJiMaoResult(map); // apiID:212
             case 4:
                 return tmstruckWeightResultMapper.getSteelNzJiMaoResult(map); //apiId:264
             case 5:
@@ -115,12 +113,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         Integer orderType = (Integer) map.get("orderTypee");
         switch (orderType){
             case 1:
-                return tmstruckWeightResultMapper.getXSAllJiPiResult(map); //apiId:211
             case 2:
-                break;
             case 3:
-
-                break;
+                return tmstruckWeightResultMapper.getXSAllJiPiResult(map); //apiId:211
             case 4:
                 return tmstruckWeightResultMapper.getSteelNzJiPiResult(map); //apiId:262
             case 5:

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

@@ -697,122 +697,37 @@
 
     <!--查询销售进厂实绩 -->
     <select id="getXSEnFactoryResult" parameterType="java.util.Map" resultType="java.util.Map">
-        select
-        *
+        select *
         from (
-        SELECT
-        -- 进厂时间
-        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
-        -- 进厂方式
-        TER.RESULT_ENTRY_MODE "resultEntryMode",
-        -- 门岗名称
-        RG.GATEPOST_NAME "gatepostName",
-        -- 运输订单号
-        OO.ORDER_NUMBER "orderNumber",
-        -- 车牌号
-        RC.CAPACITY_NUMBER "capacityNumber",
-        -- 运输订单id
-        OO.ORDER_ID "orderId",
-        -- 根据订单类型查询销售订单号/发运计划号
-        (CASE
-        -- 运输订单类型等于1的查询销售订单表
-        WHEN OO.ORDER_TYPE = 1
-        THEN (
-        SELECT
-        -- 销售订单号
-        ASO.SALE_NUMBER
-        FROM
-        -- 销售订单
-        AMS_SALE_ORDER_MATERIAL ASOM
-        JOIN AMS_SALE_ORDER ASO
-        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        )
-        -- 运输订单类型等于2，3的查询发运计划表
-        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-        THEN(
-        SELECT
-        -- 发运计划号
-        ARD.DAYPLAN_NO
-        -- 发运计划
-        FROM
-        AMSTRUCK_RAIL_DAYPLAN ARD
-        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-        )
-        END) "saleNum",
-        --根据订单类型查询发货单位
-        (CASE
-        WHEN OO.ORDER_TYPE = 1
-        THEN(
-        SELECT
-        -- 发货单位
-        RS.SHIPPER_NAME
-        FROM
-        -- 托运人
-        AMS_SALE_ORDER_MATERIAL ASOM
-        JOIN AMS_SALE_ORDER ASO
-        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-        JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        )
-        -- 运输订单类型等于2，3的查询发运计划表
-        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-        THEN(
-        SELECT
-        -- 发货单位
-        RS.SHIPPER_NAME
-        -- 发运计划
-        FROM AMSTRUCK_RAIL_DAYPLAN ARD
-        -- 托运人
-        LEFT JOIN RMS_SHIPPER RS ON ARD.SHIPMENT_UNIT_ID = RS.SHIPPER_ID
-        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-        )
-        END) "shipperName",
-        --根据订单类型查询收货单位
-        (CASE
-        WHEN OO.ORDER_TYPE = 1
-        THEN(
-        SELECT
-        -- 收货单位
-        RC.CONSIGNEE_COMPANY_NAME
-        FROM
-        AMS_SALE_ORDER_MATERIAL ASOM
-        JOIN AMS_SALE_ORDER ASO
-        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-        JOIN RMS_CONSIGNEE RC
-        ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
-        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        )
-        -- 运输订单类型等于2，3的查询发运计划表
-        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-        THEN(
-        SELECT
-        --发货单位
-        RS.SUPPLIER_NAME
-        FROM
-        -- 发运计划
-        AMSTRUCK_RAIL_DAYPLAN ARD
-        --托运人
-        LEFT JOIN RMS_SUPPLIER RS ON ARD.SHIPMENT_UNIT_ID = RS.SUPPLIER_ID
-        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-        )
-        END) "supplierName"
-        FROM
-        -- 进厂实绩
-        TMSTRUCK_ENFACTORY_RESULT TER
-        -- 门岗
-        LEFT JOIN RMS_GATEPOST RG ON TER.GATEPOST_ID = RG.GATEPOST_ID
-        -- 总实绩
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        -- 运输订单
-        LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
-        -- 运力信息
-        LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
-        -- 判断进厂实绩的进厂时间不为空
+        select
+            TER.RESULT_ENTRY_GATE_TIME  "resultEntryGateTime",
+            TER.RESULT_ENTRY_MODE       "resultEntryMode",
+            RG.GATEPOST_NAME            "gatepostName",
+            OO.ORDER_NUMBER             "orderNumber",
+            RC.CAPACITY_NUMBER          "capacityNumber",
+            OO.ORDER_ID                 "orderId",
+            ASO.SALE_NUMBER             "saleNum",
+            RS.SUPPLIER_NAME            "shipperName",
+            RCON.CONSIGNEE_COMPANY_NAME "supplierName"
+        FROM TMSTRUCK_ENFACTORY_RESULT TER
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_GATEPOST RG
+        ON RG.GATEPOST_ID = TER.GATEPOST_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RCON
+        ON RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
         WHERE TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
-        -- 并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
-        AND OO.ORDER_TYPE IN ( 1, 2, 3 )
+              AND OO.ORDER_TYPE IN (1, 2, 3)
         )
         <where>
             <if test="saleNum != null">
@@ -866,6 +781,10 @@
         <include refid="orderByEnterTime"></include>
     </select>
 
+    <select id="ads">
+
+
+    </select>
     <select id="getMaterial" parameterType="int" resultType="java.util.Map">
         SELECT RM.MATERIAL_NAME                                                               "materialName",
                CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "specificationModel",

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

@@ -594,140 +594,42 @@
 
     <!--销售物流查询所有的出厂实绩-->
     <select id="selectAllLeaveFacatoryForSale" resultType="java.util.Map">
-        SELECT
-        *
-        FROM
-        (
-        SELECT
-        -- 出厂时间
-        TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
-        --出厂抓拍图片
-        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",
-        -- 根据订单类型查询销售订单号/发运计划号
-        ( CASE
-        -- 	运输订单类型等于1的查询销售订单表
-        WHEN OO.ORDER_TYPE = 1
-        THEN (
-        SELECT
-        -- 销售订单号
-        ASO.SALE_NUMBER
-        FROM
-        -- 销售订单
-        AMS_SALE_ORDER_MATERIAL ASOM
-        LEFT JOIN AMS_SALE_ORDER ASO
-        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        )
-        -- 	运输订单类型等于2，3的查询发运计划表
-        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-        THEN(
-        SELECT
-        -- 发运计划号
-        ARD.DAYPLAN_NO
-        -- 发运计划
-        FROM AMSTRUCK_RAIL_DAYPLAN ARD
-        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-        )
-        END) "saleNum",
-        --根据订单类型查询发货单位
-        (CASE
-        WHEN OO.ORDER_TYPE = 1
-        THEN (
-        SELECT
-        -- 发货单位
-        RS.SHIPPER_NAME
-        -- 销售订单
-        FROM
-        AMS_SALE_ORDER_MATERIAL ASOM
-        LEFT JOIN AMS_SALE_ORDER ASO
-        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
-        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        )
-        -- 	运输订单类型等于2，3的查询发运计划表
-        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-        THEN (
-        SELECT
-        --发货单位
-        RS.SHIPPER_NAME
-        --发运计划
-        FROM
-        AMSTRUCK_RAIL_DAYPLAN ARD
-        -- 托运人
-        LEFT JOIN RMS_SHIPPER RS ON ARD.SHIPMENT_UNIT_ID = RS.SHIPPER_ID
-        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-        )
-        END) "shipperName",
-        --根据订单类型查询收货单位
-        ( CASE
-        WHEN OO.ORDER_TYPE = 1
-        THEN (
-        SELECT
-        --收货单位
-        RC.CONSIGNEE_COMPANY_NAME
-        FROM
-        AMS_SALE_ORDER_MATERIAL ASOM
+        select *
+        from (
+        select
+        TLFR.RESULT_OUT_GATE_TIME  "resultOutGateTime",
+        TLFR.RESULT_OUT_MODE       "resultOutMode",
+        RG.GATEPOST_NAME            "gatepostName",
+        OO.ORDER_NUMBER             "orderNumber",
+        RC.CAPACITY_NUMBER          "capacityNumber",
+        OO.ORDER_ID                 "orderId",
+        ASO.SALE_NUMBER             "saleNum",
+        RS.SUPPLIER_NAME            "shipperName",
+        RCON.CONSIGNEE_COMPANY_NAME "supplierName"
+        FROM TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_ORDER ASO
-        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-        -- 托运人
-        LEFT JOIN RMS_CONSIGNEE RC ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
-        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        ) -- 	运输订单类型等于2，3的查询发运计划表
-        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-        THEN (
-        SELECT
-        --发货单位
-        RS.SUPPLIER_NAME --发运计划
-        FROM
-        AMSTRUCK_RAIL_DAYPLAN ARD
-        --托运人
-        LEFT JOIN RMS_SUPPLIER RS ON ARD.SHIPMENT_UNIT_ID = RS.SUPPLIER_ID
-        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-        )
-        END) "supplierName"
-        FROM
-        -- 出厂实绩
-        TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-        -- 	门岗
-        LEFT JOIN RMS_GATEPOST RG ON TLFR.GATEPOST_ID = RG.GATEPOST_ID
-        -- 	总实绩
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        -- 运输订单
-        LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
-        -- 运力信息
-        LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
-        WHERE
-        -- 判断出厂实绩的出厂时间不为空
-        TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
-        -- 	并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
-        AND OO.ORDER_TYPE IN ( 1, 2, 3 )
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_GATEPOST RG
+        ON RG.GATEPOST_ID = TLFR.GATEPOST_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RCON
+        ON RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        WHERE TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+        AND OO.ORDER_TYPE IN (1, 2, 3)
         )
         <where>
-            <if test="resultOutGateTime != null">
-                <foreach collection="resultOutGateTime" item="item" open="(" separator="or" close=")">
-                    "resultOutGateTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="resultTruckSnapshotPicture != null">
-            and
-                <foreach collection="resultTruckSnapshotPicture" item="item" open="(" separator="or" close=")">
-                    "resultTruckSnapshotPicture" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="resultOutMode != null">
-            and
-                <foreach collection="resultOutMode" item="item" open="(" separator="or" close=")">
-                    "resultOutMode" like '%${item}%'
+            <if test="saleNum != null">
+                <foreach collection="saleNum" item="item" open="(" separator="or" close=")">
+                    "saleNum" like '%${item}%'
                 </foreach>
             </if>
             <if test="gatepostName != null">
@@ -748,18 +650,24 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="saleNum != null">
-                and
-                <foreach collection="saleNum" item="item" open="(" separator="or" close=")">
-                    "saleNum" like '%${item}%'
-                </foreach>
-            </if>
             <if test="shipperName != null">
                 and
                 <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
                     "shipperName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="resultEntryMode != null">
+                and
+                <foreach collection="resultEntryMode" item="item" open="(" separator="or" close=")">
+                    "resultEntryMode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultEntryGateTime != null">
+                and
+                <foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">
+                    "resultEntryGateTime" like '%${item}%'
+                </foreach>
+            </if>
             <if test="supplierName != null">
                 and
                 <foreach collection="supplierName" item="item" open="(" separator="or" close=")">

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

@@ -976,42 +976,30 @@
                    TLR.RESULT_LOAD_START_TIME "resultLoadStartTime",
                    TLR.RESULT_LOAD_END_TIME "resultLoadEndTime",
                    TLR.RESULT_LOAD_DURATION "resultLoadDuration",
-                   RSD.STANDARD_DATA_MAX "standardDataMax",
                    RP.PERSONNEL_NAME "personnelName",
                    RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
                    RM.MATERIAL_NAME "materialName",
-                    (CASE WHEN OO.ORDER_TYPE = 1
-                        THEN (
-                                SELECT ASO.SALE_NUMBER
-                                FROM AMS_SALE_ORDER_MATERIAL ASOM
-                                LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                                WHERE ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-                            )
-                        WHEN OO.ORDER_TYPE IN (2, 3)
-                        THEN (
-                                SELECT ARD.DAYPLAN_NO
-                                FROM AMSTRUCK_RAIL_DAYPLAN ARD
-                                WHERE ARD.DAYPLAN_ID = OO.ORDER_PLAN_ID
-                            )
-                   END) "no",
-                   (CASE WHEN   OO.ORDER_TYPE = 1
-                        THEN OOM.ORDER_MATERIAL_NUMBER
-                        WHEN OO.ORDER_TYPE IN (2, 3)
-                        THEN OOM.ORDER_MATERIAL_WEIGHT
-                     END) "materialNumWei"
+                   ASO.SALE_NUMBER  "no",
+                   (CASE WHEN  OOM.ORDER_MATERIAL_NUMBER is not null
+                         THEN OOM.ORDER_MATERIAL_NUMBER
+                         ELSE OOM.ORDER_MATERIAL_WEIGHT
+                     END) "materialNumWei",
+                   TLR.INSERT_UPDATE_REMARK "insertUpdateRemark"
             FROM TMSTRUCK_LOAD_RESULT TLR
             LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
                 ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
             LEFT JOIN OMSTRUCK_ORDER OO
                 ON OO.ORDER_ID = TTR.ORDER_ID
+            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_ORDER ASO
+                ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
             LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
                 ON OOM.ORDER_ID = OO.ORDER_ID
             LEFT JOIN RMS_MATERIAL RM
                 ON RM.MATERIAL_ID = OOM.MATERIAL_ID
             LEFT JOIN RMS_CAPACITY RC
                 ON RC.CAPACITY_ID = OO.CAPACITY_ID
-            LEFT JOIN RMS_STANDARD_DATA RSD
-                ON RSD.STANDARD_DATA_ID = TLR.LOAD_STANDARD_TIME_ID
             LEFT JOIN RMS_PERSONNEL RP
                 ON TLR.LOADER_ID = RP.PERSONNEL_ID
             where

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

@@ -896,7 +896,9 @@
                 <if test="weightTaskResultId != null">
                     and TWR.WEIGHT_TASK_RESULT_ID = #{weightTaskResultId}
                 </if>
-                and ASM.MATERIAL_ID = #{materialId}
+                <if test="materialId != null">
+                    and ASM.MATERIAL_ID = #{materialId}
+                </if>
                 and rownum = 1
     </select>
 <!--  通过订单ID查询发货单位ID  -->

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

@@ -155,4 +155,10 @@
              )
         where rownum = 1
     </select>
+
+    <select id="getPersonnelIdBySsoId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select RP.PERSONNEL_ID
+        from RMS_PERSONNEL RP
+        where RP.PERSONNEL_SSO_ID = #{personnelSsoId}
+    </select>
 </mapper>