2024-07-05 1.原材料入库成本核算 2.原材料出库成本核算 3.收发存汇总查询

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

@@ -29,6 +29,7 @@ public class ServiceHGCB003 extends ServiceEPBase {
     public EiInfo initLoad(EiInfo inInfo) {
         try {
             inInfo = super.initLoad(inInfo, EiConstant.resultBlock, new HGCB003());
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
             EiInfoUtils.addBlock(inInfo,"company_code_block_id", UserSessionUtils.getRoleCompany(), Company.class);
         }catch (Exception e){
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");

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

@@ -37,7 +37,7 @@
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
             <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
             <EF:EFColumn ename="accountCode" cname="企业编码" hidden="true"/>
-            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+            <EF:EFComboColumn ename="companyCode" cname="公司名称" enable="false"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="200" required="true"
@@ -46,29 +46,29 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="accountPeriod" cname="会计期" enable="false" width="120" align="center"
                          editType="date" dateFormat="yyyy-MM" parseFormats="['yyyyMM']" required="true"/>
-            <EF:EFComboColumn ename="bizType" cname="业务类型" width="120" enable="true" align="center" required="true">
+            <EF:EFComboColumn ename="bizType" cname="业务类型" width="120" enable="false" align="center" required="true">
                 <EF:EFCodeOption codeName="hggp.hgcb.bizType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
+            <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date" enable="false"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
             <EF:EFColumn ename="receiptCode" cname="单据号" enable="false" width="140" align="center" required="true"/>
-            <EF:EFComboColumn ename="whCode" cname="仓库名称"
+            <EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="140" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="inventCode" cname="存货编码" width="120" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="inventName" cname="存货名称" width="120" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="spec" cname="规格" width="120" enable="true" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="inventCode" cname="存货编码" width="120" enable="false" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="inventName" cname="存货名称" width="120" enable="false" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="spec" cname="规格" width="120" enable="false" readonly="true" align="center" required="true"/>
             <%--<EF:EFComboColumn ename="spec" cname="规格" enable="true" width="120" align="center" required="true"
                               blockName="spec_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>--%>
-            <EF:EFColumn ename="unit" cname="单位" width="100" enable="true" readonly="false" align="center"/>
-            <EF:EFColumn ename="quantity" cname="数量" width="120" enable="true" format="{0:N3}" editType="text"
+            <EF:EFColumn ename="unit" cname="单位" width="100" enable="false" readonly="false" align="center"/>
+            <EF:EFColumn ename="quantity" cname="数量" width="120" enable="false" format="{0:N3}" editType="text"
                          displayType="0.000" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
                          data-regex="/^-?[0-9]{1,15}?$/"
                          data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
@@ -76,7 +76,7 @@
                          displayType="0.000" sort="true" align="right" maxLength="17" required="true" defaultValue="0"
                          data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
-            <EF:EFComboColumn ename="isEstimate" cname="是否暂估" width="100" enable="true" align="center" required="true">
+            <EF:EFComboColumn ename="isEstimate" cname="是否暂估" width="100" enable="false" align="center" required="true">
                 <EF:EFCodeOption codeName="hggp.common.yesNo"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="price" cname="单价" width="120" enable="true" format="{0:N3}" editType="text"

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

@@ -38,37 +38,37 @@
             <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
             <EF:EFColumn ename="accountCode" cname="企业编码" hidden="true"/>
             <%--<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="80" align="center"/>--%>
-            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+            <EF:EFComboColumn ename="companyCode" cname="公司名称" enable="false"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_code_block_id" textField="companyName" valueField="companyCode"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="accountPeriod" cname="会计期" enable="false" width="120" align="center"
                          editType="date" dateFormat="yyyy-MM" parseFormats="['yyyyMM']"/>
-            <EF:EFComboColumn ename="bizType" cname="业务类型" width="120" enable="true" align="center" required="true">
+            <EF:EFComboColumn ename="bizType" cname="业务类型" width="120" enable="false" align="center" required="true">
                 <EF:EFCodeOption codeName="hggp.hgsj.computeType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
+            <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date" enable="false"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
             <EF:EFColumn ename="receiptCode" cname="单据号" enable="false" width="120" align="center"/>
-            <EF:EFComboColumn ename="whCode" cname="仓库名称"
+            <EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="140" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="wh_code_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="inventCode" cname="存货编码" width="120" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="inventName" cname="存货名称" width="120" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFComboColumn ename="spec" cname="规格" enable="true" width="120" align="center" required="true"
+            <EF:EFColumn ename="inventCode" cname="存货编码" width="120" enable="false" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="inventName" cname="存货名称" width="120" enable="false" readonly="true" align="center" required="true"/>
+            <EF:EFComboColumn ename="spec" cname="规格" enable="false" width="120" align="center" required="true"
                               blockName="spec_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFColumn ename="unit" cname="单位" width="80" enable="true" readonly="false" align="center"/>
-            <EF:EFColumn ename="quantity" cname="数量" width="100" enable="true" format="{0:N3}" editType="text"
+            <EF:EFColumn ename="unit" cname="单位" width="80" enable="false" readonly="false" align="center"/>
+            <EF:EFColumn ename="quantity" cname="数量" width="100" enable="false" format="{0:N3}" editType="text"
                          displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,15}?$/"
                          data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
@@ -76,7 +76,7 @@
                          displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
-            <EF:EFComboColumn ename="isEstimate" cname="是否暂估" width="80" enable="true" align="center" hidden="true" required="true">
+            <EF:EFComboColumn ename="isEstimate" cname="是否暂估" width="80" enable="false" align="center" hidden="true" required="true">
                 <EF:EFCodeOption codeName="hggp.common.yesNo"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="price" cname="单价" width="100" enable="true" format="{0:N3}" editType="text"

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

@@ -65,7 +65,7 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>--%>
-            <EF:EFColumn ename="inventRecordId" cname="规格ID" width="80" enable="true" readonly="false" type="hidden" align="center"/>
+            <EF:EFColumn ename="inventRecordId" cname="规格ID" width="80" enable="true" readonly="false" hidden="true" align="center"/>
             <EF:EFColumn ename="initQuantity" cname="期初数量" width="100" enable="true" format="{0:N0}" editType="text"
                          displayType="0" sort="true" align="right" maxLength="15" required="false" defaultValue="0"
                          data-regex="/^-?[0-9]{1,15}?$/"