fix:更新进销存管理模块代码

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

@@ -30,7 +30,7 @@ public class PutInStorageController extends BaseController {
      * @return 结果
      */
     @GetMapping("/PageList")
-    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+    public TableDataInfo<StorageVo> selectStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
         return putInStorageService.selectPutInStoragePageList(storageBo, pageQuery);
     }
 
@@ -54,8 +54,18 @@ public class PutInStorageController extends BaseController {
         return toAjax(putInStorageService.deleteById(ids));
     }
 
+    /**
+     * 修改入库订单
+     * @param putInStorageBo 传入Bo类
+     * @return 结果
+     */
     @PutMapping
     public R<Void> update(@RequestBody PutInStorageBo putInStorageBo) {
         return toAjax(putInStorageService.updateStorage(putInStorageBo));
     }
+
+    @GetMapping("/List")
+    public List<StorageVo> selectStorageList(StorageBo storageBo) {
+        return putInStorageService.selectStorageList(storageBo);
+    }
 }

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

@@ -2,6 +2,7 @@ package org.dromara.InventoryManagement.domain;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -26,6 +27,12 @@ public class Storage extends TenantEntity {
      */
     private String code;
 
+    /**
+     * 入库数总量
+     */
+    @TableField(value = "totalNums")
+    private double totalNums;
+
     /**
      * 库区
      */

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

@@ -1,6 +1,7 @@
 package org.dromara.InventoryManagement.domain.bo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +25,12 @@ public class StorageBo extends BaseEntity {
      */
     private String code;
 
+    /**
+     * 入库数总量
+     */
+    @TableField(value = "totalNums")
+    private double totalNums;
+
     /**
      * 入库单状态
      */

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

@@ -1,6 +1,7 @@
 package org.dromara.InventoryManagement.domain.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +25,12 @@ public class StorageVo extends BaseEntity {
      */
     private String code;
 
+    /**
+     * 入库数总量
+     */
+    @TableField(value = "totalNums")
+    private double totalNums;
+
     /**
      * 入库单状态
      */

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

@@ -5,8 +5,11 @@ import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 
 @Mapper
 public interface PutInStorageMapper extends BaseMapperPlus<Storage, StorageVo> {
 
+    List<StorageVo> selectStorageList();
 }

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

@@ -17,4 +17,6 @@ public interface PutInStorageService {
     int deleteById(List<Integer> ids);
 
     int updateStorage(PutInStorageBo putInStorageBo);
+
+    List<StorageVo> selectStorageList(StorageBo storageBo);
 }

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

@@ -56,18 +56,24 @@ public class PutInStorageServiceImpl implements PutInStorageService {
     @Transactional(rollbackFor = Exception.class)
     public int insertStorage(PutInStorageBo putInStorageBo) {
         try {
+            double totalNumber = 0;
             // 生成订单编号
             OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
             // 入库订单表注入
             Storage storage = newStorageMapstruct.toStorage(putInStorageBo, generator.generateOrderNumber("YKS"));
-            // 入库
-            putInStorageMapper.insert(storage);
+
             // 详情表注入
             for (StorageListBo storageListBo : putInStorageBo.getStorageList()){
+                // 获取总数量
+                totalNumber += storageListBo.getNums();
                 // 关联表注入
                 StorageProduct storageProduct = newStorageMapstruct.toStorageProduct(putInStorageBo,storageListBo,storage.getId());
                 putInStorageProductMapper.insert(storageProduct);
             }
+            // 总数量注入
+            storage.setTotalNums(totalNumber);
+            // 入库
+            putInStorageMapper.insert(storage);
             return 1;
         } catch (Exception e) {
             throw new RuntimeException("插入入库订单失败", e);
@@ -100,4 +106,9 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         }
         return putInStorageMapper.updateById(newStorageMapstruct.toStorage(putInStorageBo, putInStorageBo.getInCode()));
     }
+
+    @Override
+    public List<StorageVo> selectStorageList(StorageBo storageBo) {
+        return putInStorageMapper.selectStorageList();
+    }
 }

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

@@ -5,4 +5,10 @@
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
 
+    <select id="selectStorageList" resultType="org.dromara.InventoryManagement.domain.vo.StorageVo">
+
+
+    </select>
+
+
 </mapper>