2024-05-18 优化工艺流程和工序单价

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

@@ -190,7 +190,7 @@ public enum DdynamicEnum {
      * 用途：工序编码下拉框
      * 编写：ly
      */
-    PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","unit","HGSJ001.queryProcessCode"),
+    PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","unit", "status","deleteFlag","HGSJ001.queryProcessCode"),
     /**
      * 模块：设备台账编码
      * 用途：设备区域下拉框

src/main/java/com/baosight/hggp/hg/sj/domain/HGSJ001.java

@@ -42,7 +42,7 @@ public class HGSJ001 extends DaoEPBase {
 	public static final String FIELD_STANDARD_DAYS = "standardDays";    		/* 标准人天*/
 	public static final String FIELD_STANDARD_NUM = "standardNum";    		/* 标准工序人数*/
 	public static final String FIELD_PRINC = "princ";    		/* 负责人*/
-	public static final String FIELD_STATUS = "status";    		/* 状态0.启用1.停止*/
+	public static final String FIELD_STATUS = "status";    		/* 状态0.停止1.启用*/
 
 	public static final String COL_ID = "ID";    		/* 主键id*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码 预留*/
@@ -63,7 +63,7 @@ public class HGSJ001 extends DaoEPBase {
 	public static final String COL_STANDARD_DAYS = "STANDARD_DAYS";    		/* 标准人天*/
 	public static final String COL_STANDARD_NUM = "STANDARD_NUM";    		/* 标准工序人数*/
 	public static final String COL_PRINC = "PRINC";    		/* 负责人*/
-	public static final String COL_STATUS = "STATUS";    		/* 状态0.启用1.停止*/
+	public static final String COL_STATUS = "STATUS";    		/* 状态0.停止1.启用*/
 
 	public static final String QUERY = "HGSJ001.query";
 	public static final String COUNT = "HGSJ001.count";
@@ -92,7 +92,7 @@ public class HGSJ001 extends DaoEPBase {
 	private BigDecimal standardDays = new BigDecimal("0");		/* 标准人天*/
 	private BigDecimal standardNum = new BigDecimal("0");		/* 标准工序人数*/
 	private String princ = " ";		/* 负责人*/
-	private Integer status = 0;	/* 状态0.启用1.停止*/
+	private Integer status = 0;	/* 状态0.停止1.启用*/
 
 	/**
 	 * initialize the metadata.
@@ -187,7 +187,7 @@ public class HGSJ001 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_STATUS);
-		eiColumn.setDescName("状态0.启用1.停止");
+		eiColumn.setDescName("状态0.停止1.启用");
 		eiMetadata.addMeta(eiColumn);
 
 

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ003.java

@@ -202,6 +202,7 @@ public class ServiceHGSJ003 extends ServiceEPBase {
         param.put(HGSJ003.FIELD_FACTORY_CODE, map.get("orgEname"));
         param.put(HGSJ003.FIELD_FACTORY_NAME, map.get("orgCname"));
         param.put(HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+        param.put(HGSJ003.FIELD_STATUS, CommonConstant.YesNo.YES_1);
         //param.put("orgType", OrgTypeEnum.COMPANY.getCode());
         //param.put("loginName",UserSession.getLoginName());
         param.put(HGSJ003.FIELD_ACCOUNT_CODE,UserSessionUtils.getAccountCode());

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

@@ -22,7 +22,7 @@
 		STANDARD_DAYS	as "standardDays",  <!-- 标准人天 -->
 		STANDARD_NUM	as "standardNum",  <!-- 标准工序人数 -->
 		PRINC	as "princ",  <!-- 负责人 -->
-		STATUS	as "status" <!-- 状态0.启用1.停止 -->
+		STATUS	as "status" <!-- 状态0.停止1.启动 -->
 	</sql>
 
     <sql id="authCondition">
@@ -217,7 +217,7 @@
 										STANDARD_DAYS,  <!-- 标准人天 -->
 										STANDARD_NUM,  <!-- 标准工序人数 -->
 										PRINC,  <!-- 负责人 -->
-										STATUS  <!-- 状态0.启用1.停止 -->
+										STATUS  <!-- 状态0.停止1.启动 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #processCode#, #processName#, #unit#, #standardJob#, #standardDays#, #standardNum#, #princ#, #status#)
 	</insert>
@@ -260,7 +260,7 @@
 					STANDARD_DAYS	= #standardDays#,   <!-- 标准人天 -->
 					STANDARD_NUM	= #standardNum#,   <!-- 标准工序人数 -->
 					PRINC	= #princ#,   <!-- 负责人 -->
-					STATUS	= #status#  <!-- 状态0.启用1.停止 -->
+					STATUS	= #status#  <!-- 状态0.停止1.启动 -->
 		WHERE
 			ID = #id#
 	</update>
@@ -278,14 +278,16 @@
 
 	<select id="queryProcessCode" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT
-		PROCESS_CODE	as "processCode",  <!-- 工序编码 -->
-		CONCAT('[',FACTORY_NAME,']',PROCESS_NAME)	as "processName",  <!-- 工序名称 -->
-		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
-		FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
-		UNIT AS "unit"
+			PROCESS_CODE	as "processCode",  <!-- 工序编码 -->
+			CONCAT('[',FACTORY_NAME,']',PROCESS_NAME)	as "processName",  <!-- 工序名称 -->
+			FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
+			FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+			UNIT AS "unit",
+			STATUS as "status",
+			DELETE_FLAG	as "deleteFlag"
 		FROM ${hggpSchema}.HGGY001 WHERE 1=1
 		<include refid="condition" />
-		group by PROCESS_CODE,PROCESS_NAME,FACTORY_CODE,FACTORY_NAME,UNIT
+		group by PROCESS_CODE,PROCESS_NAME,FACTORY_CODE,FACTORY_NAME,UNIT,STATUS,DELETE_FLAG
 	</select>
 
 	<!--查询用户所在的公司-->
@@ -295,10 +297,16 @@
 		a.ORG_CNAME as "orgCname"
 		from ${platSchema}.txsog01 a
 		left join ${platSchema}.txsog02 b on a.ORG_ID = b.ORG_ID
-		where
-		a.ACCOUNT_CODE = #accountCode#
-		and a.ORG_TYPE = #orgType#
-		<!--and b.USER_ID = #userId#-->
+		where 1=1
+		<isNotEmpty prepend=" AND " property="accountCode">
+			a.ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend="AND" property="orgType">
+			a.ORG_TYPE = #orgType#
+		</isNotEmpty>
+		<isNotEmpty prepend="AND" property="userId">
+			b.USER_ID = #userId#
+		</isNotEmpty>
 	</select>
 
 </sqlMap>

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

@@ -370,6 +370,9 @@
 		<isNotEmpty prepend=" AND " property="deleteFlag">
 			DELETE_FLAG = #deleteFlag#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
+		</isNotEmpty>
 	</select>
 	
 	<select id="queryCompanyCode" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">

src/main/webapp/HG/SJ/HGSJ001.jsp

@@ -47,18 +47,15 @@
             <EF:EFColumn ename="standardJob" cname="标准作业" width="120" enable="true" format="{0:N0}" editType="number"
                          displayType="0" sort="true" align="right" required="true"
                          data-regex="/^-?[0-9]{1,15}?$/" maxLength="15"
-                         data-errorprompt="请输入数字，该值最大可设置15位整数！"
-            />
+                         data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
             <EF:EFColumn ename="standardDays" cname="标准人天" width="120" enable="true" format="{0:N0}" editType="number"
                          displayType="0" sort="true" align="right"
                          data-regex="/^-?[0-9]{1,15}?$/" maxLength="20" required="true"
-                         data-errorprompt="请输入数字，该值最大可设置15位整数！"
-            />
+                         data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
             <EF:EFColumn ename="standardNum" cname="标准工序人数" width="120" enable="true" format="{0:N0}" editType="number"
                          displayType="0" sort="true" align="right"
                          data-regex="/^-?[0-9]{1,15}?$/" maxLength="20" required="true"
-                         data-errorprompt="请输入数字，该值最大可设置15位整数！"
-            />
+                         data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
             <EF:EFComboColumn ename="princ" cname="负责人"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"

src/main/webapp/HG/SJ/HGSJ002A.js

@@ -34,6 +34,12 @@ $(function (){
                     },
                 },*/{
                     field: "processCode",
+                    filter: function (options) {
+                            // 返回我们过滤后的数据集
+                        return _.filter(processCodes, function (item) {
+                            return item["param4Field"]== "true" && item["param5Field"] == "false";
+                        })
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < processCodes.length; i++) {
                             if (processCodes[i]['valueField'] === dataItem['processCode']) {

src/main/webapp/HG/SJ/HGSJ003.js

@@ -57,10 +57,12 @@ $(function (){
                             // 返回我们过滤后的数据集
                             /*return options.values[0][province];*/
                             return _.filter(processCodes, function (item) {
-                                return item["param1Field"]==factoryCode;
+                                return item["param1Field"]==factoryCode && item["param4Field"]== "true" && item["param5Field"] == "false";
                             })
                         } else {
-                            return processCodes;
+                            return _.filter(processCodes, function (item) {
+                                return item["param4Field"]== "true" && item["param5Field"] == "false";
+                            })
                         }
                     },
                     template: function (dataItem) {