From d5066395da1bbca847ab4bcaeee2e537bb1422f9 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:01:00 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java    |    9 +++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java          |    2 
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java          |    2 
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java |   13 ++++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java                  |    2 
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionCkDTO.java           |   29 +++++++++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java    |    7 ++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java |   46 +++++++++++++++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/umeProductionRkQuery.java              |   19 ++++++
 9 files changed, 128 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
index b9636d0..9fb3d11 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
@@ -6,6 +6,8 @@
 import com.ruoyi.management.domain.SlVolumeProductionCk;
 import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
 import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
+import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
 import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
 import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
 import com.ruoyi.management.service.SlVolumeProductionCkService;
@@ -42,6 +44,13 @@
         return R.ok(slVolumeProductionCkService.getManagementimgSlVolumeProductionCkList(slGoodsMaterialsSlVolumeProductionRkQuery));
     }
 
+    @PostMapping("/addSlVolumeProductionCk")
+    @ApiOperation(value = "添加/修改出库")
+    public R addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
+        slVolumeProductionCkService.addSlVolumeProductionCk(slVolumeProductionCkDTO);
+        return R.ok();
+    }
+
 
 
 
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index 6456ef4..6742cf4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -77,4 +77,11 @@
         return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
     }
 
+
+    @PostMapping("/getroductionRkList")
+    @ApiOperation(value = "分页获取通过仓库管理ID当前批次入库的物资")
+    public R<PageDTO<ManagementimgVolumeProductionRkVO>> getroductionRkList(@RequestBody umeProductionRkQuery meProductionRkQuery) {
+        return R.ok(slVolumeProductionRkService.getroductionRkList(meProductionRkQuery));
+    }
+
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
index ac06efb..5892346 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
@@ -31,7 +31,7 @@
     @TableField("materials_id")
     private Long materialsId;
 
-    @ApiModelProperty("入库数量")
+    @ApiModelProperty("入库批次")
     @TableField("rk_id")
     private Long rkId;
 
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionCkDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionCkDTO.java
new file mode 100644
index 0000000..841a99a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionCkDTO.java
@@ -0,0 +1,29 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("出库库批次修改数据传输对象")
+public class SlVolumeProductionCkDTO {
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    @ApiModelProperty("入库批次")
+    @TableField("rk_id")
+    private Long rkId;
+
+    @ApiModelProperty("出库数量")
+    @TableField("ck_num")
+    private Integer ckNum;
+
+    @ApiModelProperty("归还数量")
+    @TableField("guih_num")
+    private Integer guihNum;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/umeProductionRkQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/umeProductionRkQuery.java
new file mode 100644
index 0000000..f9bf47e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/umeProductionRkQuery.java
@@ -0,0 +1,19 @@
+package com.ruoyi.management.domain.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("通过仓库管理拿入库物资的数据取对象")
+public class umeProductionRkQuery extends BasePage {
+    @ApiModelProperty("仓库ID")
+    private Long managementId;
+
+    @ApiModelProperty("物资名称")
+    private String goodsMaterialsName;
+
+    @ApiModelProperty("1 是非消耗,2是消耗 ")
+    private Integer isConsume;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
index fc1014e..4468459 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
@@ -4,6 +4,7 @@
 import com.ruoyi.management.domain.SlVolumeProductionCk;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
 import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -19,4 +20,5 @@
 
     PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery);
 
+    void addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO);
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
index 2077aba..5ec07bd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
@@ -31,4 +31,6 @@
     PageDTO<getVolumeProductionRkgCodeVO> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery);
     ManagementimgVolumeProductionRkVO codeInfo(Integer id);
 
+    PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery);
+
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
index 1f1801e..efac311 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -6,6 +6,7 @@
 import com.ruoyi.common.core.utils.page.PageDTO;
 import com.ruoyi.management.domain.*;
 import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
 import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
 import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
 import com.ruoyi.management.mapper.SlVolumeProductionCkMapper;
@@ -49,4 +50,16 @@
         }
         return SlGoodsShelfDTO;
     }
+
+    @Override
+    public void addSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
+        if (slVolumeProductionCkDTO.getId()==null){
+            SlVolumeProductionCk slVolumeProductionCk=new SlVolumeProductionCk();
+            slVolumeProductionCk.setRkId(slVolumeProductionCkDTO.getRkId());
+        }else{
+            SlVolumeProductionCk byId = this.getById(slVolumeProductionCkDTO.getId());
+            byId.setCkNum(slVolumeProductionCkDTO.getCkNum());
+            this.updateById(byId);
+        }
+    }
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 16c9e66..3dcb1ac 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -47,6 +47,10 @@
 
     @Resource
     private SysUserClient sysUserClient;
+
+
+
+
     @Override
     public PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
 
@@ -170,4 +174,46 @@
         return vo;
     }
 
+    @Override
+    public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
+
+        LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+        wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+        if (meProductionRkQuery.getIsConsume()!=0){
+            wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
+        }
+        wrapper.eq( SlGoodsMaterials::getDelFlag,0);
+        List<SlGoodsMaterials> page1 = slGoodsMaterialsMapper.selectList(wrapper);
+
+        Set<Long> goodsSkuIdList = null;
+        goodsSkuIdList = page1.stream().map(SlGoodsMaterials::getId)
+                .collect(Collectors.toSet());
+
+
+        Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
+        LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+        wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
+        if (goodsSkuIdList.size()>0){
+            wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
+        }
+        wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+        wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
+        Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
+        PageDTO<ManagementimgVolumeProductionRkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionRkVO.class);
+        List<ManagementimgVolumeProductionRkVO> list2 = SlGoodsShelfDTO.getList();
+        for(ManagementimgVolumeProductionRkVO list:list2) {
+            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+
+            SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
+            SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+
+            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+            list.setIsConsume(slGoodsMaterials.getIsConsume());
+            list.setSupplierName(data.getNickName());
+            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
+            list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+        }
+        return SlGoodsShelfDTO;
+    }
+
 }

--
Gitblit v1.7.1