修改标签、标签模板的存储结构

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java

@@ -15,10 +15,15 @@ public class GetSourceDataReq {
     @NotNull(message = "生产单id不能空")
     private Long orderId;
 
-    @Schema(description = "排单id")
-    private Long planId;
-
     @Schema(description = "数据源id")
     @NotNull(message = "数据源id不能空")
     private Long dataSourceId;
+
+    @Schema(description = "排单id")
+    private Long planId;
+
+    @Schema(description = "包裹id")
+    private Long packageId;
+
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java

@@ -89,5 +89,5 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
         return selectList(wrapper);
     }
 
-    Map<String, Object> selectDynamicSqlString(String sql);
+    Map<String, Object> selectDynamicSqlString(@Param("sqlStr") String sqlStr);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -237,7 +237,14 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
     @Override
     public Map<String, Object> getLabelDataSourceValue(GetSourceDataReq req) {
         String sqlStr = dataSourceApi.getSqlById(req.getDataSourceId()).getCheckedData();
-        return orderMapper.selectDynamicSqlString(String.format(sqlStr, req.getOrderId()));
+        String sql = sqlStr.replace("#{orderId}", req.getOrderId() + "");
+        if(!Objects.isNull(req.getPackageId())) {
+            sql = sql.replace("#{packageId}", req.getPackageId() + "");
+        }
+        if(!Objects.isNull(req.getPlanId())) {
+            sql = sql.replace("#{planId}", req.getPlanId() + "");
+        }
+        return orderMapper.selectDynamicSqlString(sql);
     }