diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java index c16c27698..f2de315c7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSitePrepaidRechargeServiceImpl.java @@ -146,12 +146,15 @@ public class EmisSitePrepaidRechargeServiceImpl extends EmisBaseService implemen emisSiteSettleRecord.setChangeDate(new Date()); emisSiteSettleRecord.setSiteCode(emisSitePrepaidRecharge.getRechargeSiteCode()); + + EmisSite emisSite = getSiteByCode(emisSitePrepaidRecharge.getRechargeSiteCode()); + emisSiteSettleRecord.setCenterCode(emisSite.getParentSiteCode()); + emisSiteSettleRecord.setDataFrom("pc"); emisSiteSettleRecord.setOperataDate(new Date()); emisSiteSettleRecord.setFinanceDate(new Date()); emisSiteSettleRecord.setBlCenter("1"); - emisSiteSettleRecord.setCenterCode(getCurrentUser().getOwnerSiteCode()); - emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode()); +// emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode()); emisSiteSettleRecord.setBlChargeFee("1"); addSiteSettleRecord(emisSiteSettleRecord); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 61e58dba0..bf3110f23 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -831,8 +831,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisSiteSettleRecord.setOperataDate(new Date()); emisSiteSettleRecord.setFinanceDate(new Date()); emisSiteSettleRecord.setBlCenter("1"); - emisSiteSettleRecord.setCenterCode(getCurrentUser().getOwnerSiteCode()); - emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode()); + emisSiteSettleRecord.setCenterCode(emisWaybillSave.getSendCenterCode()); +// emisSiteSettleRecord.setCenterManCode(getCurrentUser().getEmpCode()); emisSiteSettleRecord.setBlChargeFee("1");