diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java
index c8bcfc4e1..a9f7009b7 100644
--- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java
+++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java
@@ -522,4 +522,22 @@ public class TmsOrder implements Serializable {
 
     @ApiModelProperty(value = "付款方名称")
     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;
 }
diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
index c42df3c88..ab85f2826 100644
--- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
@@ -404,12 +404,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
         }else{
             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){
             Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
             if(reconciliation.getSynchronousStatus()==1){
@@ -431,6 +425,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 ReconciliationDTO  reconciliationDTO=new ReconciliationDTO();
                 reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
                 R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
+                String makerCodeNc="";
                 if(result.getCode()==200){
                     List<TmsOrder> list=result.getData();
                     if(ObjectUtil.isNotNull(list)){
@@ -448,38 +443,50 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             if(null==reconciliation.getSettlementPartyId()){
                                 throw new ServiceException("没有结算方，请核对");
                             }
-                            AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId()));
+                            if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
+                                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();
+                            item.setSo_deptid("NG040104");
+                            item.setPk_deptid("NG040104");
+                            item.setPk_psndoc(tmsOrder.getSalesmanCodeNc());
+                            item.setCustomer(tmsOrder.getCustomsCodeNc());
+                            item.setObjtype("0");
+                            item.setDirection("1");
+                            item.setScomment(tmsOrder.getAppointShipper());
+                           // item.setPk_currtype("CNY");
+                            item.setPk_currtype(tmsOrder.getSettlementCurrency());
+                            item.setPurchaseorder(tmsOrder.getGoodsNumber());
+                            item.setTaxrate("0");
+                            item.setQuantity_de("0");
+                            item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
+                            item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
+                            BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate()).setScale(2,BigDecimal.ROUND_HALF_UP);
+                            BigDecimal notax_de=tmsOrder.getDeliveryFreight().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(tmsOrder.getDeliveryFreight()));
+                            item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
+                            item.setDef75("T10");
+                            item.setInvoiceno("");
+                            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("请先维护客户编码");
                                 }
-                                Ysitem item=new Ysitem();
-                                item.setSo_deptid("NG040104");
-                                item.setPk_deptid("NG040104");
-                                item.setPk_psndoc(userPo.getSalespersonNcCode());
-                                item.setCustomer(jsonObject.get("customerNcCode").toString());
-                                item.setObjtype("0");
-                                item.setDirection("1");
-                                item.setScomment(jsonObject.get("shipperEnterpriseName").toString());
-                                item.setPk_currtype("CNY");
-                                item.setPurchaseorder(tmsOrder.getGoodsNumber());
-                                item.setTaxrate("0");
-                                item.setQuantity_de("0");
-                                item.setMoney_de(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 notax_de=tmsOrder.getDeliveryFreight().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(tmsOrder.getDeliveryFreight()));
-                                item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
-                                item.setDef75("T10");
-                                item.setInvoiceno("");
-                                ysitemList.add(item);
-                            }
+
+                            }*/
 
                         }
                     }
@@ -491,7 +498,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 billhead.setPk_org("NG0401");
                 billhead.setSett_org("NG0401");
                 billhead.setCreationtime(dateString);
-                billhead.setCreator(userPo.getDocumentPreparerNcCode());
+                billhead.setCreator(makerCodeNc);
                 billhead.setPk_billtype("F0");
                 billhead.setPk_tradetype("D0");
                 billhead.setBillclass("ys");
@@ -504,7 +511,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 billhead.setDef59("");
                 billhead.setSrc_syscode("0");
                 billhead.setBillstatus("0");
-                billhead.setBillmaker(userPo.getDocumentPreparerNcCode());
+                billhead.setBillmaker(makerCodeNc);
                 billhead.setPk_busitype("");
                 billhead.setBillyear(sdf1.format(date));
                 billhead.setBillperiod(sdf2.format(date));
@@ -613,12 +620,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
             if(reconciliation.getCollectionState()!=2){
                 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 {
                 Date date = reconciliation.getCreateTime();
                 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>();
                 ReconciliationDTO  reconciliationDTO=new ReconciliationDTO();
                 reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
+                if(null==reconciliation.getSettlementPartyId()){
+                    throw new ServiceException("没有结算方，请核对");
+                }
+                String makerCodeNc="";
                 R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
                 if(result.getCode()==200){
                     List<TmsOrder> list=result.getData();
                     if(ObjectUtil.isNotNull(list)){
                         for(TmsOrder tmsOrder:list){
-                            if(null==reconciliation.getSettlementPartyId()){
-                                throw new ServiceException("没有结算方，请核对");
+                            if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
+                                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")){
                                 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("请先维护客户编码");
                                 }
-                                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.setCreationtime(dateString);
                 billhead.setPk_billtype("F2");
-                billhead.setCreator(userPo.getDocumentPreparerNcCode());
+                billhead.setCreator(makerCodeNc);
                 billhead.setPk_tradetype("D2");
                 billhead.setBillclass("sk");
                 billhead.setBilldate(dateString);
@@ -679,7 +695,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 billhead.setDef59("");
                 billhead.setSrc_syscode("0");
                 billhead.setBillstatus("0");
-                billhead.setBillmaker(userPo.getDocumentPreparerNcCode());
+                billhead.setBillmaker(makerCodeNc);
                 billhead.setPk_busitype("");
                 billhead.setBillyear(sdf1.format(date));
                 billhead.setBillperiod(sdf2.format(date));