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-29 10:32:06 +08:00
parent b02b4c236c
commit 37c5aa1226
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,4 +26,6 @@ public class TbHandoverQueryCriteria{
/** 精确 */ /** 精确 */
@Query @Query
private String merchantName; private String merchantName;
} }

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

@@ -10,6 +10,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 cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.pojo.product.TbProductStockOperate; import cn.ysk.cashier.pojo.product.TbProductStockOperate;
import cn.ysk.cashier.pojo.shop.TbShopInfo; import cn.ysk.cashier.pojo.shop.TbShopInfo;
import cn.ysk.cashier.pojo.shop.TbShopPurveyor; import cn.ysk.cashier.pojo.shop.TbShopPurveyor;
@@ -255,7 +256,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
purveyorTransact.setType("cons_in"); purveyorTransact.setType("cons_in");
object.put("number",conInfos.getStockNumber()); object.put("number",conInfos.getStockNumber());
} else { } else if("out".equals(resources.getType())) {
stockOperate.setSubType(-1); stockOperate.setSubType(-1);
info.setStockNumber(info.getStockNumber().subtract(conInfos.getStockNumber())); info.setStockNumber(info.getStockNumber().subtract(conInfos.getStockNumber()));
suppFlow.setBalance(info.getStockNumber().subtract(info.getStockConsume()).subtract(conInfos.getStockNumber())); suppFlow.setBalance(info.getStockNumber().subtract(info.getStockConsume()).subtract(conInfos.getStockNumber()));
@@ -271,6 +272,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment())).negate()); purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment())).negate());
purveyorTransact.setType("cons_out"); purveyorTransact.setType("cons_out");
object.put("number",conInfos.getStockNumber()); object.put("number",conInfos.getStockNumber());
}else {
throw new BadRequestException("错误操作类型");
} }