2024-06-21 更改销售开票和销售收款bug

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010.java

@@ -205,11 +205,13 @@ public class ServiceHGCW010 extends ServiceBase {
                     hgcw010.setThisSettlementAmount(hgcw011List.get(0).getThisSettlementAmount());
                     hgcw010.setBillNumber(hgcw011List.get(0).getBillNumber());
                     hgcw010.setSettlementNumber(settlementNumber.toString().substring(0, settlementNumber.length() - 1));
+                    hgcw010.setRemainingAmount(new BigDecimal(decimalFormat.format(totalContractPriceIncluding)));
                     this.add(hgcw010);
 
                     //生成明细表
                     for (HGCW011 hgcw011 : hgcw011List) {
                         hgcw011.setMainId(hgcw010.getId());
+                        hgcw011.setId(null);
                         // 反写金额
                         HGCWTools.HgCw008.deductionAmount(hgcw011.getSettlementNumber(),rowMap.get(hgcw011.getSettlementNumber()));
                         DaoUtils.insert(HGCW011.INSERT, hgcw011);

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010B.java

@@ -5,13 +5,16 @@ import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.hg.cw.domain.HGCW010;
 import com.baosight.hggp.hg.cw.domain.HGCW015;
 import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
 import java.util.Arrays;
+import java.util.Map;
 
 /**
  * @author yukang
@@ -48,6 +51,8 @@ public class ServiceHGCW010B extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
+			Map map = EiInfoUtils.getFirstRow(inInfo);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGCW010.FIELD_ID, map.get("mainId"));
 			inInfo = super.query(inInfo, HGCW010.QUERY, new HGCW010());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010C.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.cw.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.hg.cw.domain.HGCW011;
 import com.baosight.hggp.hg.cw.domain.HGCW015;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.LogUtils;
@@ -30,7 +31,7 @@ public class ServiceHGCW010C extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,
 					DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW015().eiMetadata);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW011().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
@@ -47,7 +48,7 @@ public class ServiceHGCW010C extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			inInfo = super.query(inInfo, HGCW015.QUERY, new HGCW015());
+			inInfo = super.query(inInfo, HGCW011.QUERY, new HGCW011());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW010.xml

@@ -258,6 +258,9 @@
 										DEP_CODE  <!-- 部门编码 -->
 										)
 	    VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projName#, #projCode#, #settlementNumber#, #billTybe#, #billNumber#, #billState#, #signingDate#, #partyA#, #reviewStatus#, #thisSettlementTax#, #thisSettlementAmount#, #taxPoints#, #totalContractPriceIncluding#,#remainingAmount#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGCW010
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW010A.xml

@@ -192,7 +192,7 @@
 		ON T1.PROJ_CODE = B.PROJ_CODE
 		AND T1.CONTRACT_NUMBER = B.CONTRACT_NUMBER
 		AND T1.COMPANY_CODE = B.COMPANY_CODE
-		WHERE 1=1 AND B.CONTRACT_TYPE = 1 AND T1.SETTLEMENT_TYPE = 2
+		WHERE 1=1 AND B.CONTRACT_TYPE = 1
 		<include refid="condition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">

src/main/webapp/HG/CW/HGCW008.jsp

@@ -6,7 +6,7 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 <head>
 </head>
-<EF:EFPage title="合同管理">
+<EF:EFPage title="结算单管理">
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">

src/main/webapp/HG/CW/HGCW010.jsp

@@ -31,8 +31,10 @@
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="billTybe" cname="票据类型" width="120" enable="false" readonly="true" align="center"/>
-
+            <EF:EFComboColumn ename="billTybe" cname="票据类型" width="120" align="center" readonly="true" required="true"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
+                <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="taxPoints" cname="税率" width="120" enable="false" readonly="true" align="center"/>

src/main/webapp/HG/CW/HGCW012A.js

@@ -304,7 +304,7 @@ $(function () {
     IPLATUI.EFTab = {
         "info": {
             show: function (e) {
-                $(e.contentElement).find("div[datarole='grid']").data("kendoGrid").refresh()
+                $(e.contentElement).find("div[data-role='grid']").data("kendoGrid").refresh()
             }
         }
     }

src/main/webapp/HG/CW/HGCW014.js

@@ -82,7 +82,6 @@ function choiceFunc() {
         JSColorbox.open({
             href: "HGCW014A?methodName=initLoad&inqu_status-0-hiddenConditions=1" +
                 "&inqu_status-0-billState=2" +
-                "&inqu_status-0-reviewStatus=3" +
                 "&inqu_status-0-mainId=" + mainId +
                 "&efParentFormEname=HGCW014",
             title: "<div style='text-align: center;'>销售开票</div>",