diff --git a/so/META-INF/saleinvoice.rest b/so/META-INF/saleinvoice.rest index 94b8e77..8e9487b 100644 --- a/so/META-INF/saleinvoice.rest +++ b/so/META-INF/saleinvoice.rest @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/so/src/public/nc/vo/so/m32/saleinvoice/operator/billSaveAction.java b/so/src/public/nccloud/api/so/saleinvoice/operator/BillSaveAction.java similarity index 89% rename from so/src/public/nc/vo/so/m32/saleinvoice/operator/billSaveAction.java rename to so/src/public/nccloud/api/so/saleinvoice/operator/BillSaveAction.java index 022b886..cecbe33 100644 --- a/so/src/public/nc/vo/so/m32/saleinvoice/operator/billSaveAction.java +++ b/so/src/public/nccloud/api/so/saleinvoice/operator/BillSaveAction.java @@ -1,4 +1,4 @@ -package nc.vo.so.m32.saleinvoice.operator; +package nccloud.api.so.saleinvoice.operator; import com.alibaba.fastjson.JSONObject; import nc.bs.framework.common.NCLocator; @@ -42,11 +42,11 @@ import java.util.List; * @date 2025/03/14 */ @Path("so/saleinvoice/operator") -public class billSaveAction extends AbstractNCCRestResource { +public class BillSaveAction extends AbstractNCCRestResource { public static String fplxStr = "";// Ʊ뷢Ʊ - public billSaveAction() { + public BillSaveAction() { } @@ -84,13 +84,14 @@ public class billSaveAction extends AbstractNCCRestResource { if (bject == null) { return ResultMessageUtil.exceptionToJSON(new NullPointerException("billhead:null")); } - String csaleinvoiceid = bject.getString("csaleinvoiceid"); // ۷Ʊid + // ۷Ʊid + String csaleinvoiceid = bject.getString("vdef40"); // ۷Ʊʵidѯ۷Ʊ String[] ids = {csaleinvoiceid}; SaleInvoiceVO[] saleInvoiceVOs = NCLocator.getInstance().lookup(ISaleinvoiceQueryAPI.class) .queryVOByIDs(ids); - if (saleInvoiceVOs.length <= 0) { - return ResultMessageUtil.exceptionToJSON(new NullPointerException("δѯErpӦ۷Ʊ")); + if (saleInvoiceVOs == null || saleInvoiceVOs.length <= 0) { + return ResultMessageUtil.exceptionToJSON(new NullPointerException("δϵͳвѯӦ۷Ʊ")); } try { // úԭ۷Ʊװº巢Ʊ @@ -109,7 +110,7 @@ public class billSaveAction extends AbstractNCCRestResource { context.setBillVos(returnSaveSaleInvoiceVOs); context.setActionName("APPROVE"); SaleInvoiceVO[] returnApproveSaleInvoiceVOs = (SaleInvoiceVO[]) flowService.exeScriptPFlow(context); - if (returnApproveSaleInvoiceVOs == null && returnApproveSaleInvoiceVOs.length <= 0) { + if (returnApproveSaleInvoiceVOs == null || returnApproveSaleInvoiceVOs.length <= 0) { throw new BusinessException("۷Ʊʧ"); } /** @@ -144,8 +145,8 @@ public class billSaveAction extends AbstractNCCRestResource { Exception e = new Exception("ӿڵʧ"); return ResultMessageUtil.exceptionToJSON(e); } - } catch (BusinessException e) { - Logger.error("writeBack Error: ", e); + } catch (Exception e) { + Logger.error("billSaveRp-exp: ", e); return ResultMessageUtil.exceptionToJSON(e); } } @@ -153,16 +154,16 @@ public class billSaveAction extends AbstractNCCRestResource { /** * 巢ƱVO * - * @param originalSaleInvoiceVO + * @param originalVO * @param bject * @return * @throws Exception */ - public static SaleInvoiceVO makeNewRedRushSaleInvoice(SaleInvoiceVO originalSaleInvoiceVO, JSONObject bject) throws Exception { + public static SaleInvoiceVO makeNewRedRushSaleInvoice(SaleInvoiceVO originalVO, JSONObject bject) throws Exception { try { SaleInvoiceVO saleInvoiceVO = new SaleInvoiceVO(); - SaleInvoiceHVO saleInvoiceHVO = originalSaleInvoiceVO.getParentVO(); // ʵ - SaleInvoiceBVO[] saleInvoiceBVOs = originalSaleInvoiceVO.getChildrenVO(); // ʵ + SaleInvoiceHVO saleInvoiceHVO = originalVO.getParentVO(); // ʵ + SaleInvoiceBVO[] saleInvoiceBVOs = originalVO.getChildrenVO(); // ʵ SaleInvoiceHVO newSaleInvoiceHVO = new SaleInvoiceHVO(); // ʵ // ʵԸֵ @@ -172,14 +173,15 @@ public class billSaveAction extends AbstractNCCRestResource { UFDouble sumNorigmny = new UFDouble(); // ϼ˰ UFDouble sumNorigtaxmny = new UFDouble(); // ϼƼ˰ϼ int i = 0; - com.alibaba.fastjson.JSONArray paramsSaleInvoiceBVOsJSA = (com.alibaba.fastjson.JSONArray) bject.get("SaleInvoiceBVOs"); // ʵ - List paramsSaleInvoiceBVOs = paramsSaleInvoiceBVOsJSA.toJavaList(JSONObject.class); - SaleInvoiceBVO[] newSaleInvoiceBVOs = new SaleInvoiceBVO[paramsSaleInvoiceBVOs.size()]; // ʵ + // ʵ + com.alibaba.fastjson.JSONArray bvoJsonArr = (com.alibaba.fastjson.JSONArray) bject.get("csaleinvoicebid"); + List bvoList = bvoJsonArr.toJavaList(JSONObject.class); + SaleInvoiceBVO[] newSaleInvoiceBVOs = new SaleInvoiceBVO[bvoList.size()]; // ʵ for (SaleInvoiceBVO saleInvoiceBVO : saleInvoiceBVOs) { String csaleinvoicebid = saleInvoiceBVO.getCsaleinvoicebid(); // ӱid // ɸѡӱ - List newParamsSaleInvoiceBVOs = paramsSaleInvoiceBVOs.stream().filter(item -> { - String parCsaleinvoicebid = item.getString("csaleinvoicebid") + ""; + List newParamsSaleInvoiceBVOs = bvoList.stream().filter(item -> { + String parCsaleinvoicebid = item.getString("vbdef15") + ""; // ӱid return csaleinvoicebid.equals(parCsaleinvoicebid); }).toList(); if (newParamsSaleInvoiceBVOs.size() <= 0) { @@ -246,14 +248,14 @@ public class billSaveAction extends AbstractNCCRestResource { /** * 忪ƱVO * - * @param ivApplicationHeadVO ԭƱʵ + * @param applyHeadVO ԭƱʵ * @param ivApplicationBodyVOS ԭƱʵ * @param bject bip * @param returnApproveSaleInvoiceVOs ɵĺ۷Ʊʵ * @return * @throws Exception */ - public static IVApplicationAggVO makeNewRedRushIVApplicationAggVO(IVApplicationHeadVO ivApplicationHeadVO, IVApplicationBodyVO[] ivApplicationBodyVOS, JSONObject bject, SaleInvoiceVO[] returnApproveSaleInvoiceVOs) throws Exception { + public static IVApplicationAggVO makeNewRedRushIVApplicationAggVO(IVApplicationHeadVO applyHeadVO, IVApplicationBodyVO[] ivApplicationBodyVOS, JSONObject bject, SaleInvoiceVO[] returnApproveSaleInvoiceVOs) throws Exception { try { IVApplicationAggVO ivApplicationAggVO = new IVApplicationAggVO(); IVApplicationHeadVO newivApplicationHeadVO = new IVApplicationHeadVO(); // ʵ @@ -266,13 +268,13 @@ public class billSaveAction extends AbstractNCCRestResource { SaleInvoiceHVO rpSaleInvoiceHVO = rpSaleInvoiceVOs[0].getParentVO(); // ʵԸֵ -// BeanUtil.copyProperties(ivApplicationHeadVO,newivApplicationHeadVO, CopyOptions.create().setIgnoreNullValue(true)); +// BeanUtil.copyProperties(applyHeadVO,newivApplicationHeadVO, CopyOptions.create().setIgnoreNullValue(true)); // ¡ȡֵԭӱƱ - newivApplicationHeadVO = (IVApplicationHeadVO) CloneUtil.depthClone(ivApplicationHeadVO); + newivApplicationHeadVO = (IVApplicationHeadVO) CloneUtil.depthClone(applyHeadVO); // ݲжǷΪֺ boolean isPartHCFlag = false; UFDouble paramNtotalorigmny = new UFDouble(bject.getString("ntotalorigmny")); // ˰ϼƣ - UFDouble ntotalorigmny = ivApplicationHeadVO.getJshj(); // ԭƱ˰ϼ + UFDouble ntotalorigmny = applyHeadVO.getJshj(); // ԭƱ˰ϼ // 뿪ƱԴ˰ϼƱȽֵ㣬Ϊֺ if (ntotalorigmny.add(paramNtotalorigmny).compareTo(UFDouble.ZERO_DBL) > 0) { isPartHCFlag = true; @@ -284,14 +286,15 @@ public class billSaveAction extends AbstractNCCRestResource { UFDouble sumSe = new UFDouble(); // ϼ˰ // ʵԸֵ int i = 0; - com.alibaba.fastjson.JSONArray paramsSaleInvoiceBVOsJSA = (com.alibaba.fastjson.JSONArray) bject.get("SaleInvoiceBVOs"); // ʵ - List paramsSaleInvoiceBVOs = paramsSaleInvoiceBVOsJSA.toJavaList(JSONObject.class); - IVApplicationBodyVO[] newivApplicationBodyVOS = new IVApplicationBodyVO[paramsSaleInvoiceBVOs.size()]; // ʵ + // ʵ + com.alibaba.fastjson.JSONArray bvoJsonArr = (com.alibaba.fastjson.JSONArray) bject.get("csaleinvoicebid"); + List bvoList = bvoJsonArr.toJavaList(JSONObject.class); + IVApplicationBodyVO[] newivApplicationBodyVOS = new IVApplicationBodyVO[bvoList.size()]; // ʵ for (IVApplicationBodyVO ivApplicationBodyVO : ivApplicationBodyVOS) { String src_pkdetail = ivApplicationBodyVO.getSrc_pkdetail(); // Դid // ɸѡӱ - List newParamsSaleInvoiceBVOs = paramsSaleInvoiceBVOs.stream().filter(item -> { - String parCsaleinvoicebid = item.getString("csaleinvoicebid") + ""; + List newParamsSaleInvoiceBVOs = bvoList.stream().filter(item -> { + String parCsaleinvoicebid = item.getString("vbdef15") + ""; // ӱid return src_pkdetail.equals(parCsaleinvoicebid); }).toList(); if (newParamsSaleInvoiceBVOs.size() <= 0) {