diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 2d942a686..d59b2cda9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -106,6 +106,8 @@ public class OrderController { private String errKey = "api数据导入异常"; private String errValue = "当前存在导入情况,请稍后"; + public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; + public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; @PutMapping("/update") @Operation(summary = "更新生产单") @PreAuthorize("@ss.hasPermission('production:manager-list:edit')") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java index c0b377b43..a0587a180 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java @@ -5,6 +5,8 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface PackageConfigMapper extends BaseMapperX { @@ -18,6 +20,11 @@ public interface PackageConfigMapper extends BaseMapperX { .eqIfPresent(PackageConfigDO::getType,type)); } + default List selectSettingList(Integer type, Long organId) { + return selectList( new LambdaQueryWrapperX() + .eqIfPresent(PackageConfigDO::getOrganId,organId) + .eqIfPresent(PackageConfigDO::getType,type)); + } default int deleteSetting(Integer type,Long userId, Long organId) { return delete(new LambdaQueryWrapperX()