2024-05-08 优化工序单价

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

@@ -42,6 +42,7 @@
 	</sql>
 
 	<sql id="condition">
+		<include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
@@ -89,6 +90,26 @@
 		</isNotEmpty>
 	</sql>
 
+	<sql id="authCondition">
+		<!-- 无权限时使用 -->
+		<isNotEmpty prepend=" AND " property="authDepCode">
+			DEP_CODE = #authDepCode#
+		</isNotEmpty>
+		<!-- 仅本人和部门组合 -->
+		<isEqual prepend=" AND " property="authCombination" compareValue="1">
+			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
+		</isEqual>
+		<!-- 仅本人或部门 -->
+		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
+			<isNotEmpty property="authOnlyPeople">
+				CREATED_BY = #authOnlyPeople#
+			</isNotEmpty>
+			<isNotEmpty property="authDepCodes">
+				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
+			</isNotEmpty>
+		</isNotEqual>
+	</sql>
+
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.sj.domain.HGSJ002">
 		SELECT

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

@@ -59,6 +59,7 @@
 	</sql>
 
 	<sql id="condition">
+		<include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
@@ -133,6 +134,26 @@
 		</isNotEmpty>
 	</sql>
 
+	<sql id="authCondition">
+		<!-- 无权限时使用 -->
+		<isNotEmpty prepend=" AND " property="authDepCode">
+			DEP_CODE = #authDepCode#
+		</isNotEmpty>
+		<!-- 仅本人和部门组合 -->
+		<isEqual prepend=" AND " property="authCombination" compareValue="1">
+			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
+		</isEqual>
+		<!-- 仅本人或部门 -->
+		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
+			<isNotEmpty property="authOnlyPeople">
+				CREATED_BY = #authOnlyPeople#
+			</isNotEmpty>
+			<isNotEmpty property="authDepCodes">
+				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
+			</isNotEmpty>
+		</isNotEqual>
+	</sql>
+
 	<sql id="customCondition">
 		<isNotEmpty prepend=" AND " property="ids">
 			ID IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>

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

@@ -37,8 +37,8 @@ $(function (){
                     template: function (dataItem) {
                         for (let i = 0; i < processCodes.length; i++) {
                             if (processCodes[i]['valueField'] === dataItem['processCode']) {
-                                dataItem['processName'] = processCodes[i]['textField'];
-                                return processCodes[i]['textField'];
+                                dataItem['processName'] = processCodes[i]['textField'].split("]")[1];
+                                return processCodes[i]['textField'].split("]")[1];
                             }
                         }
                         return dataItem['processCode'];

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

@@ -66,8 +66,8 @@ $(function (){
                     template: function (dataItem) {
                         for (let i = 0; i < processCodes.length; i++) {
                             if (processCodes[i]['valueField'] === dataItem['processCode']) {
-                                dataItem['processName'] = processCodes[i]['textField'];
-                                return processCodes[i]['textField'];
+                                dataItem['processName'] = processCodes[i]['textField'].split("]")[1];
+                                return processCodes[i]['textField'].split("]")[1];
                             }
                         }
                         return dataItem['processCode'];
@@ -217,7 +217,7 @@ $(function (){
     }
 
     //工厂类型下拉联动
-    $('input[name="inqu_status-0-factoryCode"]').change(function () {
+    /*$('input[name="inqu_status-0-factoryCode"]').change(function () {
         let dataEdition= processCodes;
         var factoryCode=$("#inqu_status-0-factoryCode").val();
         if (factoryCode){
@@ -234,7 +234,7 @@ $(function (){
             dataSource: dataEdition,
             template: "#=textField#"
         });
-    });
+    });*/
 
     //grush.downloadFile(`${ctx}\\DC\\BB\\template\\DCAMIN02_附加费用管理.xls`);
 })

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

@@ -19,10 +19,11 @@
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
-            <EF:EFSelect blockId="inqu_status" row="0" ename="processCode" cname="工序名称" colWidth="3" filter="contains">
+            <%--<EF:EFSelect blockId="inqu_status" row="0" ename="processCode" cname="工序名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFSelect>
+            </EF:EFSelect>--%>
+            <EF:EFInput blockId="inqu_status" row="0" ename="processName" cname="工序名称"  colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpjx.status"/>