From 1c4311135628b53daa336821ff452292a9d063e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 28 八月 2024 09:14:10 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
index 29911c5..0527763 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
@@ -9,11 +9,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ClientTypeEnum;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.management.domain.InventoriesSupplies;
+import com.ruoyi.management.domain.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.management.domain.SlGoodsShelf;
-import com.ruoyi.management.domain.SlStoreManagement;
-import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.InventoriesSuppDTO;
import com.ruoyi.management.domain.dto.InventoriesSuppliesQuery;
import com.ruoyi.management.domain.dto.ScanCodesDTO;
@@ -24,12 +21,16 @@
import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.service.InventoriesSuppliesService;
+import com.ruoyi.management.service.SlGoodsMaterialsService;
+import com.ruoyi.management.service.SlGoodsShelfService;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.WebsocketMessageDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.models.auth.In;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -56,7 +57,12 @@
@Resource
private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
-
+ @Autowired
+ private SlGoodsMaterialsService slGoodsMaterialsService;
+ @Autowired
+ private SlGoodsShelfService slGoodsShelfService;
+ @Autowired
+ private InventoriesSuppliesMapper inventoriesSuppliesMapper;
private static final ObjectMapper objectMapper = new ObjectMapper();
@Override
@@ -114,6 +120,7 @@
InventoriesSupplies inventoriesSupplies=new InventoriesSupplies();
inventoriesSupplies.setMaterialsId(inventoriesSuppDTO.getMaterialsId());
inventoriesSupplies.setPdTime(new Date());
+ inventoriesSupplies.setCreateTime(new Date());
inventoriesSupplies.setPdrId(inventoriesSuppDTO.getPdrId());
R<SysUser> sysUser = sysUserClient.getSysUser(inventoriesSuppDTO.getPdrId());
inventoriesSupplies.setPdrName(sysUser.getData().getNickName());
@@ -123,18 +130,32 @@
@Override
public void scanCodes(String rkNumber) {
LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(SlVolumeProductionRk::getRkNumber,rkNumber);
- wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+ wrapper1.eq(SlVolumeProductionRk::getRkNumber,rkNumber);
+ wrapper1.eq(SlVolumeProductionRk::getDelFlag,"0");
wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
SlVolumeProductionRk page2 = slVolumeProductionRkMapper.selectOne(wrapper1);
- if (page2.getSmerwmNum()>0){
- Integer i=page2.getSmerwmNum()-1;
- page2.setSmerwmNum(i);
- slVolumeProductionRkMapper.updateById(page2);
- }
+// if (page2.getSmerwmNum()<page2.getErwmNum()){
+// Integer i=page2.getSmerwmNum()+1;
+// page2.setSmerwmNum(i);
+// slVolumeProductionRkMapper.updateById(page2);
+// }
+ SlGoodsMaterials byId = slGoodsMaterialsService.getById(page2.getMaterialsId());
+
+ page2.setGoodsMaterialsName(byId.getGoodsMaterialsName());
+ page2.setIsConsume(byId.getIsConsume());
+ page2.setManagementNumber(page2.getStoreManagementNumber());
+ page2.setShelfName(slGoodsShelfService.getById(page2.getShelfId()).getGoodsShelfName());
+ SlVolumeProductionRkVO slVolumeProductionRkVO = new SlVolumeProductionRkVO();
+ BeanUtils.copyProperties(page2,slVolumeProductionRkVO);
+ slVolumeProductionRkVO.setId(page2.getId().toString());
+// slVolumeProductionRkVO.setVolumeProductionRkglId(page2.getVolumeProductionRkglId().toString());
+ slVolumeProductionRkVO.setMaterialsId(page2.getMaterialsId().toString());
+ slVolumeProductionRkVO.setManagementId(page2.getManagementId().toString());
+ slVolumeProductionRkVO.setShelfId(page2.getShelfId().toString());
+
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.SCANCODES);
- map.put("SlVolumeProductionRk",page2);
+ map.put("SlVolumeProductionRk",slVolumeProductionRkVO);
String msg = null;
try {
msg = objectMapper.writeValueAsString(map);
@@ -144,4 +165,7 @@
}
+ public InventoriesSupplies getById1(Long suppliesId) {
+ return inventoriesSuppliesMapper.getById1(suppliesId);
+ }
}
--
Gitblit v1.7.1