优化

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js

@@ -168,8 +168,8 @@ function loadNonProdApplyListGrid() {
 
 function initBasicInfoMaintenance(){
     //如果是货源专员角色，显示信息填报按钮
-    var roleCodes = $("#roleCodes").val();
-    if (roleCodes.indexOf('hyzy') > -1){
+    var roleCode = $("#roleCode").val();
+    if (roleCode.indexOf('hyzy') > -1){
         $("#toolbar_menubasicInfoMaintenance").show()
     }else {
         $("#toolbar_menubasicInfoMaintenance").hide()

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp

@@ -13,7 +13,7 @@
     <div class="ui-hide">
         <x:select name="processType" dictionary="processType"/>
         <x:select name="yesorno" dictionary="yesorno"/>
-        <x:hidden name="roleCodes"/>
+        <x:hidden name="roleCode"/>
     </div>
     <div id="layout">
         <!--div position="center" title="非半成品类物料主数据维护申请表查询"-->

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java

@@ -59,7 +59,8 @@ public class NonProdApplyController extends CommonController {
         this.putAttribute("statusKindsList", BillStatus.getValidMap());
         List<String> roleIds = this.getOperator().getRoleIds();
         List<String> roleCodes = roleRepository.findAll(roleIds).stream().map(Role::getCode).collect(Collectors.toList());
-        this.putAttribute("roleCodes", roleCodes);
+        String roleCode = String.join(",", roleCodes);
+        this.putAttribute("roleCode", roleCode);
         return forward("nonProdApplyList");
     }
 

topsun/target/classes/config/topsun/base/function.xml

@@ -38,7 +38,7 @@
 			SELECT o.FULL_ID, o.FULL_NAME
 			 FROM sa_oporg o WHERE o.PARENT_ID IN (
 			 SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) )
-			 AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ' );
+			 AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ','ZR','DTAB' );
 		</sql>
 
 		<!--根据业务主表id和业务表名查询对应申请人的二级部门领导-->
@@ -48,7 +48,7 @@
 			  SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN (
 			   SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN (
 			    SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) ) )
-			 AND o.CODE IN ( 'JL', 'ZZ' ));
+			 AND o.CODE IN ( 'JL', 'ZZ','FL' ));
 		</sql>
 		<!--根据业务主表id和业务表名查询对应申请人的一级部门领导-->
 		<sql name="queryyjbmld">
@@ -60,6 +60,38 @@
 			     o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) ) ) )
 			  AND o.CODE IN ( 'JL', 'ZZ' ,'ZJ'));
 		</sql>
-	</query>
 
+		<sql name="findPersonMember">
+			SELECT o.FULL_ID, o.FULL_NAME
+			 FROM sa_oporg o LEFT JOIN sap_cost_reimbursement_base_info t ON t.person_member_id = o.id WHERE t.id = ?
+		</sql>
+
+		<sql name="fundApproval">
+			SELECT o.FULL_ID, o.FULL_NAME
+			 FROM sa_oporg o LEFT JOIN mes_produce_exception t ON t.approval_code = o.code WHERE t.id = ?
+		</sql>
+
+		<sql name="findResponsibleException">
+			SELECT check_operator full_id,check_operator_name full_name	 from sap_exception_report  t  WHERE t.id = ?
+		</sql>
+		<sql name="findDepartException">
+			SELECT duty_dept full_id,duty_dept_name full_name from sap_exception_report  t  WHERE t.id = ?
+		</sql>
+
+		<!--查询ECN执行人-->
+		<sql name="fundECNItemApproval">
+			SELECT o.FULL_ID, o.FULL_NAME FROM sa_oporg o
+			 LEFT JOIN ep_change_form_impl_item ii ON ii.executor_id = o.id
+			 LEFT JOIN ep_change_form cf ON cf.id = ii.ep_change_form_id
+			 WHERE cf.id = ?
+		</sql>
+
+		<!--查询ECN库存执行人-->
+		<sql name="fundECNStockItemApproval">
+			SELECT o.FULL_ID, o.FULL_NAME FROM sa_oporg o
+			 LEFT JOIN ep_change_form_stock_item si ON si.executor_id = o.id
+			 LEFT JOIN ep_change_form cf ON cf.id = si.ep_change_form_id
+			 WHERE cf.id = ?
+		</sql>
+	</query>
 </query-mappings>
\ No newline at end of file