luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/cpy_splite' into test

Browse Source 
# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
release
wangrangrang 2 years ago
parent a9fe65ce6e 1ec9780df5
commit 14ab7d4c83
1 changed files with 58 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 98
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

98
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
Unescape View File

@ -22,6 +22,9 @@ import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService
import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService;
import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
import com.dxhy.order.constant.*;
import com.dxhy.order.consumer.model.page.PageCommonOrderInfo;
import com.dxhy.order.consumer.model.page.PageOrderInfo;
import com.dxhy.order.consumer.model.page.PageOrderItemInfo;
import com.dxhy.order.consumer.modules.manager.service.InvoiceService;
import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem;
import com.dxhy.order.consumer.modules.order.model.PageInvoiceReq;
@ -135,8 +138,8 @@ public class InvoiceServiceImpl implements InvoiceService {
@Resource
private TaxClassCodeMapper taxClassCodeMapper;
private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#0000");
private static final String CF = "cf";
@Resource
private OrderSplitService orderSplitService;
@Override
@ -146,13 +149,15 @@ public class InvoiceServiceImpl implements InvoiceService {
//查询数据列表
List<CommonOrderInfo> commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList);
log.info("commonOrderInfos---->batch query order info"+JSON.toJSONString(commonOrderInfos));
//存储成品油和非成品油不是混开的结算单
List<CommonOrderInfo> commonOrderInfoList=new ArrayList<CommonOrderInfo>();
//存储成品油和非成品油混开的结算单
List<PageCommonOrderInfo> mixCommonOrderInfoList=new ArrayList<>();
//购方是否为空、税编是否为空校验、成品油校验
for(CommonOrderInfo commonOrderInfo:commonOrderInfos){
if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){
return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!");
}
// String cpy = "";
String kcp = baseServiceConfig.getKcp();
boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm());
List<OrderItemInfo> cpyOrderItems = new ArrayList<OrderItemInfo>();
@ -162,14 +167,6 @@ public class InvoiceServiceImpl implements InvoiceService {
return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"第"+orderItemInfo.getSphxh()+"行商品税编为空,请补全!");
}else {
TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm());
// if(StrUtil.isNotBlank(cpy)){
// if(!cpy.equals(taxClassCodeEntity.getCpy())){
// return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"成品油和非成品油税编不能混开,请做手动拆分处理!");
// }
// }else {
// cpy = taxClassCodeEntity.getCpy();
// }
//
if(ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())){
//成品油明细
cpyOrderItems.add(orderItemInfo);
@ -187,41 +184,58 @@ public class InvoiceServiceImpl implements InvoiceService {
commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems);
commonOrderInfoList.add(commonOrderInfo);
}else {
//封装成品油
PageCommonOrderInfo cpyPageCommonOrderInfo = new PageCommonOrderInfo();
//拼接自动按照明细行拆分所需要的数据
log.info("cpyOrderItems》》》》》》》》"+JSON.toJSONString(cpyOrderItems));
log.info("nocpyOrderItems》》》》》》》》"+JSON.toJSONString(nocpyOrderItems));
//成品油和非成品油混合
OrderInfo cpyOrderInfo = new OrderInfo();
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyOrderInfo);
cpyOrderInfo.setHjbhsje(cpyOrderItems.stream().map(m->new BigDecimal(m.getXmje())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
cpyOrderInfo.setHjse(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
cpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(1));
CommonOrderInfo cpyCommonOrderInfo = new CommonOrderInfo();
BeanUtils.copyProperties(commonOrderInfo,cpyCommonOrderInfo);
cpyCommonOrderInfo.setOrderItemInfo(cpyOrderItems);
cpyCommonOrderInfo.setOrderInfo(cpyOrderInfo);
commonOrderInfoList.add(cpyCommonOrderInfo);
OrderInfo nocpyOrderInfo = new OrderInfo();
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyOrderInfo);
nocpyOrderInfo.setHjbhsje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getXmje())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
nocpyOrderInfo.setHjse(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
nocpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(2));
CommonOrderInfo nocpyCommonOrderInfo = new CommonOrderInfo();
BeanUtils.copyProperties(commonOrderInfo,nocpyCommonOrderInfo);
nocpyCommonOrderInfo.setOrderItemInfo(nocpyOrderItems);
nocpyCommonOrderInfo.setOrderInfo(nocpyOrderInfo);
commonOrderInfoList.add(nocpyCommonOrderInfo);
PageOrderInfo cpyPageOrderInfo = new PageOrderInfo();
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo);
cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
List<PageOrderItemInfo> cpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
for (OrderItemInfo cpyOrderItem : cpyOrderItems) {
PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo();
BeanUtils.copyProperties(cpyOrderItem,cpyOrderItemInfo);
cpyOrderItemInfo.add(pageOrderItemInfo);
}
cpyPageCommonOrderInfo.setOrderInfo(cpyPageOrderInfo);
cpyPageCommonOrderInfo.setOrderItemInfo(cpyOrderItemInfo);
mixCommonOrderInfoList.add(cpyPageCommonOrderInfo);
//封装非成品油
PageCommonOrderInfo nocpyPageCommonOrderInfo = new PageCommonOrderInfo();
//成品油和非成品油混合
PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo();
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo);
nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
List<PageOrderItemInfo> nocpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) {
PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo();
BeanUtils.copyProperties(nocpyOrderItem,nocpyOrderItemInfo);
nocpyOrderItemInfo.add(pageOrderItemInfo);
}
nocpyPageCommonOrderInfo.setOrderInfo(nocpyPageOrderInfo);
nocpyPageCommonOrderInfo.setOrderItemInfo(nocpyOrderItemInfo);
mixCommonOrderInfoList.add(nocpyPageCommonOrderInfo);
}
if(cpyOrderItems.size()>ConfigureConstant.INT_8){
return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!");
}
// if(ConfigureConstant.STRING_Y.equals(cpy) && commonOrderInfo.getOrderItemInfo().size()>ConfigureConstant.INT_8){
// return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!");
// }
}
//如果是混开的 走明细拆分
if(!CollectionUtils.isEmpty(mixCommonOrderInfoList)){
try {
orderSplitService.saveOrderSplitOrder(mixCommonOrderInfoList);
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
}
}
//如果不是混开的 走原来的逻辑
if(CollectionUtils.isEmpty(commonOrderInfoList)){
return R.ok("生成预制发票成功,请到【发票处理中心】页面查看");
}
//客户冻结状态校验、确认智能赋码、单价误差校验
List<Map<String,String>> consumerList = new ArrayList<>();
List<Map<String,String>> confirmList = new ArrayList<>();
@ -294,17 +308,21 @@ public class InvoiceServiceImpl implements InvoiceService {
}
} else {
log.error("{}校验单价容差范围发生错误:在原结算单中未匹配到唯一明细,找到了{}条", LOGGER_MSG, collect.size());
R.error("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细");
// R.error("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细");
throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细");
}
});
});
}
if(consumerList.size()>0){
return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList);
// return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList);
throw new RuntimeException(String.format("以下结算单中%s客户的状态为“冻结”状态，不能进行开票。",consumerList));
}else if((StrUtil.isBlank(pageInvoiceReq.getConfirmZnfm()) || !ConfigureConstant.STRING_0.equals(pageInvoiceReq.getConfirmZnfm())) && confirmList.size()>0){
return R.error(ConfigureConstant.STRING_9002,"请将以下物料同步至公司库，再进行生成预制",confirmList);
// return R.error(ConfigureConstant.STRING_9002,"请确认以下物料税收分类编码是否准确",confirmList);
throw new RuntimeException(String.format("请将以下物料同步至公司库，再进行生成预制",confirmList));
}else if(djOverflowList.size() > 0){
return R.error(ConfigureConstant.STRING_9003, "以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList);
// return R.error(ConfigureConstant.STRING_9003, "以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList);
throw new RuntimeException(String.format("以下订单自动拆分时单价超过设定范围,请手动拆分",djOverflowList));
}else {
for (CommonOrderInfo f : commonOrderInfoList) {
TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(f.getOrderItemInfo().get(0).getSpbm());

Write Preview
Loading…
Cancel
Save