pms功能优化 安全库存

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotsapstock/vo/IotSapStockPageReqVO.java

@@ -21,9 +21,15 @@ public class IotSapStockPageReqVO extends PageParam {
     @Schema(description = "组织部门id", example = "10123")
     private Long deptId;
 
+    @Schema(description = "工厂id (system_sap_org表id)", example = "10123")
+    private Long factoryId;
+
     @Schema(description = "工厂(SAP) 专业公司")
     private String factory;
 
+    @Schema(description = "库存地点id", example = "10123")
+    private Long storageLocationId;
+
     @Schema(description = "库存地点 - SAP 部门 项目部级 通用库 项目部库")
     private String projectDepartment;
 
@@ -51,6 +57,9 @@ public class IotSapStockPageReqVO extends PageParam {
     @Schema(description = "安全库存")
     private BigDecimal safetyStock;
 
+    @Schema(description = "库区id", example = "10123")
+    private Long storageAreaId;
+
     @Schema(description = "货架id", example = "24365")
     private Long shelvesId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotsapstock/vo/IotSapStockRespVO.java

@@ -21,10 +21,18 @@ public class IotSapStockRespVO {
     @ExcelProperty("组织部门id")
     private Long deptId;
 
-    @Schema(description = "工厂(SAP) 专业公司")
+    @Schema(description = "工厂id (system_sap_org表id)", example = "10123")
     @ExcelProperty("工厂(SAP) 专业公司")
+    private Long factoryId;
+
+    @Schema(description = "工厂(SAP) 专业公司 名称")
+    @ExcelProperty("工厂(SAP) 专业公司 名称")
     private String factory;
 
+    @Schema(description = "库存地点id", example = "10123")
+    @ExcelProperty("库存地点id")
+    private Long storageLocationId;
+
     @Schema(description = "库存地点 - SAP 部门 项目部级 通用库 项目部库")
     @ExcelProperty("库存地点 - SAP 部门 项目部级 通用库 项目部库")
     private String projectDepartment;
@@ -61,6 +69,14 @@ public class IotSapStockRespVO {
     @ExcelProperty("安全库存")
     private BigDecimal safetyStock;
 
+    @Schema(description = "库区id", example = "10123")
+    @ExcelProperty("库区id")
+    private Long storageAreaId;
+
+    @Schema(description = "库区名称")
+    @ExcelProperty("库区名称")
+    private String storageAreaName;
+
     @Schema(description = "货架id", example = "24365")
     @ExcelProperty("货架id")
     private Long shelvesId;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotsapstock/vo/IotSapStockSaveReqVO.java

@@ -16,9 +16,15 @@ public class IotSapStockSaveReqVO {
     @Schema(description = "组织部门id", example = "10123")
     private Long deptId;
 
+    @Schema(description = "工厂id (system_sap_org表id)", example = "10123")
+    private Long factoryId;
+
     @Schema(description = "工厂(SAP) 专业公司")
     private String factory;
 
+    @Schema(description = "库存地点id", example = "10123")
+    private Long storageLocationId;
+
     @Schema(description = "库存地点 - SAP 部门 项目部级 通用库 项目部库")
     private String projectDepartment;
 
@@ -46,6 +52,9 @@ public class IotSapStockSaveReqVO {
     @Schema(description = "安全库存")
     private BigDecimal safetyStock;
 
+    @Schema(description = "库区id", example = "10123")
+    private Long storageAreaId;
+
     @Schema(description = "货架id", example = "24365")
     private Long shelvesId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotsapstock/IotSapStockDO.java

@@ -33,10 +33,18 @@ public class IotSapStockDO extends BaseDO {
      * 组织部门id
      */
     private Long deptId;
+    /**
+     * 工厂id (system_sap_org表id)
+     */
+    private Long factoryId;
     /**
      * 工厂(SAP) 专业公司
      */
     private String factory;
+    /**
+     * 库存地点id
+     */
+    private Long storageLocationId;
     /**
      * 库存地点 - SAP 部门 项目部级 通用库 项目部库
      */
@@ -73,6 +81,10 @@ public class IotSapStockDO extends BaseDO {
      * 安全库存
      */
     private BigDecimal safetyStock;
+    /**
+     * 库区id
+     */
+    private Long storageAreaId;
     /**
      * 货架id
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotsapstock/IotSapStockMapper.java

@@ -18,7 +18,9 @@ public interface IotSapStockMapper extends BaseMapperX<IotSapStockDO> {
     default PageResult<IotSapStockDO> selectPage(IotSapStockPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotSapStockDO>()
                 .eqIfPresent(IotSapStockDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotSapStockDO::getFactoryId, reqVO.getFactoryId())
                 .eqIfPresent(IotSapStockDO::getFactory, reqVO.getFactory())
+                .eqIfPresent(IotSapStockDO::getStorageLocationId, reqVO.getStorageLocationId())
                 .eqIfPresent(IotSapStockDO::getProjectDepartment, reqVO.getProjectDepartment())
                 .eqIfPresent(IotSapStockDO::getMaterialCode, reqVO.getMaterialCode())
                 .likeIfPresent(IotSapStockDO::getMaterialName, reqVO.getMaterialName())
@@ -28,6 +30,7 @@ public interface IotSapStockMapper extends BaseMapperX<IotSapStockDO> {
                 .eqIfPresent(IotSapStockDO::getUnitPrice, reqVO.getUnitPrice())
                 .eqIfPresent(IotSapStockDO::getUnit, reqVO.getUnit())
                 .eqIfPresent(IotSapStockDO::getSafetyStock, reqVO.getSafetyStock())
+                .eqIfPresent(IotSapStockDO::getStorageAreaId, reqVO.getStorageAreaId())
                 .eqIfPresent(IotSapStockDO::getShelvesId, reqVO.getShelvesId())
                 .eqIfPresent(IotSapStockDO::getCargoLocationId, reqVO.getCargoLocationId())
                 .eqIfPresent(IotSapStockDO::getType, reqVO.getType())