fix：修复合并错误

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

@@ -0,0 +1,34 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.InventoryFlowBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryFlowVo;
+import org.dromara.InventoryManagement.service.InventoryFlowService;
+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;
+
+/**
+ * 库存流水接口
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/inventoryManagement/inventoryFlow")
+public class InventoryFlowController extends BaseController {
+    private final InventoryFlowService inventoryFlowService;
+
+    /**
+     * 查询库存流水列表
+     * @param inventoryFlow 库存流水Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<InventoryFlowVo> selectPageInventoryFlowList(InventoryFlowBo inventoryFlow, PageQuery pageQuery){
+            return inventoryFlowService.selectPageInventoryFlowList(inventoryFlow,pageQuery);
+    }
+
+}

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

@@ -21,13 +21,13 @@ 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) {
+    public TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoring, PageQuery pageQuery) {
         return inventoryMonitoringService.selectPageInventoryMonitoringList(inventoryMonitoring, pageQuery);
     }
 

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

@@ -1,7 +1,9 @@
 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.bo.StorageBo;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.service.PutInStorageService;
@@ -11,6 +13,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/putInStorage")
@@ -20,17 +25,37 @@ public class PutInStorageController extends BaseController {
 
     /**
      * 查询入库订单分页列表
-     * @param storageBo
-     * @param pageQuery
-     * @return
+     * @param storageBo 入库订单表
+     * @param pageQuery 分页信息
+     * @return 结果
      */
     @GetMapping("/PageList")
     public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
         return putInStorageService.selectPutInStoragePageList(storageBo, pageQuery);
     }
 
+    /**
+     * 新增入库订单
+     * @param putInStorageBo 传入参数
+     * @return 结果
+     */
     @PostMapping
-    public R<Void> insert(@RequestBody StorageBo storageBo){
-        return toAjax(putInStorageService.insertInventory(storageBo));
+    public R<Void> insert(@RequestBody PutInStorageBo putInStorageBo){
+        return toAjax(putInStorageService.insertStorage(putInStorageBo));
+    }
+
+    /**
+     * 删除入库订单
+     * @param ids id集合
+     * @return  结果
+     */
+    @DeleteMapping("/{id}")
+    public R<Void> delete(@PathVariable("id") List<Integer> ids) {
+        return toAjax(putInStorageService.deleteById(ids));
+    }
+
+    @PutMapping
+    public R<Void> update(@RequestBody PutInStorageBo putInStorageBo) {
+        return toAjax(putInStorageService.updateStorage(putInStorageBo));
     }
 }

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

@@ -9,41 +9,92 @@ 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.*;
-
 import java.util.List;
+/**
+ * 入库类型管理接口
+ */
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/putinstoragetype")
 public class PutInStorageTypeController extends BaseController {
     private final PutInStorageTypeService putInStorageTypeService;
+
+    /**
+     * 根据条件获取入库类型管理列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return  查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
         return putInStorageTypeService.selectPutInStorageTypePageList(putInStorageTypeBo,pageQuery);
     }
+
+    /**
+     * 新增入库类型
+     * @param putInStorageTypeBo 入库累心Bo对象
+     * @return 新增结果
+     */
     @PostMapping
     public R<Void> insertPutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
         return toAjax(putInStorageTypeService.insertPutInStorageType(putInStorageTypeBo));
     }
+
+    /**
+     * 修改入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 修改结果
+     */
     @PutMapping
     public R<Void> updatePutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
         return toAjax(putInStorageTypeService.updatePutInStorageType(putInStorageTypeBo));
     }
+
+    /**
+     * 将入库类型放入回收站
+     * @param ids 入库类型ids
+     * @return 回收结果
+     */
     @DeleteMapping("/{ids}")
     public R<Void> deletePutInStorageTypeByIds(@PathVariable List<Integer> ids){
         return toAjax(putInStorageTypeService.deletePutInStorageTypeByIds(ids));
     }
+
+    /**
+     * 根据条件查询回收站入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/recycle")
     public TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
         return putInStorageTypeService.selectRecyclePutInStorageTypeList(putInStorageTypeBo,pageQuery);
     }
+
+    /**
+     * 还原回收站中指定id的入库类型
+     * @param ids 入库类型Ids
+     * @return 还原结果
+     */
     @PostMapping("/recycle/back/{ids}")
     public R<Void> backPutInStorageTypeByIds(@PathVariable List<Integer> ids){
         return toAjax(putInStorageTypeService.backPutInStorageTypeByIds(ids));
     }
+
+    /**
+     * 还原回收站中所有入库类型
+     * @return 还原结果
+     */
     @PostMapping("/recycle/back/all")
     public R<Void> backPutInStorageTypeAll(){
         return toAjax(putInStorageTypeService.backPutInStorageTypeAll());
     }
+
+    /**
+     * 销毁回收站中指定id的入库类型
+     * @param ids 入库类型Ids
+     * @return 销毁结果
+     */
     @DeleteMapping("/recycle/{ids}")
     public R<Void> deleteRecyclePutInStorageTypeByIds(@PathVariable List<Integer> ids){
         int status = putInStorageTypeService.deleteRecyclePutInStorageTypeByIds(ids);
@@ -52,6 +103,11 @@ public class PutInStorageTypeController extends BaseController {
         }
         return R.fail("该回收站中不存在此入库类型或已被删除");
     }
+
+    /**
+     * 销毁回收站中所有入库类型
+     * @return 销毁结果
+     */
     @DeleteMapping("recycle/all")
     public R<Void> deleteRecyclePutInStorageTypeAll(){
         return toAjax(putInStorageTypeService.deleteRecyclePutInStorageTypeAll());

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

@@ -0,0 +1,117 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutOutStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.InventoryManagement.service.PutOutStorageTypeService;
+import org.dromara.common.core.domain.R;
+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.*;
+
+import java.util.List;
+
+/**
+ * 出库类型管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putoutstoragetype")
+public class PutOutStorageTypeController extends BaseController {
+    private final PutOutStorageTypeService putOutStorageTypeService;
+
+    /**
+     * 根据条件获取出库类型管理列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery) {
+        return putOutStorageTypeService.selectPutOutStorageTypePageList(putOutStorageTypeBo, pageQuery);
+    }
+
+    /**
+     * 新增出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 新增结果
+     */
+    @PostMapping
+    public R<Void> insertPutOutStorageType(@RequestBody PutOutStorageTypeBo putOutStorageTypeBo) {
+        return toAjax(putOutStorageTypeService.insertPutOutStorageType(putOutStorageTypeBo));
+    }
+
+    /**
+     * 修改出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 修改结果
+     */
+    @PutMapping
+    public R<Void> updatePutOutStorageType(@RequestBody PutOutStorageTypeBo putOutStorageTypeBo) {
+        return toAjax(putOutStorageTypeService.updatePutOutStorageType(putOutStorageTypeBo));
+    }
+
+    /**
+     * 将出库类型放入回收站
+     * @param ids 出库类型Ids
+     * @return 回收结果
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> deletePutOutStorageTypeByIds(@PathVariable List<Integer> ids) {
+        return toAjax(putOutStorageTypeService.deletePutOutStorageTypeByIds(ids));
+    }
+
+    /**
+     * 根据条件查询回收站出库类型列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/recycle")
+    public TableDataInfo<PutOutStorageTypeVo> selectRecyclePutOutStorageTypeList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery) {
+        return putOutStorageTypeService.selectRecyclePutOutStorageTypeList(putOutStorageTypeBo, pageQuery);
+    }
+
+    /**
+     * 还原回收站中指定id的出库类型
+     * @param ids 出库类型Ids
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backPutOutStorageTypeByIds(@PathVariable List<Integer> ids) {
+        return toAjax(putOutStorageTypeService.backPutOutStorageTypeByIds(ids));
+    }
+
+    /**
+     * 还原回收站中所有出库类型
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/all")
+    public R<Void> backPutOutStorageTypeAll() {
+        return toAjax(putOutStorageTypeService.backPutOutStorageTypeAll());
+    }
+
+    /**
+     * 销毁回收站中指定id的出库类型
+     * @param ids 出库类型Ids
+     * @return 销毁结果
+     */
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecyclePutOutStorageTypeByIds(@PathVariable List<Integer> ids) {
+        int status = putOutStorageTypeService.deleteRecyclePutOutStorageTypeByIds(ids);
+        if(status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此出库类型或已被删除");
+    }
+
+    /**
+     * 销毁回收站中所有出库类型
+     * @return 销毁结果
+     */
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecyclePutOutStorageTypeAll() {
+        return toAjax(putOutStorageTypeService.deleteRecyclePutOutStorageTypeAll());
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/InventoryFlow.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 InventoryFlow 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/PutInStorageType.java

@@ -3,7 +3,9 @@ package org.dromara.InventoryManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-
+/**
+ * 入库类型基类
+ */
 @Data
 @TableName("fa_ykjp_warehouse_in")
 public class PutInStorageType {

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

@@ -0,0 +1,32 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 出库类型基类
+ */
+@Data
+@TableName("fa_ykjp_warehouse_out")
+public class PutOutStorageType {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 出库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

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

@@ -1,6 +1,8 @@
 package org.dromara.InventoryManagement.domain;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,6 +18,7 @@ public class Storage extends TenantEntity {
     /**
      * 主键Id
      */
+    @TableId(type = IdType.AUTO)
     private int id;
 
     /**
@@ -23,11 +26,6 @@ public class Storage extends TenantEntity {
      */
     private String code;
 
-    /**
-     * 入库类型 0=采购入库，1=销售退货入库
-     */
-    private int inboundType;
-
     /**
      * 库区
      */
@@ -38,6 +36,11 @@ public class Storage extends TenantEntity {
      */
     private String status;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 入库单更新时间
      */

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

@@ -4,6 +4,7 @@ package org.dromara.InventoryManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.DiBu;
 import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
@@ -24,12 +25,12 @@ public class StorageProduct extends TenantEntity {
     private int storageId;
 
     /**
-     * 产品编号
+     * 底布Id
      */
     private int productId;
 
     /**
-     * 仓库编号
+     * 仓库Id
      */
     private int warehouseId;
 

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

@@ -0,0 +1,102 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventoryFlow;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 库存流水业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventoryFlow.class,reverseConvertGenerate = false)
+public class InventoryFlowBo 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

@@ -0,0 +1,43 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PutInStorageBo extends BaseEntity {
+
+    /**
+     * Id
+     */
+    private int id;
+
+    /**
+     * 仓库Id
+     */
+    private int warehouseId;
+
+    /**
+     * 库区ID
+     */
+    private int partitionId;
+
+    /**
+     * 入库表备注
+     */
+    private String remarkStorage;
+
+    /**
+     * 订单号
+     */
+    private String inCode;
+
+    /**
+     * 入库单
+     */
+    private List<StorageListBo> storageList;
+
+}

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

@@ -9,6 +9,9 @@ import org.dromara.InventoryManagement.domain.PutInStorageType;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 入库类型业务对象
+ */
 @Data
 @AutoMapper(target = PutInStorageType.class, reverseConvertGenerate = false)
 public class PutInStorageTypeBo {

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

@@ -0,0 +1,44 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 出库类型业务对象
+ */
+@Data
+@AutoMapper(target = PutOutStorageType.class, reverseConvertGenerate = false)
+public class PutOutStorageTypeBo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 出库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+}

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

@@ -29,6 +29,11 @@ public class StorageBo extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 库区
+     */
+    private int partitionId;
+
     /**
      * 入库单更新时间
      */
@@ -37,6 +42,6 @@ public class StorageBo extends BaseEntity {
     /**
      * 备注
      */
-    private String storageRemark;
+    private String remark;
 
 }

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

@@ -0,0 +1,46 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class StorageListBo {
+    /**
+     * Id
+     */
+    private int id;
+
+    /**
+     * 布料Id
+     */
+    private int productId;
+
+    /**
+     * 布料名称
+     */
+    private String clothName;
+
+    /**
+     * 布料颜色
+     */
+    private String clothColor;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 入库数
+     */
+    private double nums;
+
+    /**
+     * 仓库产品关联表备注
+     */
+    private String remarkStorageProduct;
+}

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

@@ -1,47 +0,0 @@
-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/InventoryFlowVo.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.InventoryFlow;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 库存流水值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventoryFlow.class)
+public class InventoryFlowVo 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/PutInStorageTypeVo.java

@@ -4,6 +4,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.InventoryManagement.domain.PutInStorageType;
 
+/**
+ * 入库类型值对象
+ */
 @Data
 @AutoMapper(target = PutInStorageType.class)
 public class PutInStorageTypeVo {

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

@@ -0,0 +1,33 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+
+/**
+ * 出库类型值对象
+ */
+@Data
+@AutoMapper(target = PutOutStorageType.class)
+public class PutOutStorageTypeVo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 出库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

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

@@ -1,15 +1,10 @@
 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 {
 
     /**
@@ -23,7 +18,7 @@ public class StorageProductVo extends BaseEntity {
     private int storageId;
 
     /**
-     * 产品编号
+     * 底布Id
      */
     private int productId;
 
@@ -41,6 +36,4 @@ public class StorageProductVo extends BaseEntity {
      * 备注
      */
     private String remark;
-
-
 }

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

@@ -29,6 +29,16 @@ public class StorageVo extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 库区
+     */
+    private int partitionId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 入库单更新时间
      */

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

@@ -0,0 +1,14 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.InventoryFlow;
+import org.dromara.InventoryManagement.domain.vo.InventoryFlowVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 库存流水Mapper接口
+ */
+@Mapper
+public interface InventoryFlowMapper extends BaseMapperPlus<InventoryFlow, InventoryFlowVo> {
+
+}

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

@@ -1,14 +1,12 @@
 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.Storage;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
 
 @Mapper
 public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {
 
-    public int insertInventory(StorageBo storageBo);
-
 }

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

@@ -0,0 +1,19 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.InventoryManagement.domain.vo.StorageProductVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface PutInStorageProductMapper extends BaseMapperPlus<StorageProduct, StorageProductVo> {
+
+    int deleteByStorageIds(List<Integer> ids);
+
+    int deleteByStorageId(@Param("storageId") Integer storageId);
+
+}

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

@@ -5,7 +5,9 @@ import org.dromara.InventoryManagement.domain.PutInStorageType;
 import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
-
+/**
+ * 入库类型Mapper
+ */
 @Mapper
 public interface PutInStorageTypeMapper extends BaseMapperPlus<PutInStorageType, PutInStorageTypeVo> {
 }

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

@@ -0,0 +1,14 @@
+package org.dromara.InventoryManagement.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 出库类型Mapper
+ */
+@Mapper
+public interface PutOutStorageTypeMapper extends BaseMapperPlus<PutOutStorageType, PutOutStorageTypeVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapstruct/NewStorageMapstruct.java

@@ -0,0 +1,28 @@
+package org.dromara.InventoryManagement.mapstruct;
+
+import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
+import org.dromara.InventoryManagement.domain.bo.StorageListBo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+/**
+ * 新增入库订单映射
+ */
+@Mapper(componentModel = "spring")
+public interface NewStorageMapstruct {
+
+    @Mapping(target = "remark", source = "putInStorageBo.remarkStorage")
+    @Mapping(target = "id", source = "putInStorageBo.id")
+    Storage toStorage(PutInStorageBo putInStorageBo,
+                      String code);
+
+    @Mapping(target = "remark", source = "storageListBo.remarkStorageProduct")
+    @Mapping(target = "storageId", source = "storageId")
+    @Mapping(target = "id", source = "storageListBo.id")
+    StorageProduct toStorageProduct(PutInStorageBo putInStorageBo,
+                                    StorageListBo storageListBo,
+                                    int storageId);
+
+}

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

@@ -0,0 +1,19 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.InventoryFlowBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryFlowVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 库存流水Service接口
+ */
+public interface InventoryFlowService {
+    /**
+     * 查询库存流水列表
+     * @param inventoryFlow 库存流水Bo对象
+     * @param pageQuery 分页参数
+     * @return 查询结果
+     */
+    TableDataInfo<InventoryFlowVo> selectPageInventoryFlowList(InventoryFlowBo inventoryFlow, PageQuery pageQuery);
+}

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

@@ -10,8 +10,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  */
 public interface InventoryMonitoringService {
     /**
-     * 分页查询品牌管理
-     * @param inventoryMonitoringBO 品牌BO对象
+     * 分页查询库存监控管理
+     * @param inventoryMonitoringBO 库存监控BO对象
      * @param pageQuery 分页参数
      * @return 分页结果
      */

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

@@ -1,13 +1,20 @@
 package org.dromara.InventoryManagement.service;
 
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
 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;
 
+import java.util.List;
+
 public interface PutInStorageService {
 
     TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery);
 
-    int insertInventory(StorageBo storageBo);
+    int insertStorage(PutInStorageBo putInStorageBo);
+
+    int deleteById(List<Integer> ids);
+
+    int updateStorage(PutInStorageBo putInStorageBo);
 }

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

@@ -7,22 +7,70 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 import java.util.List;
 
+/**
+ * 入库类型服务层
+ */
 public interface PutInStorageTypeService {
+    /**
+     * 根据条件查询入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
 
+    /**
+     * 新增入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 影响行数
+     */
     int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
 
+    /**
+     * 修改入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 影响行数
+     */
     int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
 
+    /**
+     * 将入库类型放入回收站
+     * @param ids 入库类型ids
+     * @return 影响行数
+     */
     int deletePutInStorageTypeByIds(List<Integer> ids);
 
+    /**
+     * 查询回收站中的入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
 
+    /**
+     * 将指定id的入库类型从回收站中恢复
+     * @param ids 入库类型ids
+     * @return 影响行数
+     */
     int backPutInStorageTypeByIds(List<Integer> ids);
 
+    /**
+     * 将回收站中的入库类型全部恢复
+     * @return 影响行数
+     */
     int backPutInStorageTypeAll();
 
+    /**
+     * 销毁回收站中指定id的入库类型
+     * @param ids 入库类型ids
+     * @return 影响行数
+     */
     int deleteRecyclePutInStorageTypeByIds(List<Integer> ids);
 
+    /**
+     * 销毁回收站中的全部入库类型
+     * @return 影响行数
+     */
     int deleteRecyclePutInStorageTypeAll();
 }

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

@@ -0,0 +1,76 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.PutOutStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 出库类型服务层
+ */
+public interface PutOutStorageTypeService {
+    /**
+     * 根据条件查询出库类型列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery);
+
+    /**
+     * 新增出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 影响行数
+     */
+    int insertPutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo);
+
+    /**
+     * 修改出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 影响行数
+     */
+    int updatePutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo);
+
+    /**
+     * 将出库类型放入回收站
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 影响行数
+     */
+    int deletePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds);
+
+    /**
+     * 查询回收站中的出库类型类别
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<PutOutStorageTypeVo> selectRecyclePutOutStorageTypeList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery);
+
+    /**
+     * 将指定id的出库类型从回收站中回复
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 影响行数
+     */
+    int backPutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds);
+
+    /**
+     * 将回收站中的出库类型全部回复
+     * @return 影响行数
+     */
+    int backPutOutStorageTypeAll();
+
+    /**
+     * 销毁回收站中指定id的出库类型
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 影响行数
+     */
+    int deleteRecyclePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds);
+
+    /**
+     * 销毁回收站中的全部出库类型
+     * @return 影响行数
+     */
+    int deleteRecyclePutOutStorageTypeAll();
+}

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

@@ -0,0 +1,37 @@
+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.InventoryFlow;
+import org.dromara.InventoryManagement.domain.bo.InventoryFlowBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryFlowVo;
+import org.dromara.InventoryManagement.mapper.InventoryFlowMapper;
+import org.dromara.InventoryManagement.service.InventoryFlowService;
+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;
+
+/**
+ * 库存流水服务实现
+ */
+@RequiredArgsConstructor
+@Service
+public class InventoryFlowServiceImpl implements InventoryFlowService {
+    private final InventoryFlowMapper inventoryFlowMapper;
+    /**
+     * 根据InventoryFlow对象分页查询库存流水数据
+     *
+     * @param inventoryFlowBo 库存流水Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<InventoryFlowVo> selectPageInventoryFlowList(InventoryFlowBo inventoryFlowBo, PageQuery pageQuery) {
+        QueryWrapper<InventoryFlow> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(inventoryFlowBo.getName()),"name",inventoryFlowBo.getName());
+        Page<InventoryFlowVo> page= inventoryFlowMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+}

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

@@ -22,9 +22,9 @@ public class InventoryMonitoringServiceImpl implements InventoryMonitoringServic
     private final InventoryMonitoringMapper inventoryMonitoringMapper;
 
     /**
-     * 根据InventoryMonitoring对象分页查询品牌数据
+     * 根据InventoryMonitoring对象分页查询库存监控数据
      *
-     * @param inventoryMonitoringBo   BrandBo对象
+     * @param inventoryMonitoringBo   inventoryMonitoringBo对象
      * @param pageQuery 查询条件
      * @return 分页结果
      */

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

@@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.StorageProduct;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
 import org.dromara.InventoryManagement.domain.bo.StorageBo;
+import org.dromara.InventoryManagement.domain.bo.StorageListBo;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.mapper.PutInStorageMapper;
+import org.dromara.InventoryManagement.mapper.PutInStorageProductMapper;
+import org.dromara.InventoryManagement.mapstruct.NewStorageMapstruct;
 import org.dromara.InventoryManagement.service.PutInStorageService;
 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;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -22,12 +28,14 @@ import java.util.List;
 public class PutInStorageServiceImpl implements PutInStorageService {
 
     private final PutInStorageMapper putInStorageMapper;
+    private final PutInStorageProductMapper putInStorageProductMapper;
+    private final NewStorageMapstruct newStorageMapstruct;
 
     /**
      * 查询入库订单分页列表
-     * @param storageBo
-     * @param pageQuery
-     * @return
+     * @param storageBo 入库订单表Bo
+     * @param pageQuery 分页对象
+     * @return  结果
      */
     @Override
     public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
@@ -39,10 +47,57 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         return TableDataInfo.build(supplierVoList);
     }
 
+    /**
+     * 新增入库订单
+     * @param putInStorageBo 传入Bo类
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertStorage(PutInStorageBo putInStorageBo) {
+        try {
+            // 生成订单编号
+            OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+            // 入库订单表注入
+            Storage storage = newStorageMapstruct.toStorage(putInStorageBo, generator.generateOrderNumber("YKS"));
+            // 入库
+            putInStorageMapper.insert(storage);
+            // 详情表注入
+            for (StorageListBo storageListBo : putInStorageBo.getStorageList()){
+                // 关联表注入
+                StorageProduct storageProduct = newStorageMapstruct.toStorageProduct(putInStorageBo,storageListBo,storage.getId());
+                putInStorageProductMapper.insert(storageProduct);
+            }
+            return 1;
+        } catch (Exception e) {
+            throw new RuntimeException("插入入库订单失败", e);
+        }
+    }
+
+    /**
+     * 删除入库订单
+     * @param ids id集合
+     * @return  结果
+     */
+    @Override
+    public int deleteById(List<Integer> ids) {
+        putInStorageProductMapper.deleteByStorageIds(ids);
+        QueryWrapper<Storage> qw = new QueryWrapper<>();
+        qw.in("id", ids);
+        return putInStorageMapper.delete(qw);
+    }
+
+    /**
+     * 修改入库订单
+     * @param putInStorageBo 传入Bo类
+     * @return 结果
+     */
     @Override
-    public int insertInventory(StorageBo storageBo) {
-        OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
-        storageBo.setCode(generator.generateOrderNumber("YKS"));
-        return putInStorageMapper.insertInventory(storageBo);
+    public int updateStorage(PutInStorageBo putInStorageBo) {
+        for (StorageListBo storageListBo : putInStorageBo.getStorageList()){
+            // 关联表修改
+            putInStorageProductMapper.updateById(newStorageMapstruct.toStorageProduct(putInStorageBo, storageListBo, putInStorageBo.getId()));
+        }
+        return putInStorageMapper.updateById(newStorageMapstruct.toStorage(putInStorageBo, putInStorageBo.getInCode()));
     }
 }

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

@@ -19,28 +19,57 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 入库类型业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
     private final PutInStorageTypeMapper putInStorageTypeMapper;
+
+    /**
+     * 查询入库类型管理列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @Override
     public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
         QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(putInStorageTypeBo.getID() != 0,"id",putInStorageTypeBo.getID());
         qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
         Page<PutInStorageTypeVo>page= putInStorageTypeMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 新增结果
+     */
     @Override
     public int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
         PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
         return putInStorageTypeMapper.insert(putInStorageType);
     }
+
+    /**
+     * 修改入库类型
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @return 修改结果
+     */
     @Override
     public int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
         PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
         return putInStorageTypeMapper.updateById(putInStorageType);
     }
+
+    /**
+     * 将指定id的入库类型移入回收站
+     * @param putInStorageTypeIds 入库类型ids
+     * @return 回收结果
+     */
     @Override
     public int deletePutInStorageTypeByIds(List<Integer> putInStorageTypeIds){
         UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
@@ -48,6 +77,13 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         updateWrapper.set("deletetime",new Date());
         return putInStorageTypeMapper.update(updateWrapper);
     }
+
+    /**
+     * 查询回收站中的入库类型列表
+     * @param putInStorageTypeBo 入库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @Override
     public TableDataInfo <PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
         QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
@@ -60,6 +96,12 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         Page<PutInStorageTypeVo> page = putInStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 还原回收站中指定id的入库类型
+     * @param putInStorageTypeIds 入库类型ids
+     * @return 还原结果
+     */
     @Override
     public int backPutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
         UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
@@ -67,12 +109,23 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         updateWrapper.set("deletetime",null);
         return putInStorageTypeMapper.update(updateWrapper);
     }
+
+    /**
+     * 还原回收站中所有入库类型
+     * @return 还原结果
+     */
     @Override
     public int backPutInStorageTypeAll() {
         UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
         updateWrapper.set("deletetime",null);
         return putInStorageTypeMapper.update(updateWrapper);
     }
+
+    /**
+     * 销毁回收站中指定id的入库类型
+     * @param putInStorageTypeIds 入库类型ids
+     * @return 销毁结果
+     */
     @Override
     public int deleteRecyclePutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
         QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();
@@ -80,6 +133,11 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
         qw.isNotNull("deletetime");
         return putInStorageTypeMapper.delete(qw);
     }
+
+    /**
+     * 销毁回收站中所有的入库类型
+     * @return 销毁结果
+     */
     @Override
     public int deleteRecyclePutInStorageTypeAll() {
         QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();

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

@@ -0,0 +1,150 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.PutOutStorageType;
+import org.dromara.InventoryManagement.domain.bo.PutOutStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutOutStorageTypeVo;
+import org.dromara.InventoryManagement.mapper.PutOutStorageTypeMapper;
+import org.dromara.InventoryManagement.service.PutOutStorageTypeService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 出库类型业务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class PutOutStorageTypeServiceImpl implements PutOutStorageTypeService {
+    private final PutOutStorageTypeMapper putOutStorageTypeMapper;
+
+    /**
+     * 查询出库类型管理列表
+     * @param putOutStorage 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @Override
+    public TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorage, PageQuery pageQuery) {
+        QueryWrapper<PutOutStorageType> qw = new QueryWrapper<>();
+        qw.isNull("deletetime");
+        qw.like(putOutStorage.getID() != 0, "id", putOutStorage.getID());
+        qw.like(StringUtils.isNotBlank(putOutStorage.getName()), "name", putOutStorage.getName());
+        Page<PutOutStorageTypeVo> page = putOutStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 新增结果
+     */
+    @Override
+    public int insertPutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo) {
+        PutOutStorageType putOutStorageType = MapstructUtils.convert(putOutStorageTypeBo, PutOutStorageType.class);
+        return putOutStorageTypeMapper.insert(putOutStorageType);
+    }
+
+    /**
+     * 修改出库类型
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @return 修改结果
+     */
+    @Override
+    public int updatePutOutStorageType(PutOutStorageTypeBo putOutStorageTypeBo) {
+        PutOutStorageType putOutStorageType = MapstructUtils.convert(putOutStorageTypeBo, PutOutStorageType.class);
+        return putOutStorageTypeMapper.updateById(putOutStorageType);
+    }
+
+    /**
+     * 将指定id的出库类型移入回收站
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return  回收结果
+     */
+    @Override
+    public int deletePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds) {
+        UpdateWrapper<PutOutStorageType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", putOutStorageTypeIds);
+        updateWrapper.set("deletetime", new Date());
+        return putOutStorageTypeMapper.update(updateWrapper);
+    }
+
+    /**
+     * 查询回收站中的出库类型列表
+     * @param putOutStorageTypeBo 出库类型Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @Override
+    public TableDataInfo<PutOutStorageTypeVo> selectRecyclePutOutStorageTypeList(PutOutStorageTypeBo putOutStorageTypeBo, PageQuery pageQuery) {
+        QueryWrapper<PutOutStorageType> qw = new QueryWrapper<>();
+        Map<String, Object> params = putOutStorageTypeBo.getParams();
+        qw.eq(0 != putOutStorageTypeBo.getID(), "id", putOutStorageTypeBo.getID());
+        qw.like(StringUtils.isNotBlank(putOutStorageTypeBo.getName()), "name", putOutStorageTypeBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+            "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
+        qw.isNotNull("deletetime");
+        Page<PutOutStorageTypeVo> page = putOutStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 还原回收站中指定id的出库类型
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 还原结果
+     */
+    @Override
+    public int backPutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds) {
+        UpdateWrapper<PutOutStorageType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", putOutStorageTypeIds);
+        updateWrapper.set("deletetime", null);
+        return putOutStorageTypeMapper.update(updateWrapper);
+    }
+
+    /**
+     * 还原回收站中所有出库类型
+     * @return 还原结果
+     */
+    @Override
+    public int backPutOutStorageTypeAll() {
+        UpdateWrapper<PutOutStorageType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("deletetime", null);
+        return putOutStorageTypeMapper.update(updateWrapper);
+    }
+
+    /**
+     * 销毁回收站中指定id的出库类型
+     * @param putOutStorageTypeIds 出库类型ids
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecyclePutOutStorageTypeByIds(List<Integer> putOutStorageTypeIds) {
+        QueryWrapper<PutOutStorageType> qw=new QueryWrapper<>();
+        qw.in("id",putOutStorageTypeIds);
+        qw.isNotNull("deletetime");
+        return putOutStorageTypeMapper.delete(qw);
+    }
+
+    /**
+     * 销毁回收站中所有出库类型
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecyclePutOutStorageTypeAll() {
+        QueryWrapper<PutOutStorageType> qw=new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return putOutStorageTypeMapper.delete(qw);
+    }
+
+}
+
+

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/InventoryFlowMapper.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.InventoryFlowMapper">
+
+</mapper>

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

@@ -4,16 +4,5 @@
         "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-InventoryManagement/src/main/resources/mapper/PutInStorageProductMapper.xml

@@ -0,0 +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">
+<mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageProductMapper">
+
+    <delete id="deleteByStorageIds">
+        DELETE FROM fa_ykjp_storage_product
+        WHERE storage_id IN
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteByStorageId">
+        DELETE FROM fa_ykjp_storage_product WHERE storage_id = #{storageId}
+    </delete>
+
+</mapper>

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutOutStorageTypeMapper.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.PutOutStorageTypeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/OrderRecordController.java

@@ -20,9 +20,9 @@ public class OrderRecordController {
 
     /**
      * 查询客户下单记录列表
-     * @param orderRecordBo
-     * @param page
-     * @return
+     * @param orderRecordBo 查询条件
+     * @param page 分页信息
+     * @return 结果
      */
     @GetMapping("PageList")
     public TableDataInfo<OrderRecordVo> selectPageOrderRecordList(OrderRecordBo orderRecordBo, PageQuery page) {

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

@@ -2,6 +2,8 @@ package org.dromara.productionManagement.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
@@ -39,6 +41,7 @@ public class ProductionPlanController extends BaseController {
      * @param outFactory 数码印花厂id
      * @return 结果
      */
+    @Log(title = "更新数码印花厂", businessType = BusinessType.UPDATE)
     @PutMapping("/outFactory")
     public R<Void> updateOutFactory(@RequestParam Long id, @RequestParam int outFactory){
         return toAjax(productionPlanService.updateOutFactory(id, outFactory));
@@ -50,6 +53,7 @@ public class ProductionPlanController extends BaseController {
      * @param SHFactory 烧花厂id
      * @return 结果
      */
+    @Log(title = "更新烧花厂", businessType = BusinessType.UPDATE)
     @PutMapping("/SHFactory")
     public R<Void> updateSHFactory(@RequestParam Long id, @RequestParam int SHFactory){
         return toAjax(productionPlanService.updateSHFactory(id, SHFactory));
@@ -61,6 +65,7 @@ public class ProductionPlanController extends BaseController {
      * @param craftStatus 订单状态码
      * @return 结果
      */
+    @Log(title = "更新订单状态", businessType = BusinessType.UPDATE)
     @PutMapping("/craftStatus")
     public R<Void> updateCraftStatus(@RequestParam Long id, @RequestParam int craftStatus){
         return toAjax(productionPlanService.updateCraftStatus(id, craftStatus));
@@ -72,6 +77,7 @@ public class ProductionPlanController extends BaseController {
      * @param printStatus 打印状态码
      * @return 结果
      */
+    @Log(title = "更新打印状态", businessType = BusinessType.UPDATE)
     @PutMapping("/printStatus")
     public R<Void> updatePrintStatus(@RequestParam Long id, @RequestParam int printStatus){
         return toAjax(productionPlanService.updatePrintStatus(id, printStatus));
@@ -83,6 +89,7 @@ public class ProductionPlanController extends BaseController {
      * @param deliveryTime 发货时间
      * @return 结果
      */
+    @Log(title = "更新发货时间", businessType = BusinessType.UPDATE)
     @PutMapping("/deliveryTime")
     public R<Void> updateDeliveryTime(@RequestParam Long id, @RequestParam Date deliveryTime){
         return toAjax(productionPlanService.updateDeliveryTime(id, deliveryTime));
@@ -94,9 +101,45 @@ public class ProductionPlanController extends BaseController {
      * @param confirmDeliveryTime 确认收货时间
      * @return 结果
      */
+    @Log(title = "更新确认收货时间", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmDeliveryTime")
     public R<Void> updateConfirmDeliveryTime(@RequestParam Long id, @RequestParam Date confirmDeliveryTime){
         return toAjax(productionPlanService.updateConfirmDeliveryTime(id, confirmDeliveryTime));
     }
 
+    /**
+     * 更新作废状态
+     * @param id 订单id
+     * @param voidStatus 作废状态码
+     * @return 结果
+     */
+    @Log(title = "更新作废状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeVoidStatus")
+    public R<Void> changeVoidStatus(@RequestParam Long id, @RequestParam int voidStatus){
+        return toAjax(productionPlanService.changeVoidStatus(id, voidStatus));
+    }
+
+    /**
+     * 更新发货数量
+     * @param id 订单id
+     * @param shipNumber 发货数量
+     * @return 结果
+     */
+    @Log(title = "更新发货数量", businessType = BusinessType.UPDATE)
+    @PutMapping("/shipNumber")
+    public R<Void> updateShipNumber(@RequestParam Long id, @RequestParam int shipNumber){
+        return toAjax(productionPlanService.updateShipNumber(id, shipNumber));
+    }
+
+    /**
+     * 更新订单数量
+     * @param id 订单id
+     * @param number 订单数量
+     * @return 结果
+     */
+    @Log(title = "更新订单数量", businessType = BusinessType.UPDATE)
+    @PutMapping("/number")
+    public R<Void> updateNumber(@RequestParam Long id, @RequestParam double number){
+        return toAjax(productionPlanService.updateNumber(id, number));
+    }
 }

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

@@ -67,4 +67,28 @@ public interface ProductionPlanService {
      * @return 结果
      */
     int updateConfirmDeliveryTime(Long id, Date confirmDeliveryTime);
+
+    /**
+     * 更新作废状态
+     * @param id 订单id
+     * @param voidStatus 作废状态码
+     * @return 结果
+     */
+    int changeVoidStatus(Long id, int voidStatus);
+
+    /**
+     * 更新发货数量
+     * @param id 订单id
+     * @param shipNumber 发货数量
+     * @return 结果
+     */
+    int updateShipNumber(Long id, int shipNumber);
+
+    /**
+     * 更新订单数量
+     * @param id 订单id
+     * @param number 数量
+     * @return 结果
+     */
+    int updateNumber(Long id, double number);
 }

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

@@ -34,10 +34,11 @@ public class FactoryServiceImpl implements FactoryService {
     @Override
     public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery){
         QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
         qw.like(StringUtils.isNotBlank(factoryBo.getAddress()),"address",factoryBo.getAddress());
         qw.like(StringUtils.isNotBlank(factoryBo.getLinkman()),"linkman",factoryBo.getLinkman());
-        qw.isNull("deletetime");
+
         Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
@@ -66,7 +67,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 将指定id的工厂移入回收站
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 删除结果
      */
     @Override
@@ -79,7 +80,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 还原回收站中指定id的工厂
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 还原结果
      */
     @Override
@@ -111,7 +112,7 @@ public class FactoryServiceImpl implements FactoryService {
 
     /**
      * 销毁回收站中指定id的工厂
-     * @param factoryIds 工厂id数组
+     * @param factoryIds 工厂ids
      * @return 销毁结果
      */
     @Override

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.BulkOrderPlan;
+import org.dromara.bulk.mapper.BulkOrderPlanMapper;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -24,6 +26,7 @@ import java.util.Map;
 public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     private final ProductionPlanMapper productionPlanMapper;
+    private final BulkOrderPlanMapper bulkOrderPlanMapper;
 
     /**
      * 分页查询生产计划
@@ -35,6 +38,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
     public TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery) {
         QueryWrapper<ProductionPlan> qw = new QueryWrapper<>();
         qw.eq("p.craft_status",params.get("craftStatus"));
+        qw.eq(null != params.get("planId"), "p.id", params.get("planId"));
         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"));
@@ -138,4 +142,43 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
         uw.eq("id", id).set("confirm_delivery_time", confirmDeliveryTime);
         return productionPlanMapper.update(uw);
     }
+
+    /**
+     * 更新作废状态
+     * @param id 订单id
+     * @param voidStatus 作废状态码
+     * @return 结果
+     */
+    @Override
+    public int changeVoidStatus(Long id, int voidStatus) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("is_to_void", voidStatus);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新发货数量
+     * @param id 订单id
+     * @param shipNumber 发货数量
+     * @return 结果
+     */
+    @Override
+    public int updateShipNumber(Long id, int shipNumber) {
+        UpdateWrapper<BulkOrderPlan> uw = new UpdateWrapper<>();
+        uw.eq("plan_id", id).set("ship_num", shipNumber);
+        return bulkOrderPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新订单数量
+     * @param id 订单id
+     * @param number 数量
+     * @return 结果
+     */
+    @Override
+    public int updateNumber(Long id, double number) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("number", number);
+        return productionPlanMapper.update(uw);
+    }
 }