From d204e01db828bbe4dd9ad5e19d6ff13f99334478 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 16:47:28 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java | 2 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java | 9 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java | 50 +++++++++++++++++++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ScanCodesController.java | 7 +--
4 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ScanCodesController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ScanCodesController.java
index 068ddf9..826d47f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ScanCodesController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ScanCodesController.java
@@ -6,10 +6,7 @@
import com.ruoyi.management.service.InventoriesSuppliesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -21,7 +18,7 @@
@Resource
private InventoriesSuppliesService inventoriesSuppliesService;
- @PostMapping("/scanCodes")
+ @GetMapping("/scanCodes")
@ApiOperation(value = "安卓扫描传输数据")
public R scanCodes(@RequestBody ScanCodesDTO scanCodesDTO) {
inventoriesSuppliesService.scanCodes(scanCodesDTO);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
index eb6e9e8..1ab8cad 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlAudit;
+import com.ruoyi.management.domain.SlVolumeProductionCk;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.SlVolumeProductionZygl;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyDTO;
@@ -23,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -86,4 +88,11 @@
return R.ok();
}
+
+ @ApiOperation("转移管理入库")
+ @DeleteMapping("/zy/{id}")
+ public R<?> zy(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
+ slVolumeProductionZyglService.zy(id);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java
index 1a628b9..1f3e104 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java
@@ -28,4 +28,6 @@
VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Integer id);
VolumeProductionZyglInventoryVO getVolumeProductionZyglnventory( Integer id);
+
+ void zy(Integer id);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
index 66b8c3a..78e2432 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
@@ -53,6 +53,9 @@
@Resource
private SlVolumeProductionZyMapper slVolumeProductionZyMapper;
+ @Resource
+ private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
+
@Override
public PageDTO<VolumeProductionzZyglVO> getVolumeProductionzZyglList(SlVolumeProductionZyQuery slVolumeProductionZyQuery) {
Page<SlVolumeProductionZygl> page = new Page<>(slVolumeProductionZyQuery.getPageCurr(), slVolumeProductionZyQuery.getPageSize());
@@ -204,4 +207,51 @@
vo.setManagementimgVolumeProductionCkVOList(SlGoodsShelfDTO);
return vo;
}
+
+ @Override
+ public void zy(Integer id) {
+ SlVolumeProductionZygl byId = this.getById(id);
+ LambdaQueryWrapper<SlVolumeProductionZy> wrapper1 = Wrappers.lambdaQuery();
+ wrapper1.eq(SlVolumeProductionZy::getZyglId, id);
+ wrapper1.eq(SlVolumeProductionZy::getDelFlag, 0);
+ wrapper1.orderByDesc(SlVolumeProductionZy::getCreateTime);
+ List<SlVolumeProductionZy> page2 = slVolumeProductionZyMapper.selectList(wrapper1);
+ for (SlVolumeProductionZy zy:page2){
+ SlVolumeProductionRk slVolumeProductionRk1 = slVolumeProductionRkMapper.selectById(zy.getRkId());
+ SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
+ slVolumeProductionRk.setMaterialsId(slVolumeProductionRk1.getMaterialsId());
+ slVolumeProductionRk.setStoreManagementNumber(slVolumeProductionRk1.getStoreManagementNumber());
+ slVolumeProductionRk.setManagementId(byId.getBmanagementId());
+ slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+ slVolumeProductionRk.setRkNum(Long.valueOf(zy.getZyNum()));
+ slVolumeProductionRk.setShelfId(slVolumeProductionRk1.getShelfId());
+ slVolumeProductionRk.setRepertoryZhai(Long.valueOf(zy.getZyNum()));
+ slVolumeProductionRkMapper.insert(slVolumeProductionRk);
+ zy.setScrkId(slVolumeProductionRk.getId());
+
+ LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery();
+ wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionRk1.getMaterialsId());
+ wrapper2.eq(ManagementGoodsMaterials::getManagementId,byId.getBmanagementId());
+ wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
+ ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
+ if (managementGoodsMaterials!=null){
+ Long repertorySum = managementGoodsMaterials.getRepertorySum();
+ Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai();
+ Long re=repertorySum+Long.valueOf(zy.getZyNum());
+ Long re1=repertoryZhai+Long.valueOf(zy.getZyNum());
+ managementGoodsMaterials.setRepertorySum(re);
+ managementGoodsMaterials.setRepertoryZhai(re1);
+ managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
+ }else{
+ ManagementGoodsMaterials managementGoodsMaterials1=new ManagementGoodsMaterials();
+ managementGoodsMaterials1.setManagementId(byId.getBmanagementId());
+ managementGoodsMaterials1.setGoodsMaterialsId(slVolumeProductionRk1.getMaterialsId());
+ managementGoodsMaterials1.setRepertoryZhai(Long.valueOf(zy.getZyNum()));
+ managementGoodsMaterials1.setRepertorySum(Long.valueOf(zy.getZyNum()));
+ managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
+ }
+
+
+ }
+ }
}
--
Gitblit v1.7.1