weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nc上传添加字段传值

Browse Source
This commit is contained in:
hjx
2025-12-13 17:26:17 +08:00
parent 8affee1409
commit 3447d2f7bc
2 changed files with 94 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java
+18
View File
@@ -522,4 +522,22 @@ public class TmsOrder implements Serializable {
@ApiModelProperty(value = "付款方名称") @ApiModelProperty(value = "付款方名称")
private String payer; private String payer;
@ApiModelProperty("客户编码nc")
private String customsCodeNc;
@ApiModelProperty("制单人编码nc")
private String makerCodeNc;
@ApiModelProperty("业务员编码nc")
private String salesmanCodeNc;
@ApiModelProperty("税率")
private BigDecimal taxRate;
@ApiModelProperty("结算币种")
private String settlementCurrency;
@ApiModelProperty("合同编号")
private String contractNo;
} }
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+61 -45
View File
@@ -404,12 +404,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
}else{ }else{
throw new ServiceException("查询当前登录人用户信息失败"); throw new ServiceException("查询当前登录人用户信息失败");
} }
if (org.apache.commons.lang.StringUtils.isBlank(userPo.getSalespersonNcCode())) {
throw new ServiceException("请先维护业务员编码");
}
if (org.apache.commons.lang.StringUtils.isBlank(userPo.getDocumentPreparerNcCode())) {
throw new ServiceException("请先维护制单员编码");
}
for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){ for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){
Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId); Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
if(reconciliation.getSynchronousStatus()==1){ if(reconciliation.getSynchronousStatus()==1){
@@ -431,6 +425,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
String makerCodeNc="";
if(result.getCode()==200){ if(result.getCode()==200){
List<TmsOrder> list=result.getData(); List<TmsOrder> list=result.getData();
if(ObjectUtil.isNotNull(list)){ if(ObjectUtil.isNotNull(list)){
@@ -448,28 +443,32 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
if(null==reconciliation.getSettlementPartyId()){ if(null==reconciliation.getSettlementPartyId()){
throw new ServiceException("没有结算方，请核对"); throw new ServiceException("没有结算方，请核对");
} }
AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
if(ajaxResult.get("code").toString().equals("200")){ throw new ServiceException("请先维护业务员编码");
Object userShipperPo= ajaxResult.get("data");
JSONObject jsonObject = new JSONObject((Map) userShipperPo);
if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){
throw new ServiceException("请先维护客户编码");
} }
if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) {
throw new ServiceException("请先维护制单员编码");
}
if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) {
throw new ServiceException("请先维护制单员编码");
}
makerCodeNc=tmsOrder.getMakerCodeNc();
Ysitem item=new Ysitem(); Ysitem item=new Ysitem();
item.setSo_deptid("NG040104"); item.setSo_deptid("NG040104");
item.setPk_deptid("NG040104"); item.setPk_deptid("NG040104");
item.setPk_psndoc(userPo.getSalespersonNcCode()); item.setPk_psndoc(tmsOrder.getSalesmanCodeNc());
item.setCustomer(jsonObject.get("customerNcCode").toString()); item.setCustomer(tmsOrder.getCustomsCodeNc());
item.setObjtype("0"); item.setObjtype("0");
item.setDirection("1"); item.setDirection("1");
item.setScomment(jsonObject.get("shipperEnterpriseName").toString()); item.setScomment(tmsOrder.getAppointShipper());
item.setPk_currtype("CNY"); // item.setPk_currtype("CNY");
item.setPk_currtype(tmsOrder.getSettlementCurrency());
item.setPurchaseorder(tmsOrder.getGoodsNumber()); item.setPurchaseorder(tmsOrder.getGoodsNumber());
item.setTaxrate("0"); item.setTaxrate("0");
item.setQuantity_de("0"); item.setQuantity_de("0");
item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight())); item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight())); item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(BigDecimal.valueOf(0.09)).setScale(2,BigDecimal.ROUND_HALF_UP); BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate()).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de); BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
item.setNotax_de(String.valueOf(notax_de)); item.setNotax_de(String.valueOf(notax_de));
item.setLocal_tax_de(String.valueOf(notax_de)); item.setLocal_tax_de(String.valueOf(notax_de));
@@ -479,8 +478,16 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
item.setDef75("T10"); item.setDef75("T10");
item.setInvoiceno(""); item.setInvoiceno("");
ysitemList.add(item); ysitemList.add(item);
/* 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);
if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){
throw new ServiceException("请先维护客户编码");
} }
}*/
} }
} }
} }
@@ -491,7 +498,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
billhead.setPk_org("NG0401"); billhead.setPk_org("NG0401");
billhead.setSett_org("NG0401"); billhead.setSett_org("NG0401");
billhead.setCreationtime(dateString); billhead.setCreationtime(dateString);
billhead.setCreator(userPo.getDocumentPreparerNcCode()); billhead.setCreator(makerCodeNc);
billhead.setPk_billtype("F0"); billhead.setPk_billtype("F0");
billhead.setPk_tradetype("D0"); billhead.setPk_tradetype("D0");
billhead.setBillclass("ys"); billhead.setBillclass("ys");
@@ -504,7 +511,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
billhead.setDef59(""); billhead.setDef59("");
billhead.setSrc_syscode("0"); billhead.setSrc_syscode("0");
billhead.setBillstatus("0"); billhead.setBillstatus("0");
billhead.setBillmaker(userPo.getDocumentPreparerNcCode()); billhead.setBillmaker(makerCodeNc);
billhead.setPk_busitype(""); billhead.setPk_busitype("");
billhead.setBillyear(sdf1.format(date)); billhead.setBillyear(sdf1.format(date));
billhead.setBillperiod(sdf2.format(date)); billhead.setBillperiod(sdf2.format(date));
@@ -613,12 +620,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
if(reconciliation.getCollectionState()!=2){ if(reconciliation.getCollectionState()!=2){
throw new ServiceException("该记录还未结算完成，不允许同步"); throw new ServiceException("该记录还未结算完成，不允许同步");
} }
/* if(org.apache.commons.lang.StringUtils.isBlank(userPo.getSalespersonNcCode())){
throw new ServiceException("请先维护业务员编码");
}
if(org.apache.commons.lang.StringUtils.isBlank(userPo.getDocumentPreparerNcCode())){
throw new ServiceException("请先维护制单员编码");
}*/
try { try {
Date date = reconciliation.getCreateTime(); Date date = reconciliation.getCreateTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -628,36 +630,50 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
List<SKitem> ysitemList=new ArrayList<SKitem>(); List<SKitem> ysitemList=new ArrayList<SKitem>();
ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
if(null==reconciliation.getSettlementPartyId()){
throw new ServiceException("没有结算方，请核对");
}
String makerCodeNc="";
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
if(result.getCode()==200){ if(result.getCode()==200){
List<TmsOrder> list=result.getData(); List<TmsOrder> list=result.getData();
if(ObjectUtil.isNotNull(list)){ if(ObjectUtil.isNotNull(list)){
for(TmsOrder tmsOrder:list){ for(TmsOrder tmsOrder:list){
if(null==reconciliation.getSettlementPartyId()){ if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
throw new ServiceException("没有结算方，请核对"); throw new ServiceException("请先维护业务员编码");
} }
AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) {
throw new ServiceException("请先维护制单员编码");
}
if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) {
throw new ServiceException("请先维护制单员编码");
}
SKitem item=new SKitem();
item.setSo_deptid("NG040104");
item.setPk_deptid("NG040104");
item.setCheckdirection("ar");
item.setPk_psndoc(tmsOrder.getSalesmanCodeNc());
item.setCustomer(tmsOrder.getCustomsCodeNc());
item.setPurchaseorder(tmsOrder.getGoodsNumber());
item.setObjtype("0");
item.setDirection("1");
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()));
if(ajaxResult.get("code").toString().equals("200")){ if(ajaxResult.get("code").toString().equals("200")){
Object userShipperPo= ajaxResult.get("data"); Object userShipperPo= ajaxResult.get("data");
JSONObject jsonObject = new JSONObject((Map) userShipperPo); JSONObject jsonObject = new JSONObject((Map) userShipperPo);
if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){ if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){
throw new ServiceException("请先维护客户编码"); throw new ServiceException("请先维护客户编码");
} }
SKitem item=new SKitem();
item.setSo_deptid("NG040104");
item.setPk_deptid("NG040104"); }*/
item.setCheckdirection("ar");
item.setPk_psndoc(userPo.getSalespersonNcCode());
item.setCustomer(jsonObject.get("customerNcCode").toString());
item.setPurchaseorder(tmsOrder.getGoodsNumber());
item.setObjtype("0");
item.setDirection("1");
item.setScomment(jsonObject.get("shipperEnterpriseName").toString());
item.setPk_currtype("CNY");
item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight()));
item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight()));
ysitemList.add(item);
}
} }
} }
@@ -670,7 +686,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
billhead.setSett_org("NG0401"); billhead.setSett_org("NG0401");
billhead.setCreationtime(dateString); billhead.setCreationtime(dateString);
billhead.setPk_billtype("F2"); billhead.setPk_billtype("F2");
billhead.setCreator(userPo.getDocumentPreparerNcCode()); billhead.setCreator(makerCodeNc);
billhead.setPk_tradetype("D2"); billhead.setPk_tradetype("D2");
billhead.setBillclass("sk"); billhead.setBillclass("sk");
billhead.setBilldate(dateString); billhead.setBilldate(dateString);
@@ -679,7 +695,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
billhead.setDef59(""); billhead.setDef59("");
billhead.setSrc_syscode("0"); billhead.setSrc_syscode("0");
billhead.setBillstatus("0"); billhead.setBillstatus("0");
billhead.setBillmaker(userPo.getDocumentPreparerNcCode()); billhead.setBillmaker(makerCodeNc);
billhead.setPk_busitype(""); billhead.setPk_busitype("");
billhead.setBillyear(sdf1.format(date)); billhead.setBillyear(sdf1.format(date));
billhead.setBillperiod(sdf2.format(date)); billhead.setBillperiod(sdf2.format(date));