1.干线作废运单bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java

@@ -46,7 +46,7 @@ public interface TrunklineAdvanceMapper extends BaseMapper<TrunklineAdvanceEntit
 
     void deleteByWaybillNo(@Param("waybillNo") String waybillNo);
 
-    void clearWaybillInfoByWaybillId(@Param("waybillId") Long waybillId);
+    void clearWaybillInfoByWaybillNo(@Param("waybillNo") String waybillNo);
 
 	IPage<TrunklineAdvanceVO> advancePageListByBussiness(IPage<Object> page, @Param("param") AdvanceDTO advanceDTO);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -254,12 +254,11 @@
 
     </select>
 
-    <update id="clearWaybillInfoByWaybillId">
+    <update id="clearWaybillInfoByWaybillNo">
         update logpm_trunkline_advance
-        set waybill_id = null,
+        set waybill_no = null,
-            waybill_no = null,
             waybill_status = '0'
-        where waybill_id = #{waybillId}
+        where waybill_no = #{waybillNo}
     </update>
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java

@@ -48,7 +48,7 @@ public interface ITrunklineAdvanceService extends BaseService<TrunklineAdvanceEn
 
     void deleteByWaybillNo(String waybillNo);
 
-    void clearWaybillInfoByWaybillId(Long waybillId);
-
 	IPage<TrunklineAdvanceVO> advancePageListByBussiness(IPage<Object> page, AdvanceDTO advanceDTO);
+
+	void clearWaybillInfoByWaybillNo(String waybillNo);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -3981,7 +3981,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			Integer waybillType = waybillEntity.getWaybillType();
 			if(waybillType.equals(1)){
 				//订制品
-				advanceService.clearWaybillInfoByWaybillId(waybillId);
+				advanceService.clearWaybillInfoByWaybillNo(waybillNo);
 				advanceDetailService.clearWaybillInfoByWaybillId(waybillId);
 
 				trunklineWaybillOrderService.deleteByWaybillNo(waybillNo);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -1926,7 +1926,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 	}
 
 	@Override
-	public void clearWaybillInfoByWaybillId(Long waybillId) {
+	public void clearWaybillInfoByWaybillNo(String waybillNo) {
-		baseMapper.clearWaybillInfoByWaybillId(waybillId);
+		baseMapper.clearWaybillInfoByWaybillNo(waybillNo);
 	}
 }