From c46336069d7b2e4e1b5e6891237a00240c337898 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 10 Jul 2024 06:51:17 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleSubBillController.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index f4f2e9f08..fe7f4d80b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -196,7 +196,8 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmCenterManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmCenterCode(getLoginUser().getUser().getOwnerSiteCode()); emisSettleSubBill.setId(id); emisBaseService.confirmBillByCenter(emisSettleSubBill); @@ -228,8 +229,9 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmNote(spr.getConfirmNote()); + emisSettleSubBill.setConfirmCenterManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmCenterCode(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmCenterNote(spr.getConfirmCenterNote()); emisSettleSubBill.setId(id); emisBaseService.cancelConfirmBillByCenter(emisSettleSubBill); @@ -261,9 +263,9 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode()); - emisSettleSubBill.setConfirmNote(spr.getConfirmNote()); + emisSettleSubBill.setConfirmCenterManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmCenterCode(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmCenterNote(spr.getConfirmCenterNote()); emisSettleSubBill.setId(id); emisBaseService.confirmNoBillByCenter(emisSettleSubBill); @@ -295,9 +297,9 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode()); - emisSettleSubBill.setConfirmNote(spr.getConfirmNote()); + emisSettleSubBill.setConfirmCenterManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmCenterCode(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmCenterNote(spr.getConfirmCenterNote()); emisSettleSubBill.setId(id); emisBaseService.setBillErrorByCenter(emisSettleSubBill); @@ -331,8 +333,8 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode()); emisSettleSubBill.setId(id); emisBaseService.confirmBillBySite(emisSettleSubBill); @@ -366,9 +368,9 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode()); - emisSettleSubBill.setSiteConfirmNote(spr.getSiteConfirmNote()); + emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmSiteNote(spr.getConfirmSiteNote()); emisSettleSubBill.setId(id); emisBaseService.cancelConfirmBillBySite(emisSettleSubBill); @@ -403,9 +405,9 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode()); - emisSettleSubBill.setSiteConfirmNote(spr.getSiteConfirmNote()); + emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmSiteNote(spr.getConfirmSiteNote()); emisSettleSubBill.setId(id); @@ -438,9 +440,9 @@ public class EmisSettleSubBillController extends EmisBaseController try { long id=ids[i]; EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); - emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode()); - emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode()); - emisSettleSubBill.setSiteConfirmNote(spr.getSiteConfirmNote()); + emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode()); + emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + emisSettleSubBill.setConfirmSiteNote(spr.getConfirmSiteNote()); emisSettleSubBill.setId(id); emisBaseService.setBillErrorBySite(emisSettleSubBill);