Merge branch 'develop' into release

ruoyi-admin/src/main/resources/application-dev.yml

@@ -126,7 +126,7 @@ spring.data:
     # 数据库索引
     database: 0
     # redis 密码必须配置
-    password: ruoyi123
+#    password: ruoyi123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/InventoryMonitoringController.java

@@ -0,0 +1,36 @@
+package org.dromara.InventoryManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.InventoryManagement.service.InventoryMonitoringService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 库存监控接口
+ */
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/inventoryMonitoring")
+public class InventoryMonitoringController extends BaseController {
+    private final InventoryMonitoringService inventoryMonitoringService;
+
+    /**
+     * 查询品牌列表
+     * @param inventoryMonitoring 库存监控Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<InventoryMonitoringVo> selectPageDiBuList(InventoryMonitoringBo inventoryMonitoring, PageQuery pageQuery) {
+        return inventoryMonitoringService.selectPageInventoryMonitoringList(inventoryMonitoring, pageQuery);
+    }
+
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageController.java

@@ -3,8 +3,8 @@ package org.dromara.InventoryManagement.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
-import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
-import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.domain.bo.StorageBo;
+import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.service.PutInStorageService;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -22,17 +22,17 @@ public class PutInStorageController extends BaseController {
 
     /**
      * 查询入库订单分页列表
-     * @param putInStorageBo
+     * @param storageBo
      * @param pageQuery
      * @return
      */
     @GetMapping("/PageList")
-    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
-        return putInStorageService.selectPutInStoragePageList(putInStorageBo, pageQuery);
+    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+        return putInStorageService.selectPutInStoragePageList(storageBo, pageQuery);
     }
 
     @PostMapping
-    public R<Void> insert(@RequestBody PutInStorageBo putInStorageBo){
-        return toAjax(putInStorageService.insertInventory(putInStorageBo));
+    public R<Void> insert(@RequestBody StorageBo storageBo){
+        return toAjax(putInStorageService.insertInventory(storageBo));
     }
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/InventoryMonitoring.java

@@ -0,0 +1,99 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+/**
+ * 库存监控基类
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_dibu")
+public class InventoryMonitoring extends TenantEntity {
+    /**
+     * 底布ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchasePrice;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 单价2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stockWarn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/PutInStorage.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/Storage.java

@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("fa_ykjp_storage")
-public class PutInStorage extends TenantEntity {
+public class Storage extends TenantEntity {
 
     /**
      * 主键Id

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/StorageProduct.java

@@ -0,0 +1,45 @@
+package org.dromara.InventoryManagement.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_ykjp_storage_product")
+public class StorageProduct extends TenantEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 采购单ID
+     */
+    private int storageId;
+
+    /**
+     * 产品编号
+     */
+    private int productId;
+
+    /**
+     * 仓库编号
+     */
+    private int warehouseId;
+
+    /**
+     * 入库数
+     */
+    private double nums;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/InventoryMonitoringBo.java

@@ -0,0 +1,101 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 库存监控业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventoryMonitoring.class, reverseConvertGenerate = false)
+public class InventoryMonitoringBo extends BaseEntity {
+    /**
+     * 底布Id
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchasePrice;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stockWarn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/PutInStorageBo.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/StorageBo.java

@@ -5,14 +5,14 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.InventoryManagement.domain.Storage;
 
 import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = PutInStorage.class, reverseConvertGenerate = false)
-public class PutInStorageBo extends BaseEntity {
+@AutoMapper(target = Storage.class, reverseConvertGenerate = false)
+public class StorageBo extends BaseEntity {
 
     /**
      * 主键Id
@@ -33,4 +33,10 @@ public class PutInStorageBo extends BaseEntity {
      * 入库单更新时间
      */
     private Date updatetime;
+
+    /**
+     * 备注
+     */
+    private String storageRemark;
+
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/StorageProductBo.java

@@ -0,0 +1,47 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = StorageProduct.class, reverseConvertGenerate = false)
+public class StorageProductBo extends BaseEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 采购单ID
+     */
+    private int storageId;
+
+    /**
+     * 产品编号
+     */
+    private int productId;
+
+    /**
+     * 仓库编号
+     */
+    private int warehouseId;
+
+    /**
+     * 入库数
+     */
+    private double nums;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/InventoryMonitoringVo.java

@@ -0,0 +1,100 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 库存监控值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventoryMonitoring.class)
+public class InventoryMonitoringVo extends BaseEntity {
+    /**
+     * 底布ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchasePrice;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stockWarn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/StorageProductVo.java

@@ -0,0 +1,46 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = StorageProduct.class)
+public class StorageProductVo extends BaseEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 采购单ID
+     */
+    private int storageId;
+
+    /**
+     * 产品编号
+     */
+    private int productId;
+
+    /**
+     * 仓库编号
+     */
+    private int warehouseId;
+
+    /**
+     * 入库数
+     */
+    private double nums;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/PutInStorageVo.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/StorageVo.java

@@ -5,14 +5,14 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.InventoryManagement.domain.Storage;
 
 import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = PutInStorage.class)
-public class PutInStorageVo extends BaseEntity {
+@AutoMapper(target = Storage.class)
+public class StorageVo extends BaseEntity {
 
     /**
      * 主键Id

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/InventoryMonitoringMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 库存监控Mapper接口
+ */
+@Mapper
+public interface InventoryMonitoringMapper extends BaseMapperPlus<InventoryMonitoring, InventoryMonitoringVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/PutInStorageMapper.java

@@ -1,10 +1,14 @@
 package org.dromara.InventoryManagement.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.bo.StorageBo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.InventoryManagement.domain.PutInStorage;
-import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.vo.StorageVo;
 
 @Mapper
-public interface PutInStorageMapper extends BaseMapperPlus<PutInStorage, PutInStorageVo> {
+public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {
+
+    public int insertInventory(StorageBo storageBo);
+
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/InventoryMonitoringService.java

@@ -0,0 +1,19 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 库存监控Service接口
+ */
+public interface InventoryMonitoringService {
+    /**
+     * 分页查询品牌管理
+     * @param inventoryMonitoringBO 品牌BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
+    TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoringBO, PageQuery pageQuery);
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/PutInStorageService.java

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.StorageBo;
+import org.dromara.InventoryManagement.domain.vo.StorageVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface PutInStorageService {
+
+    TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery);
+
+    int insertInventory(StorageBo storageBo);
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/InventoryMonitoringServiceImpl.java

@@ -0,0 +1,38 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.InventoryManagement.mapper.InventoryMonitoringMapper;
+import org.dromara.InventoryManagement.service.InventoryMonitoringService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+/**
+ *  库存监控服务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class InventoryMonitoringServiceImpl implements InventoryMonitoringService {
+    private final InventoryMonitoringMapper inventoryMonitoringMapper;
+
+    /**
+     * 根据InventoryMonitoring对象分页查询品牌数据
+     *
+     * @param inventoryMonitoringBo   BrandBo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoringBo, PageQuery pageQuery) {
+        QueryWrapper<InventoryMonitoring> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(inventoryMonitoringBo.getName()),"name", inventoryMonitoringBo.getName());
+        Page<InventoryMonitoringVo> page=inventoryMonitoringMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageServiceImpl.java

@@ -3,14 +3,13 @@ package org.dromara.InventoryManagement.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.RequiredArgsConstructor;
-import org.dromara.InventoryManagement.domain.PutInStorage;
-import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
-import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.bo.StorageBo;
+import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.mapper.PutInStorageMapper;
 import org.dromara.InventoryManagement.service.PutInStorageService;
-import org.dromara.commodityManagement.domain.bo.DiBuBo;
-import org.dromara.commodityManagement.service.impl.DiBuServiceImpl;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
@@ -24,30 +23,26 @@ public class PutInStorageServiceImpl implements PutInStorageService {
 
     private final PutInStorageMapper putInStorageMapper;
 
-    private final DiBuServiceImpl diBuService;
-
     /**
      * 查询入库订单分页列表
-     * @param putInStorageBo
+     * @param storageBo
      * @param pageQuery
      * @return
      */
     @Override
-    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
-        QueryWrapper<PutInStorage> qw = new QueryWrapper<>();
-        qw.like(StringUtils.isNotBlank(putInStorageBo.getCode()), "code", putInStorageBo.getCode());
-        qw.eq(StringUtils.isNotBlank(putInStorageBo.getStatus()), "status", putInStorageBo.getStatus());
-//        qw.eq(StringUtils.isNotBlank();
-
-        List<PutInStorage> page = putInStorageMapper.selectList(pageQuery.build(), qw);
-        List<PutInStorageVo> supplierVoList = MapstructUtils.convert(page, PutInStorageVo.class);
+    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+        QueryWrapper<Storage> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(storageBo.getCode()), "code", storageBo.getCode());
+        qw.eq(StringUtils.isNotBlank(storageBo.getStatus()), "status", storageBo.getStatus());
+        List<Storage> page = putInStorageMapper.selectList(pageQuery.build(), qw);
+        List<StorageVo> supplierVoList = MapstructUtils.convert(page, StorageVo.class);
         return TableDataInfo.build(supplierVoList);
     }
 
     @Override
-    public int insertInventory(PutInStorageBo putInStorageBo) {
-        PutInStorage putInStorage = MapstructUtils.convert(putInStorageBo, PutInStorage.class);
-        // 入库数
-        return putInStorageMapper.insert(putInStorage);
+    public int insertInventory(StorageBo storageBo) {
+        OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+        storageBo.setCode(generator.generateOrderNumber("YKS"));
+        return putInStorageMapper.insertInventory(storageBo);
     }
 }

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/InventoryMonitoringMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.InventoryManagement.mapper.InventoryMonitoringMapper">
+
+</mapper>

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageMapper.xml

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
-    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
+    <insert id="insertInventory">
+        INSERT INTO fa_ykjp_storage_product (
+            warehouse_id,
+            storage_id,
+            product_id,
+            nums,
+            remark
+        )
+        values (#{warehouseId},#{storageId},#{productId},#{nums},#{remark})
+    </insert>
+
+
 </mapper>

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/OrderListBo.java

@@ -17,11 +17,6 @@ import java.util.List;
 @Data
 public class OrderListBo {
 
-    /**
-     * plan_info表id
-     */
-    private Long id;
-
     /**
      * 大货编号名称
      */

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapstruct/NewBulkOrderMapstruct.java

@@ -54,6 +54,7 @@ public interface NewBulkOrderMapstruct {
      * @param orderNumber 生成的订单号
      * @return ProductionPlan
      */
+    @Mapping(target = "purchaseTime", source = "orderList.orderTime")
     @Mapping(target = "orderNum", source = "orderNumber")
     @Mapping(target = "goodsCode", constant = "SP001")
     @Mapping(target = "goodsName", constant = "图片下单")
@@ -62,7 +63,7 @@ public interface NewBulkOrderMapstruct {
     @Mapping(target = "examineStatus", constant = "0")
     @Mapping(target = "status", constant = "0")
     @Mapping(target = "mrpStatus", constant = "0")
-    BulkOrderPlan toProductionPlan(NewBulkOrderBo newBulkOrder,
+    BulkOrderPlan toBulkOrderPlan(NewBulkOrderBo newBulkOrder,
                                    OrderListBo orderList,
                                    String sysNo,
                                    String purchaseCode,

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderManagementServiceImpl.java

@@ -64,7 +64,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 userOrderMapper.insert(userOrder);
 
                 // 生产计划映射
-                BulkOrderPlan bulkOrderPlan = newBulkOrderMapstruct.toProductionPlan(
+                BulkOrderPlan bulkOrderPlan = newBulkOrderMapstruct.toBulkOrderPlan(
                     newBulkOrderBo,
                     orderList,
                     sysNo,
@@ -86,7 +86,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 bulkOrderList.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
 
                 orderList.getOem().setUser_order_id(userOrder.getId());
-                orderList.getOem().setUser_id(newBulkOrderBo.getUserId());
                 bulkOrderList.setGoodsTypeExtend4Attr(JsonUtils.toJsonString(orderList.getOem()));
                 bulkOrderListMapper.insert(bulkOrderList);
 

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/SelfGetAddressController.java

@@ -21,32 +21,67 @@ import java.util.HashMap;
 /**
  * 自取地址管理接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/getAddress")
 public class SelfGetAddressController extends BaseController {
     private final SelfGetAddressService selfGetAddressService;
+
+    /**
+     * 查询自取地址管理列表
+     * @param selfGetAddressBo 地址Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery){
         return selfGetAddressService.selectPageSelfGetAddressList(selfGetAddressBo,pageQuery);
     }
+
+    /**
+     * 新增地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 新增结果
+     */
     @PostMapping()
     public R<Void> insertSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
         return toAjax(selfGetAddressService.insertSelfGetAddress(selfGetAddressBo));
     }
+
+    /**
+     * 修改地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 修改结果
+     */
     @PutMapping()
     public R<Void> updateSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
         return toAjax(selfGetAddressService.updateSelfGetAddress(selfGetAddressBo));
     }
+
+    /**
+     * 批量删除地址
+     * @param selfGetAddressIds 地址Ids
+     * @return 删除结果
+     */
     @DeleteMapping("/{selfGetAddressIds}")
     public R<Void> deleteSelfGetAddressByIds(@PathVariable Long[] selfGetAddressIds){
         return toAjax(selfGetAddressService.deleteSelfGetAddressByIds(selfGetAddressIds));
     }
+
+    /**
+     * 通过Excel导出所有自取地址数据
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcel")
     public void exportSelfGetAddressExcel(HttpServletResponse response){
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectList()),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);
     }
+
+    /**
+     * 根据职员Ids导出Excel
+     * @param selfGetAddressIds 职员Ids
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcelByIds")
     public void exportSelfGetAddressExcelByIds(@RequestParam("ids") Long[] selfGetAddressIds, HttpServletResponse response){
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectSelfGetAddressByIds(selfGetAddressIds)),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/SelfGetAddressMapper.java

@@ -5,6 +5,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.dataManagement.domain.SelfGetAddress;
 import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
 
+/**
+ * 自取地址管理Mapper
+ */
 @Mapper
 public interface SelfGetAddressMapper extends BaseMapperPlus<SelfGetAddress, SelfGetAddressVo> {
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/SelfGetAddressService.java

@@ -8,16 +8,49 @@ import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
 
 import java.util.List;
 
+/**
+ * 自取地址Service接口
+ */
 public interface SelfGetAddressService {
+    /**
+     * 查询自取地址列表
+     * @param selfGetAddressBo 地址Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery);
 
+    /**
+     * 新增地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 影响行数
+     */
     int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
 
+    /**
+     * 修改地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 影响行数
+     */
     int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
 
+    /**
+     * 批量删除地址
+     * @param selfGetAddressIds 地址Ids
+     * @return 影响行数
+     */
     int deleteSelfGetAddressByIds(Long[] selfGetAddressIds);
 
+    /**
+     * 查询地址列表
+     * @return 地址列表
+     */
     List<SelfGetAddress> selectList();
 
+    /**
+     * 根据地址Ids查询地址列表
+     * @param selfGetAddressIds 地址Ids
+     * @return 地址列表
+     */
     List<SelfGetAddress> selectSelfGetAddressByIds(Long[] selfGetAddressIds);
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/SelfGetAddressServiceImpl.java

@@ -17,10 +17,20 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 自取地址管理业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class SelfGetAddressServiceImpl implements SelfGetAddressService {
     private final SelfGetAddressMapper selfGetAddressMapper;
+
+    /**
+     * 查询地址对象分页查询地址列表
+     * @param selfGetAddressBo 地址Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery) {
         QueryWrapper<SelfGetAddress> qw=new QueryWrapper<>();
@@ -30,11 +40,23 @@ public class SelfGetAddressServiceImpl implements SelfGetAddressService {
         Page<SelfGetAddressVo>page= selfGetAddressMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 新增结果
+     */
     @Override
     public int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
         SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
         return selfGetAddressMapper.insert(selfGetAddress);
     }
+
+    /**
+     * 修改地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 修改结果
+     */
     @Override
     public int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
         SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
@@ -42,6 +64,12 @@ public class SelfGetAddressServiceImpl implements SelfGetAddressService {
         qw.eq("id",selfGetAddressBo.getId());
         return selfGetAddressMapper.updateById(selfGetAddress);
     }
+
+    /**
+     * 删除地址
+     * @param selfGetAddressIds 地址Ids
+     * @return 删除结果
+     */
     @Override
     public int deleteSelfGetAddressByIds(Long[] selfGetAddressIds) {
         return selfGetAddressMapper.deleteByIds(Arrays.asList(selfGetAddressIds));

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ProductionPlanController.java

@@ -5,14 +5,15 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.service.ProductionPlanService;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * 生产计划管理接口
  */
@@ -25,7 +26,8 @@ public class ProductionPlanController extends BaseController {
     private final ProductionPlanService productionPlanService;
 
     @GetMapping("/PageList")
-    public TableDataInfo<ProductionPlanVo> selectPageProductionPlan(@Validated ProductionPlanBo productionPlanBo, PageQuery pageQuery){
-        return productionPlanService.selectVoPage(productionPlanBo, pageQuery);
+    public TableDataInfo<ProductionPlanVo> selectPageProductionPlan(@RequestBody Map<String,Object> params){
+        PageQuery pageQuery = new PageQuery((Integer) params.get("pageSize"), (Integer) params.get("pageNum"));
+        return productionPlanService.selectVoPage(params, pageQuery);
     }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/ProductionPlan.java

@@ -3,13 +3,15 @@ package org.dromara.productionManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
 
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_plan")
-public class ProductionPlan {
+public class ProductionPlan extends TenantEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ProductionPlanBo.java

@@ -1,16 +1,20 @@
 package org.dromara.productionManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
 
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ProductionPlan.class, reverseConvertGenerate = false)
-public class ProductionPlanBo{
+public class ProductionPlanBo extends BaseEntity {
 
     /**
      * 主键
@@ -160,47 +164,65 @@ public class ProductionPlanBo{
     /**
      * 烧花,0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isBurnFlowers;
 
     /**
      * 定位,0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isLocation;
 
     /**
      * 快返,0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isQuickReturn;
 
     /**
      * 作废0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isToVoid;
 
     /**
      * 复色，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isMulticolor;
 
     /**
      * 首单，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isFirstOrder;
 
     /**
      * 首次加工，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isFirstProcessing;
 
     /**
      * 紧急，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isUrgent;
 
     /**
      * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
      */
     @NotNull(message = "工艺状态不能为空")
+    @Min(value = 1,message = "1排产中，2.产前确认中，3.打印中，4.转印中，5.烧花中，6.后整中，7.待发货，8.已发货，9.已确认发货，10.作废，11.白布配货")
+    @Max(value = 11,message = "1排产中，2.产前确认中，3.打印中，4.转印中，5.烧花中，6.后整中，7.待发货，8.已发货，9.已确认发货，10.作废，11.白布配货")
     private int craftStatus;
 
     /**
@@ -279,22 +301,18 @@ public class ProductionPlanBo{
     private String isSys;
 
     /**
-     *
+     * 转印时间
      */
     private Date zhuanyinTime;
 
     /**
-     *
+     * 数码印花厂Id
      */
     private int outFactoryId;
 
     /**
-     *
+     * 烧花工厂Id
      */
     private int shFactoryId;
 
-    /**
-     * 成衣厂
-     */
-    private String garmentFactory;
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/ProductionPlanVo.java

@@ -2,10 +2,12 @@ package org.dromara.productionManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.bulk.domain.vo.UserOrderTemplateVo;
 import org.dromara.bulk.domain.vo.UserOrderVo;
 import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.customerManagement.domain.vo.CustomerVo;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
@@ -13,9 +15,9 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ProductionPlan.class)
-public class ProductionPlanVo{
+public class ProductionPlanVo extends BaseEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/ProductionPlanService.java

@@ -2,13 +2,14 @@ package org.dromara.productionManagement.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 
+import java.util.Map;
+
 /**
  * 生产计划服务层
  */
 public interface ProductionPlanService {
 
-    TableDataInfo<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery);
+    TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery);
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/ProductionPlanServiceImpl.java

@@ -7,12 +7,13 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.domain.ProductionPlan;
-import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.dromara.productionManagement.service.ProductionPlanService;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * 生产计划服务层实现
  */
@@ -23,11 +24,30 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
     private final ProductionPlanMapper productionPlanMapper;
 
     @Override
-    public TableDataInfo<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery) {
+    public TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery) {
         QueryWrapper<ProductionPlan> qw = new QueryWrapper<>();
-        qw.eq("p.craft_status",productionPlanBo.getCraftStatus());
-        qw.eq(null != productionPlanBo.getUserId(),"p.user_id", productionPlanBo.getUserId());
-        qw.eq(StringUtils.isNotBlank(productionPlanBo.getGarmentFactory()),"gi.garment_factory", productionPlanBo.getGarmentFactory());
+        qw.eq("p.craft_status",params.get("craftStatus"));
+        qw.eq(null != params.get("userId"),"p.user_id", params.get("userId"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("garmentFactory")),"gi.garment_factory", params.get("garmentFactory"));
+        qw.like(StringUtils.isNotBlank((CharSequence) params.get("scNo")),"p.sc_no", params.get("scNo"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("bulkNumber")),"gi.goods_type_extend_1_id", params.get("bulkNumber"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("baseCloth")),"gi.base_cloth", params.get("baseCloth"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("itemNumber")),"gi.item_number", params.get("itemNumber"));
+        qw.between((params.get("beginTime") != null && params.get("endTime") != null),"p.purchase_time", params.get("beginTime"), params.get("endTime"));
+        qw.eq(null != params.get("isFirstProcessing"), "p.is_first_processing", params.get("isFirstProcessing"));
+        qw.eq(null != params.get("isFirstOrder"), "p.is_first_order", params.get("isFirstOrder"));
+        qw.eq(null != params.get("isMulticolor"), "p.is_multicolor", params.get("isMulticolor"));
+        qw.eq(null != params.get("isQuickReturn"), "p.is_quick_return", params.get("isQuickReturn"));
+        qw.eq(null != params.get("isBurnFlowers"), "p.is_burn_flowers", params.get("isBurnFlowers"));
+        qw.eq(null != params.get("printStatus"), "p.print_status", params.get("printStatus"));
+        qw.eq(null != params.get("isBuHuo"), "p.is_buhuo", params.get("isBuHuo"));
+        qw.eq(null != params.get("isUrgent"), "p.is_urgent", params.get("isUrgent"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("isSys")), "p.is_sys", params.get("isSys"));
+        qw.eq(null != params.get("craftAttrBo"), "gi.goods_type_extend_3_attr", params.get("craftAttrBo"));//构建完整的工艺扩展信息对象的JSON数据
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("brandGroup")),"gi.brand_group", params.get("brandGroup"));
+        qw.eq(null != params.get("outFactoryId"),"p.out_factory_id", params.get("outFactoryId"));
+        qw.eq(null != params.get("shFactoryId"),"p.sh_factory_id", params.get("shFactoryId"));
+
         Page<ProductionPlanVo> page = productionPlanMapper.selectProductionPlanVo(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }