|
|
|
@ -654,8 +654,17 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder |
|
|
|
|
orderProcessInfo.setOriginDdh(orderInfo.getDdh()); |
|
|
|
|
if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getYfpHm())){ |
|
|
|
|
OrderInvoiceInfo orderInvoiceInfoY = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(commonOrderInfo.getOrderInfo().getYfpDm(), commonOrderInfo.getOrderInfo().getYfpHm(), null); |
|
|
|
|
//判断不在系统开的发票
|
|
|
|
|
if(orderInvoiceInfoY != null && StringUtils.isNotBlank(orderInvoiceInfoY.getOrderProcessInfoId())){ |
|
|
|
|
OrderProcessInfo orderProcessInfoY = orderProcessInfoMapper.selectOrderProcessInfoByProcessId(orderInvoiceInfoY.getOrderProcessInfoId(), null); |
|
|
|
|
orderProcessInfo.setGsdm(orderProcessInfoY.getGsdm()); |
|
|
|
|
}else { |
|
|
|
|
DeptEntity department = userInfoService.getDepartment(); |
|
|
|
|
if(department != null && StringUtils.isNotBlank(department.getEnterpriseNumbers())){ |
|
|
|
|
String numbers = department.getEnterpriseNumbers(); |
|
|
|
|
orderProcessInfo.setGsdm(numbers); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(StrUtil.isBlank(orderProcessInfo.getGsdm())){ |
|
|
|
|
orderProcessInfo.setGsdm(orderInfo.getGsdm()); |
|
|
|
|