2024-06-06 更改库存预警查询逻辑

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC012.java

@@ -27,8 +27,6 @@ public class HGKC012 extends HGKC010{
 
     private BigDecimal warnNum = new BigDecimal("0");		/* 预警数量*/
 
-    private String princ = " ";		/* 负责人*/
-
     /**
      * initialize the metadata.
      */
@@ -76,28 +74,10 @@ public class HGKC012 extends HGKC010{
      * @param map - source data map
      */
 
-    /**
-     * get the princ - 负责人.
-     * @return the princ
-     */
-    public String getPrinc() {
-        return this.princ;
-    }
-
-    /**
-     * set the princ - 负责人.
-     *
-     * @param princ - 负责人
-     */
-    public void setPrinc(String princ) {
-        this.princ = princ;
-    }
-
     @Override
     public void fromMap(Map map) {
         super.fromMap(map);
         setWarnNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WARN_NUM)), warnNum));
-        setPrinc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRINC)), princ));
     }
 
     /**
@@ -108,7 +88,6 @@ public class HGKC012 extends HGKC010{
 
         Map map = super.toMap();
         map.put(FIELD_WARN_NUM, StringUtils.toString(warnNum, eiMetadata.getMeta(FIELD_WARN_NUM)));
-        map.put(FIELD_PRINC, StringUtils.toString(princ, eiMetadata.getMeta(FIELD_PRINC)));
         return map;
     }
 }

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC012.xml

@@ -31,8 +31,8 @@
         A.INV_WEIGHT as "invWeight",  <!-- 库存重量 -->
         A.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
         A.FACTORY_NAME as "factoryName", <!-- 厂区名称 -->
-        B.WARN_NUM as warnNum, <!-- 预警值 -->
-        C.PRINC as "princ"  <!-- 负责人 -->
+        B.WARN_NUM as warnNum <!-- 预警值 -->
+        <!-- C.PRINC as "princ"   负责人 -->
     </sql>
 
     <sql id="authCondition">
@@ -106,7 +106,6 @@
         SELECT <include refid="column"/>
         FROM ${hggpSchema}.HGKC010 A
         INNER JOIN ${hggpSchema}.HGPZ010 B ON A.SPEC_ID = B.INVENT_RECORD_ID
-        LEFT JOIN ${hggpSchema}.hgpz007 C ON A.WH_CODE = C.WH_CODE
         WHERE A.INV_QTY &lt;= B.WARN_NUM
         <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="spec">

src/main/webapp/HG/KC/HGKC012.jsp

@@ -46,14 +46,14 @@
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
             <EF:EFColumn ename="inventRecordId" cname="存货档案ID" hidden="true"/>
-            <EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
-                <EF:EFOptions blockId="invent_type_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFComboColumn>
             <EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               blockName="wh_record_block_id" textField="textField" valueField="valueField"
                               filter="contains">
             </EF:EFComboColumn>
+            <EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
+                <EF:EFOptions blockId="invent_type_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFComboColumn>
             <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               blockName="invent_record_block_id" textField="textField" valueField="valueField"
@@ -65,11 +65,9 @@
             <EF:EFColumn ename="warnNum" cname="预警值" enable="false" width="90" align="right" format="{0:N0}"/>
             <EF:EFColumn ename="invQty" cname="库存数量" enable="false" width="90" align="right" format="{0:N0}"/>
             <EF:EFColumn ename="invWeight" cname="库存重量（T）" enable="false" width="90" align="right" format="{0:N3}"/>
-            <EF:EFComboColumn ename="princ" cname="仓库负责人" width="120" align="center"  enable="false"
+            <%--<EF:EFComboColumn ename="princ" cname="仓库负责人" width="120" align="center"  enable="false"
                               blockName="user_block_id" textField="textField" valueField="valueField"
-                              columnTemplate="#=textField#" itemTemplate="#=textField#"
-                              filter="contains">
-            </EF:EFComboColumn>
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" filter="contains" />--%>
             <%--<EF:EFColumn ename="princ" cname="仓库负责人" width="120" align="center"/>--%>
 
             <%--			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>