czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改批量出入库

Browse Source
This commit is contained in:
韩鹏辉
2024-07-06 14:22:35 +08:00
parent 32401b3ca9
commit 6a9dba6623
6 changed files with 141 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
View File

@@ -13,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
@@ -51,7 +52,7 @@ public class TbConsInfoController {
@PutMapping @PutMapping
@Log("修改耗材信息") @Log("修改耗材信息")
@ApiOperation("修改耗材信息") @ApiOperation("修改耗材信息")
public ResponseEntity<Object> updateTbConsInfo(@Validated @RequestBody TbConsInfo resources){ public ResponseEntity<Object> updateTbConsInfo(@Validated @RequestBody TbConsInfo resources) throws Exception {
tbConsInfoService.update(resources); tbConsInfoService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
@@ -67,7 +68,7 @@ public class TbConsInfoController {
@PostMapping(value = "stockInOut") @PostMapping(value = "stockInOut")
@Log("耗材出入库") @Log("耗材出入库")
@ApiOperation("耗材出入库") @ApiOperation("耗材出入库")
public ResponseEntity<Object> stockInOut(@Validated @RequestBody TbConsSuppFlow resources) throws Exception { public ResponseEntity<Object> stockInOut(@Validated @RequestBody List<TbConsSuppFlow> resources) throws Exception {
tbConsInfoService.stockInOut(resources); tbConsInfoService.stockInOut(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoService.java
View File

@@ -66,5 +66,5 @@ public interface TbConsInfoService {
void download(List<TbConsInfoDto> all, HttpServletResponse response) throws IOException; void download(List<TbConsInfoDto> all, HttpServletResponse response) throws IOException;
void stockInOut(TbConsSuppFlow resources) throws Exception; void stockInOut(List<TbConsSuppFlow> resources) throws Exception;
} }

79
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@@ -27,6 +27,7 @@ import cn.ysk.cashier.cons.service.TbConsInfoService;
import cn.ysk.cashier.cons.service.dto.TbConsInfoDto; import cn.ysk.cashier.cons.service.dto.TbConsInfoDto;
import cn.ysk.cashier.cons.service.dto.TbConsInfoQueryCriteria; import cn.ysk.cashier.cons.service.dto.TbConsInfoQueryCriteria;
import cn.ysk.cashier.cons.service.mapstruct.TbConsInfoMapper; import cn.ysk.cashier.cons.service.mapstruct.TbConsInfoMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@@ -46,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
**/ **/
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class TbConsInfoServiceImpl implements TbConsInfoService { public class TbConsInfoServiceImpl implements TbConsInfoService {
private final TbConsInfoRepository tbConsInfoRepository; private final TbConsInfoRepository tbConsInfoRepository;
@@ -103,6 +105,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
if(count>0){ if(count>0){
throw new Exception("耗材代码不允许重复"); throw new Exception("耗材代码不允许重复");
} }
resources.setConTypeName(tbConsType.getConTypeName()); resources.setConTypeName(tbConsType.getConTypeName());
resources.setLasterInStock(BigDecimal.ZERO); resources.setLasterInStock(BigDecimal.ZERO);
resources.setStockNumber(BigDecimal.ZERO); resources.setStockNumber(BigDecimal.ZERO);
@@ -150,24 +153,28 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void stockInOut(TbConsSuppFlow resources) throws Exception { public void stockInOut(List<TbConsSuppFlow> resources) throws Exception {
TbConsInfo info= tbConsInfoRepository.getById(resources.getConInfoId()); if(Objects.isNull(resources)&&resources.size()<=0){
throw new Exception("参数错误");
}
for (TbConsSuppFlow resource : resources) {
TbConsInfo info= tbConsInfoRepository.getById(resource.getConInfoId());
if(Objects.isNull(info)){ if(Objects.isNull(info)){
throw new Exception("不存在的耗材信息"); log.info("耗材信息不存在");
continue;
} }
TbShopInfo tbShopInfo= tbShopInfoRepository.getById(resource.getShopId());
TbShopInfo tbShopInfo= tbShopInfoRepository.getById(resources.getShopId());
if(Objects.isNull(tbShopInfo)){ if(Objects.isNull(tbShopInfo)){
throw new Exception("店铺信息不存在"); log.info("店铺信息不存在");
continue;
} }
TbShopPurveyor purveyor= tbShopPurveyorRepository.getById(resource.getSupplierId());
TbShopPurveyor purveyor= tbShopPurveyorRepository.getById(resources.getSupplierId());
if(Objects.isNull(purveyor)){ if(Objects.isNull(purveyor)){
throw new Exception("不存在的供应商"); log.info("不存在的供应商");
continue;
} }
TbConsInfoFlow flow=new TbConsInfoFlow(); TbConsInfoFlow flow=new TbConsInfoFlow();
@@ -187,7 +194,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
TbProductStockOperate stockOperate = new TbProductStockOperate(); TbProductStockOperate stockOperate = new TbProductStockOperate();
stockOperate.setShopId(tbShopInfo.getId().toString()); stockOperate.setShopId(tbShopInfo.getId().toString());
stockOperate.setStockSnap(""); stockOperate.setStockSnap("");
stockOperate.setType(resources.getType()); stockOperate.setType(resource.getType());
stockOperate.setSubType(-1); stockOperate.setSubType(-1);
Map<String, String> operatorSnapMap = new HashMap<>(); Map<String, String> operatorSnapMap = new HashMap<>();
operatorSnapMap.put("name", tbShopInfo.getShopName()); operatorSnapMap.put("name", tbShopInfo.getShopName());
@@ -200,43 +207,43 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
stockOperate.setCreatedAt(System.currentTimeMillis()); stockOperate.setCreatedAt(System.currentTimeMillis());
stockOperate.setUpdatedAt(System.currentTimeMillis()); stockOperate.setUpdatedAt(System.currentTimeMillis());
stockOperate.setStatus("normal"); stockOperate.setStatus("normal");
stockOperate.setPurveyorId(resources.getSupplierId().toString()); stockOperate.setPurveyorId(resource.getSupplierId().toString());
stockOperate.setPurveyorName(purveyor.getPurveyorName()); stockOperate.setPurveyorName(purveyor.getPurveyorName());
tbProductStockOperateRepository.save(stockOperate); tbProductStockOperateRepository.save(stockOperate);
if("in".equals(resources.getType())){ if("in".equals(resource.getType())){
info.setStockNumber(info.getStockNumber().add(resources.getStockNumber())); info.setStockNumber(info.getStockNumber().add(resource.getStockNumber()));
info.setLasterInStock(resources.getStockNumber()); info.setLasterInStock(resource.getStockNumber());
resources.setType("in"); resource.setType("in");
flow.setBizCode("stockIn"); flow.setBizCode("stockIn");
flow.setBizName("耗材入库"); flow.setBizName("耗材入库");
flow.setBizType("+"); flow.setBizType("+");
purveyorTransact.setTotalAmount(resources.getAccountsPayable()); purveyorTransact.setTotalAmount(resource.getAccountsPayable());
purveyorTransact.setPaidAmount(resources.getActualPayment()); purveyorTransact.setPaidAmount(resource.getActualPayment());
purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment()))); purveyorTransact.setWaitAmount((resource.getAccountsPayable().subtract(resource.getActualPayment())));
purveyorTransact.setType("cons_in"); purveyorTransact.setType("cons_in");
}else { }else {
info.setStockNumber(info.getStockNumber().subtract(resources.getStockNumber())); info.setStockNumber(info.getStockNumber().subtract(resource.getStockNumber()));
resources.setType("out"); resource.setType("out");
flow.setBizCode("stockout"); flow.setBizCode("stockout");
flow.setBizName("耗材出库"); flow.setBizName("耗材出库");
flow.setBizType("-"); flow.setBizType("-");
purveyorTransact.setTotalAmount(resources.getAccountsPayable().negate()); purveyorTransact.setTotalAmount(resource.getAccountsPayable().negate());
purveyorTransact.setPaidAmount(resources.getActualPayment()); purveyorTransact.setPaidAmount(resource.getActualPayment());
purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment())).negate()); purveyorTransact.setWaitAmount((resource.getAccountsPayable().subtract(resource.getActualPayment())).negate());
purveyorTransact.setType("cons_out"); purveyorTransact.setType("cons_out");
} }
if (resources.getAccountsPayable().compareTo(resources.getActualPayment()) <= 0) { if (resource.getAccountsPayable().compareTo(resource.getActualPayment()) <= 0) {
purveyorTransact.setStatus(1); purveyorTransact.setStatus(1);
} else { } else {
purveyorTransact.setStatus(0); purveyorTransact.setStatus(0);
@@ -244,33 +251,31 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
purveyorTransact.setPaidAt(System.currentTimeMillis()); purveyorTransact.setPaidAt(System.currentTimeMillis());
purveyorTransactRepository.save(purveyorTransact); purveyorTransactRepository.save(purveyorTransact);
if (resources.getSupplierId() != null) { if (resource.getSupplierId() != null) {
tbShopPurveyorRepository.upLastTransactAt(resources.getSupplierId().toString()); tbShopPurveyorRepository.upLastTransactAt(resource.getSupplierId().toString());
} }
tbConsInfoRepository.save(info); tbConsInfoRepository.save(info);
resources.setAmount(resources.getStockNumber()); resource.setAmount(resource.getStockNumber());
resources.setBalance(info.getStockNumber()); resource.setBalance(info.getStockNumber());
resources.setCreateTime(new Timestamp(System.currentTimeMillis())); resource.setCreateTime(new Timestamp(System.currentTimeMillis()));
tbConsSuppFlowRepository.save(resources); tbConsSuppFlowRepository.save(resource);
flow.setConsId(info.getId()); flow.setConsId(info.getId());
flow.setShopId(info.getShopId()); flow.setShopId(info.getShopId());
flow.setConName(info.getConName()); flow.setConName(info.getConName());
flow.setAmount(resources.getStockNumber()); flow.setAmount(resource.getStockNumber());
flow.setBalance(info.getStockNumber()); flow.setBalance(info.getStockNumber());
flow.setCreateTime(new Timestamp(System.currentTimeMillis())); flow.setCreateTime(new Timestamp(System.currentTimeMillis()));
tbConsInfoFlowRepository.save(flow); tbConsInfoFlowRepository.save(flow);
}
} }
} }

8
eladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -56,6 +56,14 @@ spring:
port: 5672 port: 5672
username: admin username: admin
password: Czg666888 password: Czg666888
redis:
#数据库索引
database: ${REDIS_DB:0}
host: ${REDIS_HOST:101.37.12.135}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:111111}
#连接超时时间
timeout: 5000
# 登录相关配置 # 登录相关配置

8
eladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -55,6 +55,14 @@ spring:
port: 5672 port: 5672
username: admin username: admin
password: Czg666888 password: Czg666888
redis:
#数据库索引
database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:111111}
#连接超时时间
timeout: 5000
# 登录相关配置 # 登录相关配置
login: login:

16
eladmin-system/src/main/resources/config/application.yml
View File

@@ -31,22 +31,6 @@ spring:
dialect: org.hibernate.dialect.MySQL5InnoDBDialect dialect: org.hibernate.dialect.MySQL5InnoDBDialect
show_sql: true show_sql: true
# redisdb5:
# #数据库索引
# database: ${REDIS_DB:5}
# host: ${REDIS_HOST:127.0.0.1}
# port: ${REDIS_PORT:6379}
# password: ${REDIS_PWD:111111}
redis:
#数据库索引
database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:111111}
#连接超时时间
timeout: 5000
task: task:
pool: pool: