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

Merge branch 'refs/heads/dev' into gyj

Browse Source
This commit is contained in:
GYJ
2024-07-30 11:12:16 +08:00
parent 8486461224 0aa0bcda77
commit f1ee8d0de5
3 changed files with 5 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/domain/SuppFlow.java
View File

@@ -25,6 +25,8 @@ public class SuppFlow implements Serializable {
private List<ConInfos> list; private List<ConInfos> list;
private String remark;
@Data @Data

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

@@ -75,6 +75,7 @@ public class TbConsInfoController {
@Log("耗材出入库") @Log("耗材出入库")
@ApiOperation("耗材出入库") @ApiOperation("耗材出入库")
public ResponseEntity<Object> stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception { public ResponseEntity<Object> stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception {
tbConsInfoService.stockInOut(resources); tbConsInfoService.stockInOut(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }

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

@@ -175,6 +175,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void stockInOut(SuppFlow resources) throws Exception { public void stockInOut(SuppFlow resources) throws Exception {
log.info("resources:{}",JSON.toJSONString(resources));
if (Objects.isNull(resources)) { if (Objects.isNull(resources)) {
throw new Exception("参数错误"); throw new Exception("参数错误");
} }
@@ -198,7 +199,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
operatorSnapMap.put("account", tbShopInfo.getAccount()); operatorSnapMap.put("account", tbShopInfo.getAccount());
stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap)); stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap));
stockOperate.setRemark(""); stockOperate.setRemark(resources.getRemark());
stockOperate.setStockTime(System.currentTimeMillis()); stockOperate.setStockTime(System.currentTimeMillis());
stockOperate.setCreatedAt(System.currentTimeMillis()); stockOperate.setCreatedAt(System.currentTimeMillis());
stockOperate.setUpdatedAt(System.currentTimeMillis()); stockOperate.setUpdatedAt(System.currentTimeMillis());