Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -96,4 +96,6 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     int updateEnfactoryStatus(BigDecimal totalId);
 
+    //清除重复实绩
+    int clearRepeat(TmstruckEnfactoryResult tmstruckEnfactoryResult);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
@@ -168,4 +169,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     int updateOrderStatus(BigDecimal orderId);
 
+    //清除重复实绩
+    int clearRepeat(TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -149,4 +150,5 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     int updateOOMaterialId(Map<String, Object> map);
 
+    int clearRepeat(TmstruckLoadResult tmstruckLoadResult);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.model.TmstruckReturnResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,4 +31,7 @@ public interface TmstruckReturnResultMapper extends IBaseMapper<TmstruckReturnRe
 
     //查询辅料退货实绩
     List<Map<String, Object>> getFLReturnResult(Map<String, Object> map);
+
+    //清除重复实绩
+    int clearRepeat(TmstruckReturnResult tmstruckReturnResult);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -66,4 +67,6 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     BigDecimal selectWarehouseId(String warehouseName);
 
+    //清除重复实绩
+    int clearRepeat(TmstruckUnloadResult TmstruckUnloadResult);
 }

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

@@ -128,4 +128,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     int updateOmstruckStatus(Map<String, Object> updateMap);
 
     int updateOrderStatus(Map<String, Object> updateMap);
+
+    //删除重复实绩,根据总实绩、皮毛路段顺序号，保留一条计量实绩
+    int clearRepeat(TmstruckWeightResult tmstruckWeightResult);
 }

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

@@ -74,7 +74,13 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostId));
         // 添加路段顺序号
         tmstruckEnfactoryResult.setSegmenSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
-        return tmstruckEnfactoryResultMapper.insertSelective(tmstruckEnfactoryResult);
+        int i=tmstruckEnfactoryResultMapper.insertSelective(tmstruckEnfactoryResult);
+        try{
+            tmstruckEnfactoryResultMapper.clearRepeat(tmstruckEnfactoryResult);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return i;
     }
 
     /**

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

@@ -127,7 +127,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         //添加路段顺序号
         tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
         //添加门岗ID 出厂门岗为线路的终点
-        return tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
+        int i=tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
+        try{
+            tmstruckLeaveFactoryResultMapper.clearRepeat(tmstruckLeaveFactoryResult);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return i;
     }
 
     @Override

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

@@ -91,7 +91,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         // 添加路段顺序号
         tmstruckLoadResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
-        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        try{
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return  i;
     }
 
     /**

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

@@ -95,6 +95,11 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
         map.put("grossPlaceId", 6);
         //发送计量委托
         i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+        try{
+            //清除重复实绩
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return i;
     }
 

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

@@ -83,7 +83,13 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //插入卸货点 通过总实绩ID查询卸货点
         tmstruckUnloadResult.setResultUnloadPlaceId(tmstruckUnloadResultMapper.getUnloadPointId(map));
         //新增卸车实绩
-        return tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+        int i = tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+        try {
+            tmstruckUnloadResultMapper.clearRepeat(tmstruckUnloadResult);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return  i;
     }
 
     /**

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

@@ -97,7 +97,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }else {
             tmstruckWeightResult.setIsdeduct(DataChange.dataToBigDecimal(map.get("isdeduct")));
         }
-        return tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
+        int i =tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
+        try{
+            tmstruckWeightResultMapper.clearRepeat(tmstruckWeightResult);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return i;
     }
 
     /**

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

@@ -358,6 +358,7 @@
         ASO.SALE_NUMBER "saleNumber",
         ASM.SALE_WAREHOUSE "saleWarehouse",
         ASM.MATERIAL_NUMBER "materialNum",
+        ASM.MATERIAL_WEIGHT "materialWeight",
         TLR.CASE_NUMBER "caseNumber",
         TLR.CAPACITY_REMARK "capacityRemark",
         RC2.CARRIER_NAME "carrierName",
@@ -2716,6 +2717,8 @@
         ASO.sale_remark "saleRemark",
         DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
         BDO.PRICEIDS "priceIds",
+        BDO.REMARK "detailsRemark",
+        BDO.PHOTO "photo",
         --理重
         ASM.MATERIAL_WEIGHT "materialWeight",
         --收款客户

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

@@ -1577,4 +1577,24 @@
             TTR.ORDER_STATUS = '已进厂'
         WHERE TTR.RESULT_TOTAL_ID = #{totalId}
     </update>
+    <delete id="clearRepeat"  parameterType="com.steerinfo.dil.model.TmstruckEnfactoryResult">
+        DELETE FROM TMSTRUCK_ENFACTORY_RESULT WHERE RESULT_ID IN
+        (
+            SELECT
+                RESULT_ID
+            FROM
+                TMSTRUCK_ENFACTORY_RESULT
+            WHERE RESULT_TOTAL_ID=#{resultTotalId}
+              AND SEGMEN_SQE=#{segmenSqe}
+                FETCH NEXT
+            (
+                --查询需要删除的数量
+                SELECT COUNT(RESULT_ID)-1
+                FROM TMSTRUCK_ENFACTORY_RESULT
+                WHERE RESULT_TOTAL_ID=#{resultTotalId}
+                AND SEGMEN_SQE=#{segmenSqe}
+            )
+	        ROWS ONLY
+        )
+    </delete>
 </mapper>

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

@@ -1598,4 +1598,24 @@
             OO.INSERT_UPDATE_REMARK = '自动补扫出厂失败,自动完成订单'
         WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_TYPE!=1
     </update>
+    <delete id="clearRepeat" parameterType="com.steerinfo.dil.model.TmstruckLeaveFactoryResult">
+        DELETE FROM TMSTRUCK_LEAVE_FACTORY_RESULT WHERE RESULT_ID IN
+        (
+            SELECT
+                RESULT_ID
+            FROM
+                TMSTRUCK_LEAVE_FACTORY_RESULT
+            WHERE RESULT_TOTAL_ID=#{resultTotalId,jdbcType=DECIMAL}
+            AND SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL}
+                FETCH NEXT
+            (
+                --查询需要删除的数量
+                SELECT COUNT(RESULT_ID)-1
+                FROM TMSTRUCK_LEAVE_FACTORY_RESULT
+                WHERE RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL}
+                AND SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL}
+            )
+            ROWS ONLY
+        )
+    </delete>
 </mapper>

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

@@ -726,7 +726,7 @@
       #{id}
     </foreach>
   </delete>
-  <!-- 友情提示！！！-->
+    <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">
@@ -1872,4 +1872,24 @@
     set oom.MATERIAL_ID = #{materialId}
     where OOM.order_id = #{orderId}
   </update>
+  <delete id="clearRepeat" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
+    DELETE FROM TMSTRUCK_LOAD_RESULT WHERE RESULT_ID IN
+     (
+       SELECT
+         RESULT_ID
+       FROM
+         TMSTRUCK_LOAD_RESULT
+       WHERE RESULT_TOTAL_ID=#{resultTotalId}
+         AND SEGMENT_SQE=#{segmentSqe}
+      FETCH NEXT
+      (
+        --查询需要删除的数量
+        SELECT COUNT(RESULT_ID)-1
+        FROM TMSTRUCK_LOAD_RESULT
+        WHERE RESULT_TOTAL_ID=#{resultTotalId}
+        AND SEGMENT_SQE=#{segmentSqe}
+      )
+      ROWS ONLY
+      )
+  </delete>
 </mapper>

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

@@ -262,7 +262,7 @@
       #{id}
     </foreach>
   </delete>
-  <!-- 友情提示！！！-->
+    <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 <!-- 通过运输订单号查询总实绩ID -->
   <select id="getResultTotalIdByOrderNumber" parameterType="string" resultType="java.util.Map">
@@ -435,4 +435,8 @@
       order by "insertTime" desc
     </if>
   </sql>
+
+  <delete id="clearRepeat" parameterType="com.steerinfo.dil.model.TmstruckReturnResult">
+
+  </delete>
 </mapper>

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

@@ -1131,5 +1131,24 @@
         WHERE RW.WAREHOUSE_NAME = #{warehouseName}
         FETCH FIRST 1 ROW ONLY
     </select>
-
+    <delete id="clearRepeat" parameterType="com.steerinfo.dil.model.TmstruckUnloadResult">
+        DELETE FROM TMSTRUCK_UNLOAD_RESULT WHERE RESULT_ID IN
+         (
+             SELECT
+                 RESULT_ID
+             FROM
+                 TMSTRUCK_UNLOAD_RESULT
+             WHERE RESULT_TOTAL_ID=#{resultTotalId}
+             AND SEGMENT_SQE=#{segmentSqe}
+                 FETCH NEXT
+            (
+                --查询需要删除的数量
+                SELECT COUNT(RESULT_ID)-1
+                FROM TMSTRUCK_UNLOAD_RESULT
+                WHERE RESULT_TOTAL_ID=#{resultTotalId}
+                AND SEGMENT_SQE=#{segmentSqe}
+            )
+            ROWS ONLY
+        )
+    </delete>
 </mapper>

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

@@ -2901,4 +2901,27 @@
             INSERT_UPDATE_REMARK = '继续装修改运单状态,twrxml2880行'
         where ORDER_ID=#{orderId}
     </update>
+
+    <delete id="clearRepeat" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
+        DELETE FROM TMSTRUCK_WEIGHT_RESULT WHERE WEIGHT_TASK_RESULT_ID IN
+         (
+             SELECT
+                 WEIGHT_TASK_RESULT_ID
+             FROM
+                 TMSTRUCK_WEIGHT_RESULT
+             WHERE RESULT_TOTAL_ID=#{resultTotalId}
+               AND GROSS_SEGMENT_SQE=#{grossSegmentSqe}
+               AND TARE_SEGMENT_SQE=#{tareSegmentSqe}
+                 FETCH NEXT
+            (
+                --查询需要删除的数量
+                SELECT COUNT(WEIGHT_TASK_RESULT_ID)-1
+                FROM TMSTRUCK_WEIGHT_RESULT
+                WHERE RESULT_TOTAL_ID=#{resultTotalId}
+                AND GROSS_SEGMENT_SQE=#{grossSegmentSqe}
+                AND TARE_SEGMENT_SQE=#{tareSegmentSqe}
+            )
+            ROWS ONLY
+        )
+    </delete>
 </mapper>