feat:新增进销存管理模块入库订单模块删除、编辑功能代码

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

@@ -13,6 +13,8 @@ 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
@@ -23,18 +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 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/domain/bo/PutInStorageBo.java

@@ -10,6 +10,11 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class PutInStorageBo extends BaseEntity {
 
+    /**
+     * Id
+     */
+    private int id;
+
     /**
      * 仓库Id
      */
@@ -25,6 +30,11 @@ public class PutInStorageBo extends BaseEntity {
      */
     private String remarkStorage;
 
+    /**
+     * 订单号
+     */
+    private String inCode;
+
     /**
      * 入库单
      */

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

@@ -4,6 +4,10 @@ import lombok.Data;
 
 @Data
 public class StorageListBo {
+    /**
+     * Id
+     */
+    private int id;
 
     /**
      * 布料Id

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

@@ -4,9 +4,16 @@ 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/mapstruct/NewStorageMapstruct.java

@@ -14,11 +14,13 @@ import org.mapstruct.Mapping;
 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/PutInStorageService.java

@@ -6,9 +6,15 @@ 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 insertStorage(PutInStorageBo putInStorageBo);
+
+    int deleteById(List<Integer> ids);
+
+    int updateStorage(PutInStorageBo putInStorageBo);
 }

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

@@ -3,7 +3,6 @@ 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.PutInStorageType;
 import org.dromara.InventoryManagement.domain.Storage;
 import org.dromara.InventoryManagement.domain.StorageProduct;
 import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
@@ -14,7 +13,6 @@ 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.commodityManagement.domain.DiBu;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -35,9 +33,9 @@ public class PutInStorageServiceImpl implements PutInStorageService {
 
     /**
      * 查询入库订单分页列表
-     * @param storageBo
-     * @param pageQuery
-     * @return
+     * @param storageBo 入库订单表Bo
+     * @param pageQuery 分页对象
+     * @return  结果
      */
     @Override
     public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
@@ -49,6 +47,11 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         return TableDataInfo.build(supplierVoList);
     }
 
+    /**
+     * 新增入库订单
+     * @param putInStorageBo 传入Bo类
+     * @return 结果
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertStorage(PutInStorageBo putInStorageBo) {
@@ -71,4 +74,30 @@ public class PutInStorageServiceImpl implements PutInStorageService {
         }
     }
 
+    /**
+     * 删除入库订单
+     * @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 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/resources/mapper/PutInStorageMapper.xml

@@ -4,9 +4,5 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageMapper">
 
-<!--    <insert id="insert" useGeneratedKeys="true" keyProperty="id">-->
-<!--        INSERT INTO fa_ykjp_storage-->
-<!--        VALUES (#{code}, #{status}, #{otherColumn})-->
-<!--    </insert>-->
 
 </mapper>

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

@@ -4,4 +4,16 @@
         "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>