Merge branch 'dev' into test
# Conflicts: # mhd_finance/src/main/resources/bootstrap.yml
This commit is contained in:
赵辉
+31
@@ -6,6 +6,8 @@ import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
|
||||
import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService;
|
||||
import com.linke.finance.domain.reconciliation.entity.Reconciliation;
|
||||
@@ -196,6 +198,15 @@ public class ReconciliationApplicationService {
|
||||
.lambda().eq(ReconciliationAccount::getReconciliationId,reconciliationPO.getReconciliationId()).eq(ReconciliationAccount::getDelFlag,1));
|
||||
if(ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){
|
||||
reconciliationPO.setReconciliationAccountDTOList(reconciliationAccountList);
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
String jsonString = null;
|
||||
try {
|
||||
jsonString = objectMapper.writeValueAsString(reconciliationAccountList);
|
||||
reconciliationPO.setReconciliationAccountDTOListJsonStr(jsonString);
|
||||
} catch (JsonProcessingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -288,6 +299,16 @@ public class ReconciliationApplicationService {
|
||||
}
|
||||
});
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
|
||||
// 如果前端传递了创建时间，则使用该时间；否则使用当前时间
|
||||
Date specifiedCreateTime = reconciliationDO.getCreateTime();
|
||||
if (specifiedCreateTime != null) {
|
||||
reconciliationDO.setCreateTime(specifiedCreateTime);
|
||||
} else {
|
||||
// 没有指定创建时间时，使用当前时间
|
||||
reconciliationDO.setCreateTime(new Date());
|
||||
}
|
||||
|
||||
reconciliationDO = reconciliationDomainService.insert(reconciliationDO);
|
||||
if(reconciliationDO==null){
|
||||
throw new ServiceException("订单出账-生成应收账单失败！");
|
||||
@@ -760,4 +781,14 @@ public class ReconciliationApplicationService {
|
||||
{
|
||||
return reconciliationDomainService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据订单ID列表查询RECONCILIATION_ORDER_DETAIL表中这些订单创建最早的日期
|
||||
*
|
||||
* @param orderIds 订单ID列表
|
||||
* @return 最早创建日期
|
||||
*/
|
||||
public Date getEarliestCreateTimeByOrderIdList(List<String> orderIds) {
|
||||
return reconciliationDomainService.getEarliestCreateTimeByOrderIdList(orderIds);
|
||||
}
|
||||
}
|
||||
|
||||
+5
@@ -29,4 +29,9 @@ public interface ReconciliationMapper extends BaseMapper<Reconciliation>
|
||||
|
||||
Boolean delReconciliationByInnerNumber(@Param("innerNumber") String innerNumber);
|
||||
Boolean delReconciliationDetailByInnerNumber(@Param("reconciliationId") Long reconciliationId);
|
||||
|
||||
/**
|
||||
* 插入对账单并使用传入的createTime值
|
||||
*/
|
||||
void insertWithCreateTime(Reconciliation reconciliation);
|
||||
}
|
||||
|
||||
+111
-57
@@ -24,6 +24,9 @@ import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO;
|
||||
import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO;
|
||||
import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.mapper.ReconciliationAccountMapper;
|
||||
import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt;
|
||||
import com.linke.finance.domain.tmsReceipt.repository.facade.ITmsReceiptService;
|
||||
import com.linke.finance.domain.tmsReceipt.repository.mapper.TmsReceiptMapper;
|
||||
import com.mhd.common.core.domain.dto.ReconciliationDTO;
|
||||
import com.mhd.common.core.domain.dto.nc.*;
|
||||
import com.mhd.common.core.domain.entity.R;
|
||||
@@ -40,6 +43,8 @@ import com.mhd.common.core.web.domain.AjaxResult;
|
||||
import com.mhd.common.security.utils.SecurityUtils;
|
||||
import com.mhd.system.api.UserServiceFeign;
|
||||
import com.mhd.system.api.WlhyServiceFeign;
|
||||
import com.mhd.system.api.domain.TmsInvoiceList;
|
||||
import com.mhd.system.api.domain.TmsInvoiceListDetailsVO;
|
||||
import com.mhd.system.api.domain.TmsTransportNote;
|
||||
import com.mhd.system.api.model.LoginUser;
|
||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||
@@ -100,11 +105,14 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
private ApprovalDocumentDomainService approvalDocumentDomainService;
|
||||
@Autowired
|
||||
private ReconciliationAccountMapper reconciliationAccountMapper;
|
||||
|
||||
@Autowired
|
||||
private TmsReceiptMapper tmsReceiptMapper;
|
||||
//nc测试环境地址
|
||||
private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
||||
|
||||
//nc正式环境地址
|
||||
//private String url="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
||||
private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
||||
/**
|
||||
* 查询对账单列表
|
||||
*/
|
||||
@@ -121,7 +129,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
public ReconciliationDO insert(ReconciliationDO reconciliationDO) {
|
||||
Reconciliation reconciliation = new Reconciliation();
|
||||
BeanUtils.copyProperties(reconciliationDO,reconciliation);
|
||||
this.save(reconciliation);
|
||||
// 创建时间减去8小时
|
||||
reconciliation.setCreateTime(new Date(reconciliation.getCreateTime().getTime() - 8 * 60 * 60 * 1000));
|
||||
reconciliationMapper.insertWithCreateTime(reconciliation);
|
||||
reconciliationDO.setReconciliationId(reconciliation.getReconciliationId());
|
||||
return reconciliationDO;
|
||||
}
|
||||
@@ -410,11 +420,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
throw new ServiceException("该记录已同步，不需要再次同步");
|
||||
}
|
||||
|
||||
|
||||
/* if(reconciliation.getIsInvoice()!=2){
|
||||
throw new ServiceException("该记录还未开票，不允许同步");
|
||||
}*/
|
||||
|
||||
try {
|
||||
Date date = reconciliation.getCreateTime();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
@@ -426,12 +431,23 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
|
||||
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
|
||||
String makerCodeNc="";
|
||||
if(reconciliation.getOrganizationName().contains("南歧")){
|
||||
if(reconciliation.getOrganizationName().contains("南岐")){
|
||||
if(result.getCode()==200){
|
||||
String invoiceNumber="";
|
||||
R<TmsInvoiceListDetailsVO> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
|
||||
if(ajaxResult2.getCode()==200){
|
||||
TmsInvoiceListDetailsVO tmsInvoiceListDetailsVO= ajaxResult2.getData();
|
||||
if(ObjectUtil.isNotNull(tmsInvoiceListDetailsVO)) {
|
||||
invoiceNumber=tmsInvoiceListDetailsVO.getTmsMakeOutInvoices().get(0).getInvoiceNumber();
|
||||
}
|
||||
|
||||
}
|
||||
List<TmsOrder> list=result.getData();
|
||||
if(ObjectUtil.isNotNull(list)){
|
||||
for(TmsOrder tmsOrder:list){
|
||||
R<TmsTransportNote> ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber());
|
||||
date=tmsOrder.getDocumentDate();
|
||||
dateString = sdf.format(date);
|
||||
/* R<TmsTransportNote> ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber());
|
||||
if(ajaxResult1.getCode()==200){
|
||||
TmsTransportNote tmsTransportNote= ajaxResult1.getData();
|
||||
if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){
|
||||
@@ -443,7 +459,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}else{
|
||||
throw new ServiceException("运单还没签收， 先签收");
|
||||
}
|
||||
}
|
||||
}*/
|
||||
/* if(null==reconciliation.getSettlementPartyId()){
|
||||
throw new ServiceException("没有结算方，请核对");
|
||||
}*/
|
||||
@@ -480,7 +496,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
|
||||
item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
|
||||
item.setDef75("T10");
|
||||
item.setInvoiceno("");
|
||||
item.setInvoiceno(invoiceNumber);
|
||||
ysitemList.add(item);
|
||||
}
|
||||
Ysbodys bodys=new Ysbodys();
|
||||
@@ -489,7 +505,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
billhead.setPk_group("CNK");
|
||||
billhead.setPk_org("NG0401");
|
||||
billhead.setSett_org("NG0401");
|
||||
billhead.setCreationtime(dateString);
|
||||
billhead.setBilldate(dateString);
|
||||
billhead.setCreator(makerCodeNc);
|
||||
billhead.setPk_billtype("F0");
|
||||
billhead.setPk_tradetype("D0");
|
||||
@@ -497,7 +513,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
billhead.setIsinit("N");
|
||||
date=reconciliation.getCreateTime();
|
||||
dateString = sdf.format(date);
|
||||
billhead.setBilldate(dateString);
|
||||
billhead.setCreationtime(dateString);
|
||||
billhead.setSyscode("0");
|
||||
billhead.setBillno("");
|
||||
billhead.setDef59("");
|
||||
@@ -548,7 +564,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
|
||||
//reconciliationMapper.updateById(reconciliation);
|
||||
CloseableHttpClient httpClient = HttpClients.createDefault();
|
||||
HttpPost httpPost = new HttpPost(url);
|
||||
HttpPost httpPost = new HttpPost(zsurl);
|
||||
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
|
||||
httpPost.setEntity(postingString);
|
||||
httpPost.setHeader("Content-type", "application/xml");
|
||||
@@ -605,6 +621,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
}else if(reconciliation.getOrganizationName().contains("通宇")){
|
||||
if (reconciliation.getIsInvoice() != 2) {
|
||||
throw new ServiceException("该记录还未开票，不允许同步");
|
||||
}
|
||||
if(result.getCode()==200){
|
||||
List<TmsOrder> list=result.getData();
|
||||
if(ObjectUtil.isNotNull(list)){
|
||||
@@ -613,6 +632,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
String customerCodeNc=list.get(0).getCustomerCodeNc();
|
||||
String appointShipper=list.get(0).getAppointShipper();
|
||||
String settlementCurrency=list.get(0).getSettlementCurrency();
|
||||
makerCodeNc=list.get(0).getMakerCodeNc();
|
||||
String goodsNumber=list.get(0).getGoodsName();
|
||||
for(TmsOrder tmsOrder:list){
|
||||
R<TmsTransportNote> ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber());
|
||||
@@ -634,47 +654,59 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
String invoiceNumber=reconciliation.getApplyNumber();
|
||||
R<TmsInvoiceListDetailsVO> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
|
||||
if(ajaxResult2.getCode()==200){
|
||||
TmsInvoiceListDetailsVO tmsInvoiceListDetailsVO= ajaxResult2.getData();
|
||||
if(ObjectUtil.isNotNull(tmsInvoiceListDetailsVO)) {
|
||||
invoiceNumber=tmsInvoiceListDetailsVO.getTmsMakeOutInvoices().get(0).getInvoiceNumber();
|
||||
}
|
||||
|
||||
}
|
||||
List<ReconciliationAccount> reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper<ReconciliationAccount>().lambda()
|
||||
.eq(ReconciliationAccount::getReconciliationId,businessDocumentDetaliId)
|
||||
.eq(ReconciliationAccount::getDelFlag,0));
|
||||
.eq(ReconciliationAccount::getDelFlag,1));
|
||||
if (ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){
|
||||
for (ReconciliationAccount reconciliationAccount:reconciliationAccountList){
|
||||
Ysitem item=new Ysitem();
|
||||
item.setSo_deptid("NG0408");
|
||||
item.setPk_deptid("NG0408");
|
||||
item.setPk_psndoc(salesmanCodeNc);
|
||||
item.setCustomer(customerCodeNc);
|
||||
item.setObjtype("0");
|
||||
item.setDirection("1");
|
||||
item.setScomment("业务部：应收"+appointShipper+reconciliationAccount.getSubjectName()+reconciliation.getApplyNumber());
|
||||
// item.setPk_currtype("CNY");
|
||||
item.setPk_currtype(settlementCurrency);
|
||||
item.setPurchaseorder("");
|
||||
item.setTaxrate("0");
|
||||
item.setQuantity_de("0");
|
||||
item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
|
||||
item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
|
||||
if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
|
||||
BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
||||
item.setNotax_de(String.valueOf(notax_de));
|
||||
item.setLocal_tax_de(String.valueOf(notax_de));
|
||||
item.setTax_de(String.valueOf(tax_de));
|
||||
}else{
|
||||
BigDecimal tax_de=BigDecimal.ZERO;
|
||||
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
||||
item.setNotax_de(String.valueOf(notax_de));
|
||||
item.setLocal_tax_de(String.valueOf(notax_de));
|
||||
item.setTax_de(String.valueOf(tax_de));
|
||||
if(reconciliationAccount.getAmount().compareTo(BigDecimal.ZERO)>0){
|
||||
Ysitem item=new Ysitem();
|
||||
item.setSo_deptid("NG0408");
|
||||
item.setPk_deptid("NG0408");
|
||||
item.setPk_psndoc(salesmanCodeNc);
|
||||
item.setCustomer(customerCodeNc);
|
||||
item.setObjtype("0");
|
||||
item.setDirection("1");
|
||||
item.setScomment("业务部：应收"+appointShipper+reconciliationAccount.getSubjectName()+invoiceNumber);
|
||||
// item.setPk_currtype("CNY");
|
||||
item.setPk_currtype(settlementCurrency);
|
||||
item.setPurchaseorder("");
|
||||
item.setTaxrate("0");
|
||||
item.setQuantity_de("0");
|
||||
item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
|
||||
item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
|
||||
if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
|
||||
BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
||||
item.setNotax_de(String.valueOf(notax_de));
|
||||
item.setLocal_tax_de(String.valueOf(notax_de));
|
||||
item.setTax_de(String.valueOf(tax_de));
|
||||
}else{
|
||||
BigDecimal tax_de=BigDecimal.ZERO;
|
||||
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
||||
item.setNotax_de(String.valueOf(notax_de));
|
||||
item.setLocal_tax_de(String.valueOf(notax_de));
|
||||
item.setTax_de(String.valueOf(tax_de));
|
||||
}
|
||||
item.setPrice(String.valueOf(reconciliationAccount.getAmount()));
|
||||
item.setTaxprice(String.valueOf(reconciliationAccount.getAmount()));
|
||||
item.setDef75("T10");
|
||||
item.setInvoiceno(invoiceNumber);
|
||||
ysitemList.add(item);
|
||||
}
|
||||
|
||||
item.setPrice(String.valueOf(reconciliationAccount.getAmount()));
|
||||
item.setTaxprice(String.valueOf(reconciliationAccount.getAmount()));
|
||||
item.setDef75("T10");
|
||||
item.setInvoiceno("");
|
||||
ysitemList.add(item);
|
||||
}
|
||||
}else{
|
||||
throw new ServiceException("未查询到账单的费用科目信息， 请核对");
|
||||
}
|
||||
|
||||
Ysbodys bodys=new Ysbodys();
|
||||
@@ -694,7 +726,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
billhead.setBilldate(dateString);
|
||||
billhead.setSyscode("0");
|
||||
billhead.setBillno("");
|
||||
billhead.setDef59("");
|
||||
billhead.setDef59(list.get(0).getContractNo());
|
||||
billhead.setSrc_syscode("0");
|
||||
billhead.setBillstatus("0");
|
||||
billhead.setBillmaker(makerCodeNc);
|
||||
@@ -799,6 +831,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} catch (JAXBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -836,7 +870,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
throw new ServiceException("没有结算方，请核对");
|
||||
}*/
|
||||
String makerCodeNc="";
|
||||
if(reconciliation.getOrganizationName().contains("南歧")){
|
||||
if(reconciliation.getOrganizationName().contains("南岐")){
|
||||
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
|
||||
if(result.getCode()==200){
|
||||
List<TmsOrder> list=result.getData();
|
||||
@@ -937,7 +971,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliation.setSkNcId("sk"+String.valueOf(reconciliation.getReconciliationId()));
|
||||
//reconciliationMapper.updateById(reconciliation);
|
||||
CloseableHttpClient httpClient = HttpClients.createDefault();
|
||||
HttpPost httpPost = new HttpPost(url);
|
||||
HttpPost httpPost = new HttpPost(zsurl);
|
||||
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
|
||||
httpPost.setEntity(postingString);
|
||||
httpPost.setHeader("Content-type", "application/xml");
|
||||
@@ -996,10 +1030,30 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if(result.getCode()==200){
|
||||
List<TmsOrder> list=result.getData();
|
||||
if(ObjectUtil.isNotNull(list)){
|
||||
for(TmsOrder tmsOrder:list){
|
||||
String salesmanCodeNc=list.get(0).getSalesmanCodeNc();
|
||||
String customerCodeNc=list.get(0).getCustomerCodeNc();
|
||||
String appointShipper=list.get(0).getAppointShipper();
|
||||
String settlementCurrency=list.get(0).getSettlementCurrency();
|
||||
makerCodeNc="luoyx";
|
||||
SKitem item=new SKitem();
|
||||
item.setSo_deptid("NG0408");
|
||||
item.setPk_deptid("NG0408");
|
||||
item.setCheckdirection("ar");
|
||||
item.setPk_psndoc(salesmanCodeNc);
|
||||
item.setCustomer(customerCodeNc);
|
||||
item.setPurchaseorder("");
|
||||
item.setObjtype("0");
|
||||
item.setDirection("1");
|
||||
item.setScomment("业务部："+appointShipper+"物流费");
|
||||
item.setPk_currtype(settlementCurrency);
|
||||
item.setMoney_cr(String.valueOf(reconciliation.getCollectionAmount()));
|
||||
item.setMoney_bal(String.valueOf(reconciliation.getCollectionAmount()));
|
||||
ysitemList.add(item);
|
||||
|
||||
/* for(TmsOrder tmsOrder:list){
|
||||
|
||||
makerCodeNc=tmsOrder.getMakerCodeNc();
|
||||
makerCodeNc="luoyx";
|
||||
|
||||
SKitem item=new SKitem();
|
||||
item.setSo_deptid("NG0408");
|
||||
item.setPk_deptid("NG0408");
|
||||
@@ -1009,12 +1063,12 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
item.setPurchaseorder(tmsOrder.getGoodsNumber());
|
||||
item.setObjtype("0");
|
||||
item.setDirection("1");
|
||||
item.setScomment(tmsOrder.getAppointShipper());
|
||||
item.setScomment("业务部："+tmsOrder.getAppointShipper()+"物流费");
|
||||
item.setPk_currtype(tmsOrder.getSettlementCurrency());
|
||||
item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight()));
|
||||
item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight()));
|
||||
ysitemList.add(item);
|
||||
/* AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId()));
|
||||
*//* AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId()));
|
||||
if(ajaxResult.get("code").toString().equals("200")){
|
||||
Object userShipperPo= ajaxResult.get("data");
|
||||
JSONObject jsonObject = new JSONObject((Map) userShipperPo);
|
||||
@@ -1023,9 +1077,10 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
|
||||
|
||||
}*//*
|
||||
|
||||
}*/
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
SKbodys bodys=new SKbodys();
|
||||
@@ -1147,7 +1202,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (JAXBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
+4
@@ -246,4 +246,8 @@ public class ReconciliationPO extends BaseVOEntity{
|
||||
|
||||
@ApiModelProperty(value = "账单科目明细")
|
||||
public List<ReconciliationAccount> reconciliationAccountDTOList;
|
||||
|
||||
@ApiModelProperty("账单科目明细")
|
||||
private String reconciliationAccountDTOListJsonStr;
|
||||
|
||||
}
|
||||
|
||||
+5
@@ -30,6 +30,11 @@ import java.util.List;
|
||||
public class ReconciliationDO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
@ApiModelProperty("对账单表id")
|
||||
private Long reconciliationId;
|
||||
|
||||
|
||||
+21
@@ -172,5 +172,26 @@ public class ReconciliationDomainService {
|
||||
return reconciliationService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据订单ID列表查询RECONCILIATION_ORDER_DETAIL表中这些订单创建最早的日期
|
||||
*
|
||||
* @param orderIds 订单ID列表
|
||||
* @return 最早创建日期
|
||||
*/
|
||||
public Date getEarliestCreateTimeByOrderIdList(List<String> orderIds) {
|
||||
if (orderIds == null || orderIds.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
LambdaQueryWrapper<ReconciliationOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.in(ReconciliationOrderDetail::getTmsOrderId, orderIds);
|
||||
queryWrapper.eq(ReconciliationOrderDetail::getDelFlag, 1);
|
||||
queryWrapper.orderByAsc(ReconciliationOrderDetail::getCreateTime);
|
||||
List<ReconciliationOrderDetail> list = reconciliationOrderDetailService.list(queryWrapper);
|
||||
if (list != null && !list.isEmpty()) {
|
||||
return list.get(0).getCreateTime();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+14
@@ -310,4 +310,18 @@ public class ReconciliationApi extends BaseController{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据订单ID列表查询RECONCILIATION_ORDER_DETAIL表中这些订单创建最早的日期
|
||||
*
|
||||
* @param orderIds 订单ID列表
|
||||
* @return 最早创建日期
|
||||
*/
|
||||
@ApiOperation("根据订单ID列表查询RECONCILIATION_ORDER_DETAIL表中这些订单创建最早的日期")
|
||||
@PostMapping("/getEarliestCreateTimeByOrderIds")
|
||||
public AjaxResult getEarliestCreateTimeByOrderIds(@RequestBody List<String> orderIds)
|
||||
{
|
||||
Date earliestDate = reconciliationApplicationService.getEarliestCreateTimeByOrderIdList(orderIds);
|
||||
return AjaxResult.success(earliestDate);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -133,11 +133,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<select id="getFeeList" parameterType="java.lang.String" resultType="java.util.Map">
|
||||
SELECT
|
||||
SUBJECT_NAME,AMOUNT,RATE
|
||||
SUBJECT_NAME,max(AMOUNT) as AMOUNT
|
||||
FROM
|
||||
RECONCILIATION r left join RECONCILIATION_ACCOUNT acc on acc.RECONCILIATION_ID = r.RECONCILIATION_ID left join NGWL_TEST_WLHY.TMS_INVOICE_LIST tms on r.APPLY_NUMBER = tms.APPLY_NUMBER
|
||||
WHERE
|
||||
tms.ID = #{invoiceId}
|
||||
WHERE AMOUNT != 0 and tms.ID = #{invoiceId} group by SUBJECT_NAME
|
||||
</select>
|
||||
|
||||
<select id="queryInvoiceList" resultType="com.linke.finance.domain.businessDocument.repository.po.BusinessDocumentPO" parameterType="com.linke.finance.domain.businessDocument.repository.todo.BusinessDocumentDO">
|
||||
|
||||
@@ -207,4 +207,137 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<update id="delReconciliationDetailByInnerNumber">
|
||||
update reconciliation_order_detail set del_flag = 2 where reconciliation_id = #{reconciliationId}
|
||||
</update>
|
||||
|
||||
<!-- 自定义插入语句，确保传入的createTime被使用 -->
|
||||
<insert id="insertWithCreateTime" parameterType="com.linke.finance.domain.reconciliation.entity.Reconciliation" useGeneratedKeys="true" keyProperty="reconciliationId">
|
||||
INSERT INTO reconciliation (
|
||||
verification_money,
|
||||
settlement_count,
|
||||
party_name,
|
||||
settlement_party_id,
|
||||
payer_type,
|
||||
bill_remark,
|
||||
settlement_remark,
|
||||
order_shipping_type,
|
||||
department_name,
|
||||
user_id,
|
||||
shipper_name,
|
||||
waybill_source,
|
||||
waybill_source_name,
|
||||
reconciliation_start,
|
||||
reconciliation_end,
|
||||
bill_name,
|
||||
collection_amount,
|
||||
change_amount,
|
||||
other_amount,
|
||||
receivable,
|
||||
actual_receivable,
|
||||
uncollected_receivable,
|
||||
collection_state,
|
||||
audit_state,
|
||||
create_time,
|
||||
create_by,
|
||||
create_by_name,
|
||||
update_time,
|
||||
update_by,
|
||||
update_by_name,
|
||||
del_flag,
|
||||
organization_id,
|
||||
organization_name,
|
||||
top_organization_id,
|
||||
auditor,
|
||||
auditor_name,
|
||||
auth_time,
|
||||
inner_number,
|
||||
remark,
|
||||
auth_remark,
|
||||
auth_file,
|
||||
waybill_verify_flag,
|
||||
waybill_verify_time,
|
||||
invoice_cost_has,
|
||||
invoice_apply_status,
|
||||
invoice_info_id,
|
||||
audit_number,
|
||||
audit_status,
|
||||
audit_type,
|
||||
audit_remark,
|
||||
instance_id,
|
||||
approval_status,
|
||||
approval_result,
|
||||
is_invoice,
|
||||
invoice_id,
|
||||
invoice_make_time,
|
||||
apply_number,
|
||||
synchronous_status,
|
||||
synchronous_time,
|
||||
nc_id,
|
||||
sk_synchronous_status,
|
||||
sk_synchronous_time,
|
||||
sk_nc_id
|
||||
) VALUES (
|
||||
#{verificationMoney},
|
||||
#{settlementCount},
|
||||
#{partyName},
|
||||
#{settlementPartyId},
|
||||
#{payerType},
|
||||
#{billRemark},
|
||||
#{settlementRemark},
|
||||
#{orderShippingType},
|
||||
#{departmentName},
|
||||
#{userId},
|
||||
#{shipperName},
|
||||
#{waybillSource},
|
||||
#{waybillSourceName},
|
||||
#{reconciliationStart},
|
||||
#{reconciliationEnd},
|
||||
#{billName},
|
||||
#{collectionAmount},
|
||||
#{changeAmount},
|
||||
#{otherAmount},
|
||||
#{receivable},
|
||||
#{actualReceivable},
|
||||
#{uncollectedReceivable},
|
||||
#{collectionState},
|
||||
#{auditState},
|
||||
#{createTime},
|
||||
#{createBy},
|
||||
#{createByName},
|
||||
#{updateTime},
|
||||
#{updateBy},
|
||||
#{updateByName},
|
||||
#{delFlag},
|
||||
#{organizationId},
|
||||
#{organizationName},
|
||||
#{topOrganizationId},
|
||||
#{auditor},
|
||||
#{auditorName},
|
||||
#{authTime},
|
||||
#{innerNumber},
|
||||
#{remark},
|
||||
#{authRemark},
|
||||
#{authFile},
|
||||
#{waybillVerifyFlag},
|
||||
#{waybillVerifyTime},
|
||||
#{invoiceCostHas},
|
||||
#{invoiceApplyStatus},
|
||||
#{invoiceInfoId},
|
||||
#{auditNumber},
|
||||
#{auditStatus},
|
||||
#{auditType},
|
||||
#{auditRemark},
|
||||
#{instanceId},
|
||||
#{approvalStatus},
|
||||
#{approvalResult},
|
||||
#{isInvoice},
|
||||
#{invoiceId},
|
||||
#{invoiceMakeTime},
|
||||
#{applyNumber},
|
||||
#{synchronousStatus},
|
||||
#{synchronousTime},
|
||||
#{ncId},
|
||||
#{skSynchronousStatus},
|
||||
#{skSynchronousTime},
|
||||
#{skNcId}
|
||||
)
|
||||
</insert>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user