库存记录 操作人
This commit is contained in:
@@ -208,6 +208,7 @@ public class StockServiceImpl implements StockService {
|
||||
stockDetail.setUpdatedAt(System.currentTimeMillis());
|
||||
stockDetail.setSourcePath("SHOP");
|
||||
stockDetail.setRemark("一次性入库覆盖库存");
|
||||
stockDetail.setOperator(SecurityUtils.getCurrentUsername());
|
||||
if ("sku".equals(productIdStr)) {
|
||||
Optional<TbProductSku> byId = skuRepository.findById(Double.valueOf(row.getCell(2).toString()).intValue());
|
||||
if (byId.isPresent()) {
|
||||
@@ -393,6 +394,27 @@ public class StockServiceImpl implements StockService {
|
||||
case "stockNumber"://库存
|
||||
description.append(" 库存数量修改为:"+updateValueVO.getValue()+" 原库存:"+product.getStockNumber());
|
||||
sqlQuery.append(" set stock_number = ").append(updateValueVO.getValue());
|
||||
TbProductStockDetail detail=new TbProductStockDetail();
|
||||
detail.setProductId(product.getId().toString());
|
||||
detail.setProductName(product.getName());
|
||||
detail.setShopId(product.getShopId());
|
||||
detail.setOperator(SecurityUtils.getCurrentUsername());
|
||||
detail.setSourcePath("NORMAL");
|
||||
detail.setLeftNumber(product.getStockNumber());
|
||||
detail.setStockNumber(new Double(Integer.valueOf(updateValueVO.getValue())-product.getStockNumber()));
|
||||
TbShopUnit tbShopUnit = shopUnitRepository.findById(product.getUnitId()).orElse(null);
|
||||
if(tbShopUnit!=null){
|
||||
detail.setUnitName(tbShopUnit.getName());
|
||||
}
|
||||
if (product.getStockNumber() > Integer.valueOf(updateValueVO.getValue())) {
|
||||
detail.setSubType(-1);
|
||||
detail.setType("盘点出库");
|
||||
} else {
|
||||
detail.setSubType(1);
|
||||
detail.setType("盘点入库");
|
||||
}
|
||||
detail.setCreatedAt(System.currentTimeMillis());
|
||||
tbProductStockDetailRepository.save(detail);
|
||||
break;
|
||||
case "salePrice"://价格
|
||||
description.append("修改价格为" + updateValueVO.getValue());
|
||||
|
||||
@@ -103,21 +103,17 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
|
||||
-> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
|
||||
Page<TbProductStockDetailDto> map = page.map(tbProductStockDetailMapper::toDto);
|
||||
|
||||
ArrayList<Map<String, Object>> contents = new ArrayList<>();
|
||||
for (TbProductStockDetailDto tbProductStockDetailDto : map.getContent()) {
|
||||
Map<String, Object> map1 = BeanUtil.transBean2Map(tbProductStockDetailDto);
|
||||
if (StrUtil.isNotBlank(tbProductStockDetailDto.getOrderId())) {
|
||||
TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(Integer.valueOf(tbProductStockDetailDto.getOrderId())).orElse(null);
|
||||
if (tbOrderInfo != null) {
|
||||
map1.put("orderNo", tbOrderInfo.getOrderNo());
|
||||
tbProductStockDetailDto.setOrderNo(tbOrderInfo.getOrderNo());
|
||||
}
|
||||
}
|
||||
contents.add(map1);
|
||||
|
||||
tbProductStockDetailDto.setTypes();
|
||||
}
|
||||
Map<String,Object> info = new LinkedHashMap<>(2);
|
||||
info.put("content",contents);
|
||||
info.put("content",map.getContent());
|
||||
info.put("totalElements",page.getTotalElements());
|
||||
return info;
|
||||
}
|
||||
|
||||
@@ -501,6 +501,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
|
||||
productStockDetail.setStockSnap(JSONObject.toJSONString(snapItem));
|
||||
productStockDetail.setSourcePath("CASHIER");
|
||||
productStockDetail.setRemark(stockRecordMsg.getRemark());
|
||||
productStockDetail.setOperator(stockRecordMsg.getOperator());
|
||||
productStockDetailRepository.save(productStockDetail);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user