2024-06-21 更改收款单bug

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

@@ -133,6 +133,7 @@ public class ServiceHGCW012 extends ServiceBase {
      * @return
      */
     @OperationLogAnnotation(operModul = "收款单",operType = "删除",operDesc = "删除")
+    @Override
     public EiInfo delete(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

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

@@ -41,7 +41,7 @@ public class ServiceHGCW016 extends ServiceBase {
      * @return
      */
 
-    @OperationLogAnnotation(operModul = "收款单",operType = "查询",operDesc = "初始化")
+    @OperationLogAnnotation(operModul = "付款单",operType = "查询",operDesc = "初始化")
     public EiInfo initLoad(EiInfo inInfo) {
         try {
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID), null, false);
@@ -58,7 +58,7 @@ public class ServiceHGCW016 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "收款单",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "付款单",operType = "查询",operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
@@ -75,7 +75,7 @@ public class ServiceHGCW016 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "收款单",operType = "保存",operDesc = "保存")
+    @OperationLogAnnotation(operModul = "付款单",operType = "保存",operDesc = "保存")
     public EiInfo save(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -132,7 +132,7 @@ public class ServiceHGCW016 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "收款单",operType = "删除",operDesc = "删除")
+    @OperationLogAnnotation(operModul = "付款单",operType = "删除",operDesc = "删除")
     public EiInfo delete(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -158,7 +158,7 @@ public class ServiceHGCW016 extends ServiceBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "收款单",operType = "插入",operDesc = "生成收款单")
+    @OperationLogAnnotation(operModul = "付款单",operType = "插入",operDesc = "生成付款单")
     public EiInfo select(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -238,7 +238,7 @@ public class ServiceHGCW016 extends ServiceBase {
                 }
             }
         } catch (Exception e) {
-            LogUtils.setMsg(inInfo, e, "生成收款单失败");
+            LogUtils.setMsg(inInfo, e, "生成付款单失败");
         }
         return inInfo;
     }

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

@@ -290,4 +290,15 @@
 			ID = #id#
 	</update>
 
+	<update id="updateDeductionAmount">
+		UPDATE ${hggpSchema}.HGCW012
+		SET
+		REMAINING_AMOUNT	= #remainingAmount#,   <!-- 剩余开票/收票金额 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
+		WHERE
+		ID = #id#
+	</update>
+
 </sqlMap>

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

@@ -82,7 +82,6 @@ function choiceFunc() {
         JSColorbox.open({
             href: "HGCW016A?methodName=initLoad&inqu_status-0-hiddenConditions=1" +
                 "&inqu_status-0-billState=2" +
-                "&inqu_status-0-reviewStatus=3" +
                 "&inqu_status-0-mainId=" + mainId +
                 "&efParentFormEname=HGCW016",
             title: "<div style='text-align: center;'>采购收票</div>",
@@ -112,7 +111,7 @@ function updateFunc() {
     }
     JSColorbox.open({
         href: "HGCW016B?methodName=initLoad&inqu_status-0-mainId=" + rows[0].id + "&efParentFormEname=HGCW016",
-        title: "<div style='text-align: center;'>收款清单</div>",
+        title: "<div style='text-align: center;'>付款清单</div>",
         width: "90%",
         height: "90%",
         callbackName: windowCallback

src/main/webapp/HG/CW/HGCW016.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/HGCW016A.js

@@ -55,15 +55,15 @@ function btnSaveFunc() {
         let thisAmount = rows[i]['thisAmount'];
         let remainingAmount = rows[i]['remainingAmount'];
         if (!isNumber(thisAmount) && !isPositiveNumber(thisAmount)) {
-            message("勾选的第" + (i + 1) + "行本次收款金额必须是大于0的数字");
+            message("勾选的第" + (i + 1) + "行本次付款金额必须是大于0的数字");
             return;
         }
         if (parseFloat(thisAmount) > parseFloat(remainingAmount)) {
-            message("第" + (i + 1) + "行本次收款金额不能大于剩余开票金额");
+            message("第" + (i + 1) + "行本次付款金额不能大于剩余开票金额");
             return;
         }
     }
-    JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据生成收款单吗? ", {
+    JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据生成付款单吗? ", {
         ok: function () {
             JSUtils.submitGridsData("result", "HGCW016", "select",
                 true, function (e) {