fix：更新进销存管理模块入库订单模块代码

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/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/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/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/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/impl/PutInStorageServiceImpl.java

@@ -8,7 +8,6 @@ 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.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;

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>