打印 调整
This commit is contained in:
@@ -10,6 +10,8 @@ import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.czg.config.RabbitPublisher;
|
||||
import com.czg.exception.CzgException;
|
||||
import com.czg.print.StockCheckPrintDTO;
|
||||
import com.czg.print.StockPrintDTO;
|
||||
import com.czg.product.dto.ConsStockFlowDTO;
|
||||
import com.czg.product.entity.ConsInfo;
|
||||
import com.czg.product.entity.ConsStockFlow;
|
||||
@@ -23,6 +25,7 @@ import com.czg.service.product.mapper.ConsInfoMapper;
|
||||
import com.czg.service.product.mapper.ConsStockFlowMapper;
|
||||
import com.czg.service.product.mapper.ProductMapper;
|
||||
import com.czg.service.product.util.WxAccountUtil;
|
||||
import com.czg.utils.FunUtils;
|
||||
import com.czg.utils.PageUtil;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
@@ -36,6 +39,7 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -108,7 +112,7 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
|
||||
for (ConsInfo consInfo : updateStockList) {
|
||||
consInfoMapper.update(consInfo);
|
||||
}
|
||||
|
||||
FunUtils.transactionSafeRun(() -> sendInOutPrintMsg("IN", shopId, param));
|
||||
return param;
|
||||
}
|
||||
|
||||
@@ -145,6 +149,33 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
|
||||
for (ConsInfo consInfo : updateStockList) {
|
||||
consInfoMapper.update(consInfo);
|
||||
}
|
||||
FunUtils.transactionSafeRun(() -> sendInOutPrintMsg("OUT", shopId, param));
|
||||
}
|
||||
|
||||
private void sendInOutPrintMsg(String type, Long shopId, ConsInOutStockHeadParam param) {
|
||||
StockPrintDTO stockPrint = new StockPrintDTO();
|
||||
stockPrint.setType(type);
|
||||
stockPrint.setPrintTime(LocalDateTime.now());
|
||||
stockPrint.setOperator(param.getOperator());
|
||||
stockPrint.setConsCount(param.getBodyList().size());
|
||||
List<StockPrintDTO.InStockItem> items = new ArrayList<>();
|
||||
BigDecimal totalInOutNumber = BigDecimal.ZERO;
|
||||
BigDecimal totalAmount = BigDecimal.ZERO;
|
||||
for (ConsInOutStockBodyParam cons : param.getBodyList()) {
|
||||
StockPrintDTO.InStockItem item = new StockPrintDTO.InStockItem();
|
||||
item.setConsName(cons.getConName());
|
||||
item.setUnit(cons.getUnitName());
|
||||
item.setStockNumber(cons.getInOutNumber());
|
||||
item.setAmount(cons.getSubTotal());
|
||||
items.add(item);
|
||||
totalInOutNumber = NumberUtil.add(totalInOutNumber, cons.getInOutNumber());
|
||||
totalAmount = NumberUtil.add(totalAmount, cons.getSubTotal());
|
||||
}
|
||||
stockPrint.setStockNumberCount(totalInOutNumber);
|
||||
stockPrint.setAmountCount(totalAmount);
|
||||
stockPrint.setItems(items);
|
||||
//库存盘点
|
||||
rabbitPublisher.sendOtherPrintMsg(shopId, stockPrint, "STOCK");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -183,6 +214,19 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
|
||||
consInfo.setStockNumber(entity.getAfterNumber());
|
||||
consInfoMapper.update(consInfo);
|
||||
saveFlow(entity, consInfo.getConWarning());
|
||||
|
||||
FunUtils.transactionSafeRun(() -> {
|
||||
StockCheckPrintDTO stockCheckPrintDTO = new StockCheckPrintDTO();
|
||||
stockCheckPrintDTO.setWinLossNumberCount(winLossNumber.intValue());
|
||||
stockCheckPrintDTO.setWinLossAmount(entity.getSubTotal());
|
||||
stockCheckPrintDTO.setRemark(entity.getRemark());
|
||||
stockCheckPrintDTO.setOperator(param.getOperator());
|
||||
List<StockCheckPrintDTO.StockCheckItem> items = new ArrayList<>();
|
||||
items.add(new StockCheckPrintDTO.StockCheckItem(consInfo.getConName(), param.getPrice(), consInfo.getConUnit(), param.getActualNumber(), param.getWinLossNumber()));
|
||||
stockCheckPrintDTO.setItems(items);
|
||||
//库存盘点
|
||||
rabbitPublisher.sendOtherPrintMsg(shopId, stockCheckPrintDTO, "STOCK_CHECK");
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user