xiugai1

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

@@ -65,4 +65,6 @@ public interface TmstruckTotalResultMapper extends IBaseMapper<TmstruckTotalResu
 
     List<BigDecimal> selectOrderIdToTotalId(BigDecimal orderId);
 
+    String getOldOrderStatus(BigDecimal resultTotalIdOld);
+
 }

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

@@ -284,6 +284,10 @@ public class StatisticalReportImpl implements IStatisticalReportService {
                 filterCapacityMap.put("text","空白");
                 filterCapacityMap.put("value","空白");
                 filterCapacityList.add(filterCapacityMap);
+                Map<String,Object> filterCapacityMap1 = new HashMap<>();
+                filterCapacityMap1.put("text","取消");
+                filterCapacityMap1.put("value","取消");
+                filterCapacityList.add(filterCapacityMap1);
             }else{
                 if((saleSteelReport.get(j-1).get("saleOrderMaterialId")).equals(stringObjectMap.get("saleOrderMaterialId"))){
                     stringObjectMap.put("group",saleSteelReport.get(j-1).get("group"));

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

@@ -86,12 +86,15 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
     public synchronized int copyAllResult(BigDecimal orderId,BigDecimal orderIdOld,BigDecimal resultTotalIdOld){
         //总实绩
         //判断该订单有没有总实绩id
+        //根据旧总实绩ID去查询当前运单状态
+        String oldOrderStatus = tmstruckTotalResultMapper.getOldOrderStatus(resultTotalIdOld);
         TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
         BigDecimal maxId = tmstruckTotalResultMapper.selectMaxId();
         tmstruckTotalResult.setResultTotalId(maxId);
         tmstruckTotalResult.setOrderId(orderId);
         tmstruckTotalResult.setInsertTime(new Date());
         tmstruckTotalResult.setInsertUsername("admin");
+
         tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
         //处理旧实绩
         Map<String,Object> serachMap=new HashMap<>();
@@ -153,6 +156,10 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
             orderMap.put("orderStatus",4);
             tmstruckWeightResultMapper.updateOrderStatus(orderMap);
         }
+        TmstruckTotalResult tmstruckTotalResult1= new TmstruckTotalResult();
+        tmstruckTotalResult1.setResultTotalId(maxId);
+        tmstruckTotalResult1.setOrderStatus(oldOrderStatus + "");
+        tmstruckTotalResultMapper.updateByPrimaryKeySelective(tmstruckTotalResult1);
         return maxId.intValue();
     }
     /**

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

@@ -3313,6 +3313,7 @@
                            oo.ORDER_STATUS "orderStatus",
                            OO.OPTIONER_CODE "optionCode",
                            TWR.RESULT_NET_WEIGHT    "netWeight",
+                           TWR.RESULT_TARE_WEIGHT   "tareWeight",
                            aso.BUSINESS_TYPE    "inwardSteelType"
                        FROM
                            AMS_SALE_ORDER ASO
@@ -4161,9 +4162,9 @@
         SELECT
         "target",
         "carrierName",
-        "planNum",
+        "planNum" - "quxiaoNum" "planNum",
         "quxiaoNum",
-        "orderNum",
+        "orderNum" - "quxiaoNum" "orderNum",
         "notSendNum",
         NVL("notEnNum",0) "notEnNum",
         NVL("EnNum",0) "EnNum",
@@ -4181,6 +4182,7 @@
         NVL("numCang",0) "numCang",
         NVL("totalNet",0) "totalNet",
         NVL("materialThoWeight",0) "materialThoWeight",
+        NVL("trainWeight",0)   "trainWeight",
         decode("target",'钢材达州组',1,'钢材万州组',2,'钢材南充组',3,'钢材巴中组',4,'钢材广安组',5,'钢材武汉组',6,'钢材西安组',7,'钢材重庆组',8,'钢材成都组',9,'钢材工程组',10,11) "no"
         FROM
         (
@@ -4195,7 +4197,8 @@
         T1."unReceiveNum",
         T2 ."num" "numGong" ,T3 ."num" "numCang",
         T1."totalNet",
-        T1."materialThoWeight"
+        T1."materialThoWeight",
+        T4."trainWeight"
         FROM
         (
         SELECT
@@ -4389,6 +4392,40 @@
         </if>
         GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE,RC.CARRIER_ABBREVIATION
         ) T3 ON T1 ."target" = T3."target" AND T1."carrierName" = 	T3."carrierName"
+        LEFT JOIN
+        (
+        --查询车皮
+        SELECT
+        ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
+        '达运' "carrierName",--承运商
+        SUM( TWR.RESULT_NET_WEIGHT) "trainWeight"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_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 OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
+        WHERE
+        aso.DELETED = 0
+        AND aso.SALE_ORDER_STATUS = 4
+        AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
+        AND ASO.SALE_TYPE = 4
+        AND NVL(OO.ORDER_TYPE,0) IN(0,4)
+        AND ASM.SALE_MATERIAL_ID IS NOT NULL
+        AND ASM.SALE_ORDER_ID != -1
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASO.insert_time,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASO.insert_time,'yyyy-mm-dd'),'yyyy-mm-dd')
+            AND (NVL(ASOM.WARRANTY_NUMBER,0) = 0
+            or (NVL(ASOM.WARRANTY_NUMBER,0) = 1 and asom.PREVIOUS_ORDER_NUMBER is null))
+        </if>
+        GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
+        ) T4 ON T1 ."target" = T4."target" AND T1."carrierName" = 	T4."carrierName"
         UNION
         SELECT T1."target",T1."carrierName",
         T1."planNum",T1."orderNum",T1."quxiaoNum",
@@ -4402,7 +4439,8 @@
         T2 ."num" "numGong" ,
         T3 ."num" "numCang",
         T1."totalNet",
-        T1."materialThoWeight"
+        T1."materialThoWeight",
+        0 "trainWeight"
         FROM
         (
         --查询自提

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

@@ -1556,7 +1556,10 @@
                      TER.RESULT_ENTRY_GATE_TIME,
                      TER.INSERT_UPDATE_REMARK   "insertUpdateRemark"
               from TMSTRUCK_ENFACTORY_RESULT TER
+              left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+              on tlfr.RESULT_TOTAL_ID = ter.RESULT_TOTAL_ID
               where TER.RESULT_TOTAL_ID = #{resultTotalId}
+              and TLFR.RESULT_OUT_GATE_TIME is null
               order by TER.SEGMEN_SQE)
         where rownum = 1
     </select>

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

@@ -864,4 +864,9 @@
         SELECT TTR.RESULT_TOTAL_ID FROM TMSTRUCK_TOTAL_RESULT TTR
         WHERE TTR.ORDER_ID = #{orderId}
     </select>
+    <select id="getOldOrderStatus" resultType="java.lang.String" parameterType="decimal">
+        SELECT TTR.ORDER_STATUS FROM TMSTRUCK_TOTAL_RESULT TTR
+        WHERE TTR.RESULT_TOTAL_ID = #{resultTotalIdOld}
+        FETCH FIRST 1 ROW ONLY
+    </select>
 </mapper>