MES质量评审增加用户组来选择审批人

huigou-xt/src/main/webapp/system/opm/organization/SelectOrgCommonPage.js

 (function ($) {
+	var queryURL = '/org/slicedQueryOrgs.ajax';
 	
 	$.selectOrgCommon=function(dialog,params,div){
 		var obj =new selectOrgCommon(params,div);
@@ -188,6 +189,14 @@
 	    		$('div.chooseByGroup',g.div).hide();
 	            $('div.orgSelectLayoutLeft',g.div).addClass('dom-overflow');
 	        	$('div.orgQueryGridDiv',g.div).show();
+				if(g._selectableType.isOrg){
+					queryURL = '/org/slicedQueryOrgs.ajax';
+				}else {
+					queryURL = "/unqualifiedMaterials/slicedQueryUserGroupDetails.ajax"
+				}
+				if (g.orgQueryGridManager != null){
+					g.orgQueryGridManager.options.url = web_app.name + queryURL;
+				}
 	    	}else{
 	    		$('div.orgSelectLayoutLeft',g.div).removeClass('dom-overflow');
 	    		$('div.orgQueryGridDiv',g.div).hide();
@@ -352,7 +361,7 @@
 	                    }
 	                }
 	            ],
-	            url: web_app.name + '/org/slicedQueryOrgs.ajax',
+	            url: web_app.name + queryURL,
 	            parms: _param,
 	            height: $('div.orgQueryGrid',g.div).parent().height(),
 	            heightDiff: -13,

topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsDetail.js

@@ -30,6 +30,17 @@ function getExtendedData(processAction) {
 function checkConstraints(){
     var handleOpinion = $("#handleOpinion").val();
     $("#handleOpinion").val($("#result_text").val() + "-" + handleOpinion)
+
+    var defaultResult = $("#defaultResult").val();
+    var result = $("#result").val();
+    var hasDecide = $("#hasDecide").val();
+    // if (Public.isNotBlank(defaultResult) && Public.isNotBlank(result) && defaultResult != result && hasDecide != "1"){
+    //     counterSign();
+    //     $("#hasDecide").val("1");
+    //     save("SAVE",null);
+    //     Public.tip("评审结果不一致，请添加裁决");
+    //     return false;
+    // }
     return true;
 }
 

topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsDetail.jsp

@@ -23,6 +23,8 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <x:hidden name="statusId"/>
+    <x:hidden name="defaultResult"/>
+    <x:hidden name="hasDecide"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:inputC name="mblnr" required="false" readonly="true" label="物料凭证号" labelCol="2" fieldCol="2"/>

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/application/UnqualifiedMaterialsApplication.java

 package com.huigou.topsun.mes.unqualifiedMaterials.application;
 
+import com.huigou.data.domain.query.CodeAndNameQueryRequest;
 import com.huigou.topsun.mes.unqualifiedMaterials.domain.UnqualifiedMaterials;
 import com.huigou.topsun.mes.unqualifiedMaterials.domain.query.UnqualifiedMaterialsQueryRequest;
 import com.huigou.topsun.mes.unqualifiedMaterials.domain.vo.UnqualifiedMaterialsVo;
@@ -23,4 +24,6 @@ public interface UnqualifiedMaterialsApplication {
     Map<String, Object> slicedUnqualifiedMaterialsList(UnqualifiedMaterialsQueryRequest queryRequest);
 
     void saveMesUnqualifiedMaterialsVo(UnqualifiedMaterialsVo unqualifiedMaterialsVo);
+
+    Map<String, Object> slicedQueryUserGroupAllDetails(CodeAndNameQueryRequest queryRequest);
 }

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/application/impl/UnqualifiedMaterialsApplicationImpl.java

@@ -8,6 +8,7 @@ import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.context.ThreadLocalUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
+import com.huigou.data.domain.query.CodeAndNameQueryRequest;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.mes.unqualifiedMaterials.application.UnqualifiedMaterialsApplication;
@@ -127,8 +128,8 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
                 unqualifiedMaterialsItemRepository.save(materialsItem);
             }
 
-            //清空，下次赋值
-            //unqualifiedMaterials.setResult(null);
+            //赋值上一个节点的评审结论
+            unqualifiedMaterials.setDefaultResult(unqualifiedMaterials.getResult());
             this.unqualifiedMaterialsRepository.save(unqualifiedMaterials);
         }
     }
@@ -280,6 +281,14 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
         this.startProcessInstance(UnqualifiedMaterialsApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
     }
 
+    @Override
+    public Map<String, Object> slicedQueryUserGroupAllDetails(CodeAndNameQueryRequest queryRequest) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "systemGroupAllDetail");
+        QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
+        return map;
+    }
+
     public String startProcessInstance(String processDefinitionKey,Map<String, Object> formData, SDO localSdo){
         Map<String, Object> variables = new HashMap();
         // 将业务数据传递给工作流

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/controller/UnqualifiedMaterialsController.java

@@ -2,6 +2,7 @@ package com.huigou.topsun.mes.unqualifiedMaterials.controller;
 
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
+import com.huigou.data.domain.query.CodeAndNameQueryRequest;
 import com.huigou.topsun.mes.unqualifiedMaterials.application.UnqualifiedMaterialsApplication;
 import com.huigou.topsun.mes.unqualifiedMaterials.domain.UnqualifiedMaterials;
 import com.huigou.topsun.mes.unqualifiedMaterials.domain.UnqualifiedMaterialsItem;
@@ -16,6 +17,7 @@ import com.huigou.uasp.client.CommonController;
 import com.huigou.util.ClassHelper;
 import com.huigou.util.JSONUtil;
 import com.huigou.util.SDO;
+import com.huigou.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -123,4 +125,15 @@ public class UnqualifiedMaterialsController extends CommonController {
         return outputAndProcUnitHandlerPDF(pintPage, id, map);
     }
 
+    public String slicedQueryUserGroupDetails() {
+        SDO params = this.getSDO();
+        String paramValue = params.getString("paramValue");
+        CodeAndNameQueryRequest queryRequest = params.toQueryRequest(CodeAndNameQueryRequest.class);
+        if (StringUtil.isNotBlank(paramValue)){
+            queryRequest.setName(paramValue);
+        }
+        Map<String, Object> map = unqualifiedMaterialsApplication.slicedQueryUserGroupAllDetails(queryRequest);
+        return toResult(map);
+    }
+
 }

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/domain/UnqualifiedMaterials.java

@@ -103,12 +103,24 @@ public class UnqualifiedMaterials extends FlowBillAbstractEntity {
     @Column(name = "submitter_name")
     private String submitterName;
 
+    /**
+     * 默认处理结果（来自上一个节点）
+     */
+    @Column(name = "default_result")
+    private String defaultResult;
+
     /**
      * 处理结果
      */
     @Column(name = "result")
     private String result;
 
+    /**
+     * 是否裁决 1是，0否
+     */
+    @Column(name = "has_decide")
+    private String hasDecide;
+
     /**
      * MES返回状态码
      */

topsun/src/main/resources/config/topsun/mes/unqualifiedMaterials/unqualifiedMaterials.xml

@@ -7,4 +7,22 @@
         <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
     </query>
+
+    <query name="systemGroupAllDetail" label="查询用户分组">
+        <sql-query>
+            SELECT o.id,
+            o.NAME,
+            o.full_id,
+            o.full_name,
+            o.full_sequence,
+            o.org_kind_id,
+            o.person_id,
+            o.STATUS,
+            d.sequence
+            FROM sa_usergroupdetail d left join sa_usergroup up on d.GROUP_ID = up.ID
+            left join sa_oporg o on d.org_id = o.id
+            WHERE o.`STATUS`  = 1
+        </sql-query>
+        <condition column="name" name="name" symbol="like" alias="up"/>
+    </query>
 </query-mappings>
\ No newline at end of file