Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java

@@ -21,6 +21,7 @@ public enum WorkNodeEnums implements Serializable {
 	REVIEW_ORDER(102030, "审单"),
 
 	LOADING_PLAN(103010, "配载计划"),
+	CANCEL_LOADING_PLAN(103015, "取消配载计划"),
 	INITIAL_WAREHOUSE_LOADING(103020, "装车"),
 	CANCEL_INITIAL_WAREHOUSE_LOADING(103030, "取消装车"),
 	INITIAL_WAREHOUSE_DEPART(103040, "始发仓发车"),

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

@@ -201,7 +201,7 @@
     </select>
     <select id="findPackageCodeByCodes" resultType="java.util.Map">
         select t.order_package_code code,t.id id from logpm_trunkline_advance_detail t
-        where exists(
+        where t.is_deleted= 0 and exists(
         select 1 from (
         <foreach collection="orderPackageCodes" index="ind" item="item">
             <if test="ind == 0">

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

@@ -275,7 +275,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
     public Map<String, String> findPackageCodeByCodes(Set<String> orderPackageCodes) {
 		List<Map<String, String>> packageCodeByCodes = baseMapper.findPackageCodeByCodes(orderPackageCodes);
 		if(CollUtil.isNotEmpty(packageCodeByCodes)){
-			return packageCodeByCodes.stream().collect(Collectors.toMap(map -> map.get("code"), map -> map.get("id")));
+			return packageCodeByCodes.stream().collect(Collectors.toMap(map -> map.get("code"), map -> String.valueOf(map.get("id"))));
 		}
 		return null;
     }