Merge remote-tracking branch 'origin/main'

.classpath

@@ -60,6 +60,36 @@
 	<classpathentry kind="src" output="bin" path="pu/src/private"/>
 	<classpathentry kind="src" output="bin" path="pu/src/test"/>
 	<classpathentry kind="src" output="bin" path="pu/resources"/>
+	<classpathentry kind="src" output="bin" path="cmp/src/public"/>
+	<classpathentry kind="src" output="bin" path="cmp/src/client"/>
+	<classpathentry kind="src" output="bin" path="cmp/src/private"/>
+	<classpathentry kind="src" output="bin" path="cmp/src/test"/>
+	<classpathentry kind="src" output="bin" path="cmp/resources"/>
+	<classpathentry kind="src" output="bin" path="yxy/src/public"/>
+	<classpathentry kind="src" output="bin" path="yxy/src/client"/>
+	<classpathentry kind="src" output="bin" path="yxy/src/private"/>
+	<classpathentry kind="src" output="bin" path="yxy/src/test"/>
+	<classpathentry kind="src" output="bin" path="yxy/resources"/>
+	<classpathentry kind="src" output="bin" path="cm/src/public"/>
+	<classpathentry kind="src" output="bin" path="cm/src/client"/>
+	<classpathentry kind="src" output="bin" path="cm/src/private"/>
+	<classpathentry kind="src" output="bin" path="cm/src/test"/>
+	<classpathentry kind="src" output="bin" path="cm/resources"/>
+	<classpathentry kind="src" output="bin" path="sc/src/public"/>
+	<classpathentry kind="src" output="bin" path="sc/src/client"/>
+	<classpathentry kind="src" output="bin" path="sc/src/private"/>
+	<classpathentry kind="src" output="bin" path="sc/src/test"/>
+	<classpathentry kind="src" output="bin" path="sc/resources"/>
+	<classpathentry kind="src" output="bin" path="ssctp/src/public"/>
+	<classpathentry kind="src" output="bin" path="ssctp/src/client"/>
+	<classpathentry kind="src" output="bin" path="ssctp/src/private"/>
+	<classpathentry kind="src" output="bin" path="ssctp/src/test"/>
+	<classpathentry kind="src" output="bin" path="ssctp/resources"/>
+	<classpathentry kind="src" output="bin" path="gl/src/public"/>
+	<classpathentry kind="src" output="bin" path="gl/src/client"/>
+	<classpathentry kind="src" output="bin" path="gl/src/private"/>
+	<classpathentry kind="src" output="bin" path="gl/src/test"/>
+	<classpathentry kind="src" output="bin" path="gl/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>

arap/src/public/nc/api/arap/resource/GatheringbillRestResource.java

@@ -114,10 +114,17 @@ public class GatheringbillRestResource extends ArapBaseRestResource {
 			headvo.setObjtype(0);
 			// ÏúÊÛ¶©µ¥ºÅ
 			csaleorderid = headvo.getDef3();
+			if (StringUtils.isEmpty(csaleorderid)) {
+				throw new BusinessException("销售订单不能为空");
+				// return ResultMessageUtil.exceptionToJSON("销售订单不能为空", APIErrCodeEnum.BUSINESSEXCCODE.getCode());
+			}
 			// ¿Í»§
 			Object customerid = hybo.findColValue("so_saleorder", "ccustomerid",
 					"csaleorderid = '" + csaleorderid + "' ");
 			Object customerCode = hybo.findColValue("bd_customer", "code", "pk_customer = '" + customerid + "' ");
+			if (customerid == null || customerCode == null) {
+				throw new BusinessException("销售订单的关联客户不能为空");
+			}
 			headvo.setCustomer(customerCode.toString());
 
 			Object tr = dao.executeQuery(
@@ -222,6 +229,8 @@ public class GatheringbillRestResource extends ArapBaseRestResource {
 					//
 					UFDouble notax_cr = money_cr.sub(local_tax_cr);
 					itemvo.setNotax_cr(notax_cr);
+					//zhangxinah增加组织本币无税金额(贷方)
+					itemvo.setLocal_notax_cr(notax_cr);
 					//
 					itemvo.setRate(UFDouble.ZERO_DBL);
 					//

cmp/src/client/yyconfig/modules/cmp/informer/config/userdef/36S3_userdef.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<userdefs>
+  <userdef>
+    <name>cmp.cmp_informer</name>
+    <prefix>vdef</prefix>
+    <defrulecode></defrulecode>
+  </userdef>
+</userdefs>

cmp/src/public/nc/vo/cmp/informer/InformerVO.java

@@ -105,6 +105,46 @@ public class InformerVO extends SuperVO {
     public static final String SRCBUSIBILL = "srcbusibill";
     public static final String SRCBUSITYPE = "srcbusitype";
     public static final String SRCBUSIBILLNAME = "srcbusibillname";
+    private  java.lang.String vdef1;
+    private  java.lang.String vdef2;
+    private  java.lang.String vdef3;
+    private  java.lang.String vdef4;
+    private  java.lang.String vdef5;
+    private  java.lang.String vdef6;
+    private  java.lang.String vdef7;
+    private  java.lang.String vdef8;
+    private  java.lang.String vdef9;
+    private  java.lang.String vdef10;
+    private  java.lang.String vdef11;
+    private  java.lang.String vdef12;
+    private  java.lang.String vdef13;
+    private  java.lang.String vdef14;
+    private  java.lang.String vdef15;
+    private  java.lang.String vdef16;
+    private  java.lang.String vdef17;
+    private  java.lang.String vdef18;
+    private  java.lang.String vdef19;
+    private  java.lang.String vdef20;
+	public static final String VDEF1 = "vdef1";
+	public static final String VDEF2 = "vdef2";
+	public static final String VDEF3 = "vdef3";
+	public static final String VDEF4 = "vdef4";
+	public static final String VDEF5 = "vdef5";
+	public static final String VDEF6 = "vdef6";
+	public static final String VDEF7 = "vdef7";
+	public static final String VDEF8 = "vdef8";
+	public static final String VDEF9 = "vdef9";
+	public static final String VDEF10 = "vdef10";
+	public static final String VDEF11 = "vdef11";
+	public static final String VDEF12 = "vdef12";
+	public static final String VDEF13 = "vdef13";
+	public static final String VDEF14 = "vdef14";
+	public static final String VDEF15 = "vdef15";
+	public static final String VDEF16 = "vdef16";
+	public static final String VDEF17 = "vdef17";
+	public static final String VDEF18 = "vdef18";
+	public static final String VDEF19 = "vdef19";
+	public static final String VDEF20 = "vdef20";
     public static final String DEF01 = "def01";
 
     public String getDef01() {

so/META-INF/saleorder_saleinvoice.rest

@@ -2,6 +2,5 @@
 <module>
 <rest>
 	<resource classname="nccloud.openapi.so.m30.SaleOrderResource"  exinfo="销售订单接口"/>
-	<resource classname="nccloud.api.so.saleinvoice.operator.saveCommitAction"  exinfo="销售发票接口"/>
 </rest>
 </module>

so/src/public/nc/vo/so/m32/saleinvoice/operator/billSaveAction.java

@@ -130,7 +130,7 @@ public class billSaveAction extends AbstractNCCRestResource {
                 IVApplicationAggVO returnSaveIVApplicationAggVO = serviceImpl.save(iVApplicationAggVO);
 //                Object returnIVApplicationAggVO = PfServiceScmUtil.processBatch("SAVE", "SSCIVA", new IVApplicationAggVO[] { iVApplicationAggVO }, null, null);
                 if (returnSaveIVApplicationAggVO != null) {
-                    return ResultMessageUtil.toJSON(null, "接口调用成功");
+                    return ResultMessageUtil.toJSON(returnApproveSaleInvoiceVOs, "接口调用成功");
                 } else {
                     Exception e = new Exception("接口调用失败");
                     return ResultMessageUtil.exceptionToJSON(e);

so/src/public/nccloud/api/so/saleinvoice/operator/saveCommitAction.java

@@ -138,7 +138,10 @@ public class saveCommitAction extends AbstractNCCRestResource {
                         // 销售发票审核结束
                         ISaleInvoiceToTaxInvService invoiceService = NCLocator.getInstance()
                                 .lookup(ISaleInvoiceToTaxInvService.class);
-                        invoiceService.issueTaxInvoice(saleInvoiceVO, "1");
+                        // 数电票(增值税专用发票)=31,数电票(普通发票)=32,数电纸质发票(机动车销售统一发票)=36,数电纸质发票(增值税专用发票)=33,数电纸质发票(普通发票)=34,
+                        // 增值税电子普通发票=1,增值税电子专用发票=2,增值税普通发票=3,增值税专用发票=4,增值税电子普通发票（成品油）=8,成品油普通发票(卷式)=9,
+                        // 成品油普通发票=10,成品油专用发票=11,增值税普通发票(卷式)=12,增值税专用发票(机动车)=99
+                        invoiceService.issueTaxInvoice(saleInvoiceVO, fplxStr);
 
                         JSONObject desc = r.getDesc();
                         if (desc != null) {
@@ -193,11 +196,11 @@ public class saveCommitAction extends AbstractNCCRestResource {
             // 2025-2-8付业要求修改，根据发票类型Q（自定义档案）对照发票类型
             String ctrantypeidStr = "32-02";// 默认普通发票
             if (fplxStr != null && fplxStr.equals("31")) {
-                ctrantypeidStr = "32-01";
+                ctrantypeidStr = "32-01";// 数电票(增值税专用发票)
             } else if (fplxStr != null && fplxStr.equals("32")) {
-                ctrantypeidStr = "32-02";
+                ctrantypeidStr = "32-02";// 数电票(普通发票)
             } else if (fplxStr != null && fplxStr.equals("36")) {
-                ctrantypeidStr = "32-Cxx-03";
+                ctrantypeidStr = "32-Cxx-03";// 机动车销售发票
             }
             billhead.put("ctrantypeid", ctrantypeidStr);// 发票类型
             // billhead.put("ctrantypeid", "32-02");//发票类型

so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java

@@ -1,18 +1,17 @@
 
 package nccloud.openapi.so.m30;
 
-import nc.itf.bd.defdoc.IDefdocService;
+import nc.bd.itf.tools.BFPubTools;
-import java.util.ArrayList;
+import nc.bs.dao.BaseDAO;
-import java.util.List;
-import java.util.Map;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import nc.jdbc.framework.processor.*;
 import nc.bs.framework.common.InvocationInfoProxy;
 import nc.bs.framework.common.NCLocator;
+import nc.itf.bd.defdoc.IDefdocService;
+import nc.itf.pim.project.prv.IProject;
+import nc.jdbc.framework.processor.ColumnListProcessor;
+import nc.jdbc.framework.processor.ColumnProcessor;
+import nc.jdbc.framework.processor.MapProcessor;
 import nc.vo.bd.defdoc.DefdocVO;
+import nc.vo.pim.project.ProjectHeadVO;
 import nc.vo.pub.BusinessException;
 import nc.vo.pub.lang.UFDateTime;
 import nc.vo.pubapp.AppContext;
@@ -26,11 +25,15 @@ import nccloud.openapi.scmpub.pub.NCCPubRestResource;
 import nccloud.openapi.scmpub.pub.TransferCodeToPKTool;
 import nccloud.openapi.scmpub.pub.TransferMapToVOTool;
 import nccloud.openapi.scmpub.util.CallReturnBuildUtil;
-import nc.bs.dao.BaseDAO;
-import nc.bd.itf.tools.BFPubTools;
 import org.json.JSONString;
-import nc.vo.pim.project.ProjectHeadVO;
+
-import nc.itf.pim.project.prv.IProject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -80,7 +83,6 @@ public class SaleOrderResource extends NCCPubRestResource {
     }
 
     /**
-	 * 
      * @Description: 在2312基础上适配2005代码
      * @date: 2025年3月19日 18点11分
      * @version NCC2312
@@ -347,7 +349,10 @@ public class SaleOrderResource extends NCCPubRestResource {
                     .lookup(IAPISaleOrderMaitain.class);
             SaleOrderVO[] results = service.update(paramList);
 
-			return ResultMessageUtil.toJSON(results, "销售订单修改成功");
+            // return ResultMessageUtil.toJSON(results, "销售订单修改成功");
+            // 包装返回信息
+            return NCCRestUtils.toJSONString(CallReturnBuildUtil.buildSuccessResult(
+                    results, "销售订单修改成功"));
         } catch (Exception e) {
             return ResultMessageUtil.exceptionToJSON(e);
         }