Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/cb/service/ServiceHGCB001.java

@@ -3,9 +3,12 @@ package com.baosight.hggp.hg.cb.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cb.domain.HGCB001;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -31,10 +34,15 @@ public class ServiceHGCB001 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+//			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCB001().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		} catch (InstantiationException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
 		}
 		return inInfo;
 	}

src/main/java/com/baosight/hggp/hg/cb/service/ServiceHGCB005.java

+package com.baosight.hggp.hg.cb.service;
+
+import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.cb.domain.HGCB001;
+import com.baosight.hggp.hg.cb.domain.HGCB002;
+import com.baosight.hggp.hg.cb.domain.HGCB005;
+import com.baosight.hggp.hg.cb.tools.HGCBTools;
+import com.baosight.hggp.hg.cw.domain.HGCW001;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.hg.utils.HGUtils;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.util.*;
+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.ServiceEPBase;
+
+import java.util.Map;
+import java.util.Objects;
+
+public class ServiceHGCB005 extends ServiceEPBase {
+
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            inInfo = super.initLoad(inInfo, EiConstant.resultBlock, new HGCB005());
+            EiInfoUtils.addBlock(inInfo,"company_code_block_id", UserSessionUtils.getRoleCompany(), Company.class);
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        try{
+            inInfo = super.query(inInfo, HGCB005.QUERY, new HGCB005());
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+
+    public EiInfo synchData(EiInfo inInfo) {
+        Map params= EiInfoUtils.getFirstRow(inInfo);
+        HGUtils.setCondition(params);
+        HGCB001 hgcw001Today = HGCBTools.HgCb001.select(params);
+        if (hgcw001Today != null && hgcw001Today.getAccountPeriodStatus() == 0) {
+            throw new PlatException(String.format("公司[%s]会计期[%s]状态为关账状态，数据同步失败！", hgcw001Today.getCompanyCode(), hgcw001Today.getAccountPeriod()));
+        }
+        HGCB001 hgcw001Last = HGCBTools.HgCb001.selectLast(params);
+        if (hgcw001Last != null && hgcw001Last.getAccountPeriodStatus() == 1) {
+            throw new PlatException(String.format("公司[%s]上月会计期[%s]为开账状态，数据同步失败！", hgcw001Last.getCompanyCode(), hgcw001Last.getAccountPeriod()));
+        }
+        HGCW001 hgcw001 = HGCWTools.HgCw001.getByCondition(params);
+        AssertUtils.isNull(hgcw001,String.format("公司[%s]会计期[%s]会计账期数据异常，数据同步失败！", hgcw001Today.getCompanyCode(), hgcw001Today.getAccountPeriod()));
+        HGCBTools.THGCB005.synchData(hgcw001);
+        return inInfo;
+    }
+}

src/main/java/com/baosight/hggp/hg/cb/tools/HGCBTools.java

@@ -627,8 +627,7 @@ public class HGCBTools {
          *
          * @return
          */
-        public static void synchData() {
-            HGCW001 hgcw001 = new HGCW001();
+        public static void synchData(HGCW001 hgcw001) {
             //通过业务账期信息查询入库单
             Map kc003ParamMap = new HashMap();
             kc003ParamMap.put(HGKC003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);

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

+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.HGCW012;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.LogUtils;
+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;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW012C extends ServiceBase {
+
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+
+	@OperationLogAnnotation(operModul = "采购开票",operType = "查询",operDesc = "初始化")
+	@Override
+	public EiInfo initLoad(EiInfo inInfo) {
+		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 HGCW012().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "采购开票",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGCW012.QUERY, new HGCW012());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+}

src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java

@@ -40,6 +40,11 @@ public class HGCWTools {
             AssertUtils.isEmpty(list, "未找到公司对应的会计期");
             return list.get(0);
         }
+
+        public static HGCW001 getByCondition(Map paramMap){
+            List<HGCW001> results = DaoBase.getInstance().query(HGCW001.QUERY, paramMap);
+            return CollectionUtils.isEmpty(results) ? null : results.get(0);
+        }
     }
 
     public static class HgCw002 {

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml

@@ -321,7 +321,7 @@
 		<isNotEmpty property="userId">
 			left join ${platSchema}.txsog02 b on a.ORG_ID = b.ORG_ID
 		</isNotEmpty>
-		where 1=1
+		where a.IS_DELETED = 0
 		<isNotEmpty prepend=" AND " property="accountCode">
 			a.ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSOrg.xml

@@ -98,7 +98,7 @@
         ) T2,
         ${platSchema}.TXSOG01 T3
         LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
-        WHERE 1=1
+        WHERE T3.IS_DELETED = 0
         AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
         AND T3.ORG_ID != 'root'
         <isNotEmpty prepend=" AND " property="orgType">
@@ -125,7 +125,7 @@
         where @CODES is not null
         ) T2,
         ${platSchema}.TXSOG01 T3
-        WHERE 1=1
+        WHERE T3.IS_DELETED = 0
         AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
         <isNotEmpty prepend=" AND " property="orgType">
             ORG_TYPE = #orgType#
@@ -143,7 +143,7 @@
             ORG_ID as "orgId",
             ORG_CNAME as "orgCname"
         FROM ${platSchema}.TXSOG01
-        WHERE 1=1
+        WHERE T3.IS_DELETED = 0
         AND ORG_TYPE != 'org'
         <include refid="condition"/>
         <include refid="customCondition"/>
@@ -191,7 +191,7 @@
         ) T2,
         ${platSchema}.TXSOG01 T3
         LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
-        WHERE 1=1
+        WHERE T3.IS_DELETED = 0
         AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
         AND T3.ORG_TYPE IN ('prodGroup', 'cutGroup')
         <isNotEmpty prepend=" AND " property="orgType">
@@ -205,7 +205,7 @@
         from ${platSchema}.txsog02 a
         join ${platSchema}.xs_user b on a.USER_ID=b.USER_ID
         join ${platSchema}.txsog01 c on c.ORG_ID = a.ORG_ID and c.IS_DELETED = 0
-        where 1=1  and c.ORG_TYPE = 'prodGroup'
+        where c.IS_DELETED = 0  and c.ORG_TYPE = 'prodGroup'
         <isNotEmpty prepend=" AND " property="userId">
             b.USER_ID = #userId#
         </isNotEmpty>
@@ -234,7 +234,7 @@
         A.COMPANY_NAME AS "companyName",
         A.PARENT_ORG_ID as "parentOrgId"
         FROM ${platSchema}.TXSOG01 A, ${platSchema}.TXSOG02 B, ${platSchema}.XS_USER C
-        WHERE 1=1
+        WHERE A.IS_DELETED = 0
         AND A.ORG_ID = B.ORG_ID
         AND B.USER_ID = C.USER_ID
         AND C.LOGIN_NAME = #loginName#

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001C.java

@@ -54,7 +54,7 @@ public class ServiceHGYX001C extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
         return super.query(inInfo, HGYX001C.QUERY,new HGYX001C());
     }
 }

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001C.xml

@@ -4,14 +4,8 @@
 
     <sql id="column">
         ID as "id",
-        ACCOUNT_CODE as "accountCode",  <!-- 企业编码 -->
-        DEP_CODE as "depCode",  <!-- 部门编码 -->
-        CREATED_BY as "createdBy",  <!-- 记录创建者 -->
-        CREATED_NAME as "createdName",  <!-- 记录创建名称 -->
-        CREATED_TIME as "createdTime",  <!-- 记录创建时间 -->
-        UPDATED_BY as "updatedBy",  <!-- 记录修改者 -->
-        UPDATED_NAME as "updatedName",  <!-- 记录修改名称 -->
-        UPDATED_TIME as "updatedTime",  <!-- 记录修改时间 -->
+        <!--ACCOUNT_CODE as "accountCode",   企业编码 -->
+        <!--DEP_CODE as "depCode",   部门编码 -->
         DELETE_FLAG as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
         COMPANY_CODE as "companyCode",  <!-- 公司编码 -->
         COMPANY_NAME as "companyName",  <!-- 公司名称 -->

src/main/webapp/HG/CB/HGCB001.jsp

@@ -28,7 +28,7 @@
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFComboColumn ename="companyCode" cname="公司名称" width="110" align="center"
                               filter="contains" readonly="true">
-                <EF:EFOptions blockId="companyBox_block_id" valueField="valueField" textField="textField"/>
+                <EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="accountYear" cname="会计年度" width="100" align="center" start="decade" depth="decade"
                          editType="date" dateFormat="yyyy" parseFormats="['yyyy']" required="true"/>

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

@@ -21,13 +21,29 @@ $(function() {
                     + 'onclick="fileDetailFunc(' + item.id + ')">附件详情</a>';
                 return template;
             }
-        }
-        ],
-        loadComplete: function (e) {
+        }],
+        loadComplete: function (grid) {
             $("#SELECT_BILL").on("click",addFunc);
-            $("#BTN_UPDATE").on("click",updateFunc);
+            //$("#BTN_UPDATE").on("click",updateFunc);
             $("#SUBMIT").on("click",submitFunc);
             $("#B_SAVE").on("click",saveFunc);
+            grid.dataSource.bind("change",function(e){
+                var item = e.items[0];
+                if(e.field == "taxPoints"){
+                    if(item.thisSettlementTax && item.totalContractPriceIncluding){
+                        let thisSettlementAmount = item.totalContractPriceIncluding / (item.taxPoints / 100 + 1);
+                        // 使用toFixed方法四舍五入到两位小数，并转换为数字
+                        thisSettlementAmount = Number(thisSettlementAmount.toFixed(2));
+                        resultGrid.setCellValue(item,'thisSettlementAmount',thisSettlementAmount)
+                    }
+                    if(item.taxPoints && item.totalContractPriceIncluding){
+                        let thisSettlementTax = item.totalContractPriceIncluding-item.thisSettlementAmount;
+                        // 使用toFixed方法四舍五入到两位小数，并转换为数字
+                        thisSettlementTax = Number(thisSettlementTax.toFixed(2));
+                        resultGrid.setCellValue(item,'thisSettlementTax',thisSettlementTax)
+                    }
+                }
+            })
         },
         onSuccess: function (e) {
             if (e.eiInfo.extAttr.methodName == 'save' || e.eiInfo.extAttr.methodName == 'delete') {
@@ -123,23 +139,7 @@ function saveFunc() {
     }
 }
 
-/**
- * 修改
- */
-function updateFunc() {
-    let rows = resultGrid.getCheckedRows();
-    if (rows.length != 1) {
-        message("请选择一条数据");
-        return;
-    }
-    JSColorbox.open({
-        href: "HGCW010B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW010",
-        title: "<div style='text-align: center;'>修改合同</div>",
-        width: "90%",
-        height: "90%",
-        callbackName: windowCallback
-    });
-}
+
 
 
 function windowCallback() {
@@ -151,7 +151,7 @@ function windowCallback() {
 
 function contractDetailFunc(id) {
     JSColorbox.open({
-        href: "HGCW012C?methodName=initLoad&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW010",
+        href: "HGCW012C?methodName=initLoad&inqu_status-0-id=" + id + "&efParentFormEname=HGCW012",
         title: "<div style='text-align: center;'>明细详情</div>",
         width: "90%",
         height: "90%",
@@ -161,7 +161,7 @@ function contractDetailFunc(id) {
 
 function fileDetailFunc(id) {
     JSColorbox.open({
-        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW010",
+        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012",
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

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

@@ -14,9 +14,13 @@
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
-            <EF:EFInput cname="供应商名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" />
-            <EF:EFInput cname="票据类型" ename="billTybe" blockId="inqu_status" row="0" colWidth="3" />
-            <EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="供应商名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" placeholder="模糊供应商名称"/>
+            <%--<EF:EFInput cname="票据类型" ename="billTybe" blockId="inqu_status" row="0" colWidth="3" />--%>
+            <EF:EFSelect cname="票据类型" ename="inqu_status-0-billTybe" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
+            </EF:EFSelect>
+            <EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" placeholder="模糊发票号"/>
             <EF:EFSelect cname="审核状态" ename="inqu_status-0-billState" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
@@ -38,8 +42,11 @@
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" />
             <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="true"  align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" />
-            <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"/>
+            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="true" readonly="false" align="center"/>
+            <EF:EFComboColumn ename="taxPoints" cname="税率" width="120" align="center" required="true"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="发票总额" width="120" enable="false" readonly="true" align="center"/>

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

@@ -6,8 +6,8 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 <head>
 </head>
-<EF:EFPage title="销售开票清单">
-    <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden"/>
+<EF:EFPage title="详情清单">
+    <EF:EFInput blockId="inqu_status" row="0" ename="id" cname="隐藏条件" type="hidden"/>
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>

src/main/webapp/HG/KC/HGKC013.js

@@ -87,6 +87,10 @@ $(function () {
                         return _.filter(options.values, function (item) {
                             return item["valueField"]===calloutCompanyCode;
                         })
+                    }else if (allotType === "2" && calloutCompanyCode){
+                        return _.filter(options.values, function (item) {
+                            return item["valueField"]!==calloutCompanyCode;
+                        })
                     }
                     return options.values;
                 },
@@ -106,8 +110,14 @@ $(function () {
                 filter: function (options) {
                     // let calloutCompanyCode = options.model['calloutCompanyCode'];
                     // let callinCompanyCode = options.model['callinCompanyCode'];
-                    // let calloutWhCode = options.model['calloutWhCode'];
-                    // if (callinCompanyCode == calloutCompanyCode){
+                    let calloutWhCode = options.model['calloutWhCode'];
+                    let allotType = options.model['allotType'];
+                    if (calloutWhCode && allotType === "1"){
+                        return _.filter(whInCodeBox, function (item) {
+                            return item["valueField"] != calloutWhCode;
+                        })
+                    }
+                     //if (callinCompanyCode == calloutCompanyCode){
                     //     return _.filter(whCodeBox, function (item) {
                     //         return item["param1Field"]===callinCompanyCode && item["valueField"]!=calloutWhCode;
                     //     })