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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-09-28 16:14:46 +08:00
parent 84acdd0161 e36fb3f55e
commit ffe39b3113
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
View File

@@ -59,7 +59,7 @@ public class TbConsInfoFlowController {
@ApiOperation("耗材报损") @ApiOperation("耗材报损")
public ResponseEntity<Object> frmLoss(@RequestBody TbConsInfoFlowDto resources){ public ResponseEntity<Object> frmLoss(@RequestBody TbConsInfoFlowDto resources){
tbConsInfoFlowService.frmLoss(resources); tbConsInfoFlowService.frmLoss(resources);
return new ResponseEntity<>(HttpStatus.CREATED); return new ResponseEntity<>("ok",HttpStatus.OK);
} }
// @GetMapping // @GetMapping

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java
View File

@@ -77,7 +77,7 @@ public class TbProductStockDetailController {
@ApiOperation("商品报损") @ApiOperation("商品报损")
public ResponseEntity<Object> frmLoss(@Validated @RequestBody TbProductFrmLossDto resources){ public ResponseEntity<Object> frmLoss(@Validated @RequestBody TbProductFrmLossDto resources){
tbProductStockDetailService.frmLoss(resources); tbProductStockDetailService.frmLoss(resources);
return new ResponseEntity<>(HttpStatus.CREATED); return new ResponseEntity<>("ok",HttpStatus.OK);
} }
// /** // /**

11
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
View File

@@ -186,9 +186,9 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
stockDetail.setSourcePath("CASHIER-APP"); stockDetail.setSourcePath("CASHIER-APP");
stockDetail.setProductName(product.getName()); stockDetail.setProductName(product.getName());
stockDetail.setUnitName(tbShopUnit==null?"":tbShopUnit.getName()); stockDetail.setUnitName(tbShopUnit==null?"":tbShopUnit.getName());
tbProductStockDetailRepository.save(stockDetail);
stockDetail.setCreatedAt(System.currentTimeMillis()); stockDetail.setCreatedAt(System.currentTimeMillis());
stockDetail.setUpdatedAt(System.currentTimeMillis()); stockDetail.setUpdatedAt(System.currentTimeMillis());
tbProductStockDetailRepository.save(stockDetail);
product.setStockNumber(product.getStockNumber()-stockDetail.getStockNumber().intValue()); product.setStockNumber(product.getStockNumber()-stockDetail.getStockNumber().intValue());
tbProductRepository.save(product); tbProductRepository.save(product);
} }
@@ -256,7 +256,9 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
public void addSaleRecord(Integer orderId) { public void addSaleRecord(Integer orderId) {
List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId); List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId);
log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS); log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS);
stockCountDTOS.forEach(s->{ stockCountDTOS.forEach(s -> {
//客座费不统计
if (!s.getProId().toString().equals("-999")) {
if (s.getStockCount() > 0) { if (s.getStockCount() > 0) {
TbProductStockDetail productStockDetail = new TbProductStockDetail(); TbProductStockDetail productStockDetail = new TbProductStockDetail();
productStockDetail.setCreatedAt(System.currentTimeMillis()); productStockDetail.setCreatedAt(System.currentTimeMillis());
@@ -267,7 +269,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
productStockDetail.setOrderId(orderId.toString()); productStockDetail.setOrderId(orderId.toString());
// productStockDetail.setSkuId(s.getSkuId().toString()); // productStockDetail.setSkuId(s.getSkuId().toString());
productStockDetail.setIsStock(s.getIsStock());//是否开启库存 productStockDetail.setIsStock(s.getIsStock());//是否开启库存
productStockDetail.setLeftNumber(s.getStockNumber()+s.getStockCount());//原库存 productStockDetail.setLeftNumber(s.getStockNumber() + s.getStockCount());//原库存
productStockDetail.setSpecSnap(s.getSpecSnap()); productStockDetail.setSpecSnap(s.getSpecSnap());
productStockDetail.setUnitName(s.getUnitName()); productStockDetail.setUnitName(s.getUnitName());
productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount())); productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount()));
@@ -277,7 +279,8 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
productStockDetail.setSubType(-1); productStockDetail.setSubType(-1);
tbProductStockDetailRepository.save(productStockDetail); tbProductStockDetailRepository.save(productStockDetail);
} }
skutMapper.incrRealSalesNumber(s.getSkuId().intValue(),s.getStockCount()); skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount());
}
}); });
} }