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

src/main/java/com/baosight/hpjx/common/DdynamicEnum.java

@@ -14,19 +14,42 @@ package com.baosight.hpjx.common;
         *}});
  */
 public enum DdynamicEnum {
+    //------------------------------------配置管理-----------------------------------
     /**
      * 模块：供应商档案
-     * 用途：供应商档案下拉框.
-     * 编写：wwl.
+     * 用途：供应商档案下拉框
+     * 编写：wwl
      */
-    SUPPLIER_RECORD_BLOCK_ID("supplier_record_block_id","CUST_CODE","CUST_NAME","HPPZ002.queryComboBox"),
+    SUPPLIER_RECORD_BLOCK_ID("supplier_record_block_id","custCode","custName","HPPZ002.queryComboBox"),
 
     /**
      * 模块：客户档案
-     * 用途：客户档案下拉框.
-     * 编写：wwl.
+     * 用途：客户档案下拉框
+     * 编写：wwl
      */
-    CUSTOMER_RECORD_BLOCK_ID("customer_record_block_id","CUST_CODE","CUST_NAME","HPPZ003.queryComboBox");
+    CUSTOMER_RECORD_BLOCK_ID("customer_record_block_id","custCode","custName","HPPZ003.queryComboBox"),
+
+    /**
+     * 模块：存货名称
+     * 用途：存货名称下拉框
+     * 编写：wwl
+     */
+    INVENT_NAME_BLOCK_ID("invent_name_block_id","inventCode","inventName","HPPZ004.queryComboBox"),
+
+    /**
+     * 模块：仓库档案
+     * 用途：仓库档案下拉框
+     * 编写：wwl
+     */
+    WH_RECORD_BLOCK_ID("wh_record_block_id","whCode","whName","HPPZ007.queryComboBox"),
+
+    //------------------------------------生产管理-----------------------------------
+    /**
+     * 模块：项目档案
+     * 用途：项目档案下拉框
+     * 编写：wwl
+     */
+    PROJ_RECORD_BLOCK_ID("proj_record_block_id","projCode","projName","HPSC001.queryComboBox");
 
 
     /** 将结果集放入的块名  */

src/main/java/com/baosight/hpjx/common/InventTypeEnun.java

+package com.baosight.hpjx.common;
+
+import com.baosight.iplat4j.core.ei.EiBlock;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author wwl
+ * @Date 2024/1/10 14:29
+ */
+public enum InventTypeEnun {
+    MATERIAL(1,"原材料"),
+    CONSUMABLE(2,"耗材"),
+    SEMI_FINISHED_PRODUCT(2,"半成品"),
+    FINISHED_PRODUCT(2,"产成品");
+
+    private Integer code;
+
+    private String value;
+
+    InventTypeEnun(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static EiBlock generatorEiBlock() {
+        EiBlock block = new EiBlock("customer_type_block_id");
+        List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
+            add(new HashMap<String, Object>() {{
+                put(HPConstants.TEXT_FIELD, MATERIAL.code);
+                put(HPConstants.VALUE_FIELD, MATERIAL.value);
+            }});
+            add(new HashMap<String, Object>() {{
+                put(HPConstants.TEXT_FIELD, CONSUMABLE.code);
+                put(HPConstants.VALUE_FIELD, CONSUMABLE.value);
+            }});
+            add(new HashMap<String, Object>() {{
+                put(HPConstants.TEXT_FIELD, SEMI_FINISHED_PRODUCT.code);
+                put(HPConstants.VALUE_FIELD, SEMI_FINISHED_PRODUCT.value);
+            }});
+            add(new HashMap<String, Object>() {{
+                put(HPConstants.TEXT_FIELD, FINISHED_PRODUCT.code);
+                put(HPConstants.VALUE_FIELD, FINISHED_PRODUCT.value);
+            }});
+        }};
+        block.setRows(rows);
+        return block;
+    }
+}

src/main/java/com/baosight/hpjx/hp/pz/domain/THppz004.java

@@ -16,7 +16,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
 */
 public class THppz004 extends DaoEPBase {
 
-                private Integer id = 0;		
+                private Long id = 0L;
                 private String companyCode = " ";		/* 企业编码 预留*/
                 private String inventName = " ";		/* 存货名称*/
                 private String inventCode = " ";		/* 存货编码*/
@@ -87,20 +87,20 @@ public THppz004() {
 initMetaData();
 }
 
-        /**
-        * get the id 
-        * @return the id
-        */
-        public Integer getId() {
+    /**
+     * get the id
+     * @return the id
+     */
+    public Long getId() {
         return this.id;
-        }
+    }
 
-        /**
-        * set the id 
-        */
-        public void setId(Integer id) {
+    /**
+     * set the id
+     */
+    public void setId(Long id) {
         this.id = id;
-        }
+    }
         /**
         * get the companyCode - 企业编码 预留
         * @return the companyCode
@@ -246,7 +246,7 @@ initMetaData();
 */
 public void fromMap(Map map) {
 
-                setId(NumberUtils.toInteger(StringUtils.toString(map.get("id")), id));
+                setId(NumberUtils.toLong(StringUtils.toString(map.get("id")), id));
                 setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode));
                 setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("inventName")), inventName));
                 setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("inventCode")), inventCode));

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ003.xml

@@ -133,5 +133,19 @@
 			WHERE 	
 			ID = #id#
 	</update>
-  
+
+	<select id="queryComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		CUST_CODE as "custCode",
+		CUST_CNAME as "custName"
+		FROM hpjx.t_hppz003 WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="custType">
+			CUST_TYPE = #custType#
+		</isNotEmpty>
+		ORDER BY CUST_CODE
+	</select>
 </sqlMap>
\ No newline at end of file

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml

@@ -127,5 +127,20 @@
 		WHERE
 			ID = #id#
 	</update>
+
+	<select id="queryComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		INVENT_CODE as "inventCode",
+		INVENT_NAME as "inventName"
+		FROM hpjx.t_hppz004 WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
+		ORDER BY INVENT_CODE
+	</select>
   
 </sqlMap>
\ No newline at end of file

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ007.xml

@@ -131,5 +131,19 @@
 			WHERE 	
 			ID = #id#
 	</update>
-  
+
+	<select id="queryComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		WH_CODE	= #whCode#,
+		WH_NAME	= #whName#
+		FROM hpjx.t_hppz004 WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whType">
+			WH_TYPE = #whType#
+		</isNotEmpty>
+		ORDER BY WH_CODE
+	</select>
 </sqlMap>
\ No newline at end of file

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml

@@ -148,5 +148,20 @@
 			WHERE 	
 			ID = #id#
 	</update>
+
+	<select id="queryComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		PROJ_CODE	= #projCode#,
+		PROJ_NAME	= #projName#
+		FROM hpjx.t_hpsc001 WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projType">
+			PROJ_TYPE = #projType#
+		</isNotEmpty>
+		ORDER BY PROJ_CODE
+	</select>
   
 </sqlMap>
\ No newline at end of file

src/main/webapp/HP/PZ/HPPZ002.jsp

@@ -28,8 +28,8 @@
 
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
             <EF:EFComboColumn ename="custType" cname="供应商类型" align="center"
-                              columnTemplate="#=textField#-#=valueField#" optionLabel=" "
-                              itemTemplate="#=textField#-#=valueField#" textField="textField"
+                              columnTemplate="#=valueField#-#=textField#" optionLabel=" "
+                              itemTemplate="#=valueField#-#=textField#" textField="textField"
                               valueField="valueField" width="100" required="true">
                 <EF:EFOption label="--请选择--" value=""></EF:EFOption>
                 <EF:EFOption label="国企" value="1"></EF:EFOption>
@@ -38,8 +38,8 @@
             <EF:EFColumn ename="custCode" cname="供应商编码" width="100" readonly="false" required="true"/>
             <EF:EFColumn ename="custName" cname="供应商名称" width="100" readonly="false" required="true"/>
             <EF:EFColumn ename="address" cname="地址" width="100" readonly="false" required="true"/>
-            <EF:EFComboColumn ename="status" cname="状态" align="center"  columnTemplate="#=textField#-#=valueField#" optionLabel=" "
-                              itemTemplate="#=textField#-#=valueField#" textField="textField"
+            <EF:EFComboColumn ename="status" cname="状态" align="center"  columnTemplate="#=valueField#-#=textField#" optionLabel=" "
+                              itemTemplate="#=valueField#-#=textField#" textField="textField"
                               valueField="valueField" width="100" required="true">
                 <EF:EFOption label="--请选择--" value=""></EF:EFOption>
                 <EF:EFOption label="启用" value="1"></EF:EFOption>

src/main/webapp/HP/PZ/HPPZ004.js

@@ -40,7 +40,7 @@ $(function() {
                 });
 
                 // 修改
-                $("#UPDATE").on("click", function () {
+                $("#BTN_UPDATE").on("click", function () {
                     var rowCount = resultGrid.getCheckedRows();
                     // 检验是否选中数据
                     if (rowCount == null || rowCount == "") {

src/main/webapp/HP/PZ/HPPZ004.jsp

@@ -9,7 +9,10 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
-            <EF:EFInput ename="inqu_status-0-inventName" cname="存货类型" colWidth="4" readonly="false"/>
+            <EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="4">
+                <EF:EFOption label="--请选择--" value=""/>
+                <EF:EFOption label="待定" value="1"></EF:EFOption>
+            </EF:EFSelect>
             <EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4">
                 <EF:EFOption label="--请选择--" value=""/>
                 <EF:EFOption label="启用" value="1"></EF:EFOption>
@@ -24,9 +27,14 @@
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
             <EF:EFColumn ename="inventCode" cname="类型编码" width="100" readonly="false" required="true"/>
             <EF:EFColumn ename="inventName" cname="存货名称" width="100" readonly="false" required="true"/>
-            <EF:EFColumn ename="inventType" cname="存货类型" width="100" readonly="false" required="true"/>
-            <EF:EFComboColumn ename="status" cname="状态" align="center"  columnTemplate="#=textField#-#=valueField#" optionLabel=" "
-                              itemTemplate="#=textField#-#=valueField#" textField="textField"
+            <EF:EFComboColumn ename="inventType" cname="存货类型" align="center"  columnTemplate="#=valueField#-#=textField#" optionLabel=" "
+                              itemTemplate="#=valueField#-#=textField#" textField="textField"
+                              valueField="valueField" width="100" required="true">
+                <EF:EFOption label="--请选择--" value=""></EF:EFOption>
+                <EF:EFOption label="待定" value="1"></EF:EFOption>
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="status" cname="状态" align="center"  columnTemplate="#=valueField#-#=textField#" optionLabel=" "
+                              itemTemplate="#=valueField#-#=textField#" textField="textField"
                               valueField="valueField" width="100" required="true">
                 <EF:EFOption label="--请选择--" value=""></EF:EFOption>
                 <EF:EFOption label="启用" value="1"></EF:EFOption>