更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -224,9 +224,9 @@ public class CommonUserController {
             for (int i = 0; i < workflowSteps.size(); i++) {
                 if (!StringUtils.isEmpty(branch)) {
                     if ("zt".equals(branch)) {
-                        if(i == 0 && workflow.getBusinessCode().equals("FEIYONGGUANLI-APPROVE")){
-                            i= 4;
-                        }
+//                        if(i == 0 && workflow.getBusinessCode().equals("FEIYONGGUANLI-APPROVE")){
+//                            i= 4;
+//                        }
                         if (workflowSteps.get(i).getBranchNodeLocation()!= null
                                 &&"BEGIN".equals(workflowSteps.get(i).getBranchNodeLocation().name())
                                 && !StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())
@@ -234,6 +234,12 @@ public class CommonUserController {
                             biaoshi = 1;
                         }
                         if(biaoshi ==1){
+                            //去除内勤审核的显示 （暂行）
+                            if(workflowSteps.get(i).getAuditRoles() != null
+                            &&workflowSteps.get(i).getAuditRoles().equals("b96299bb5dcf461e916b72b64c6943b0")){
+                                continue;
+                            }
+
                             NewWorkflowStep newWorkflowStep = new NewWorkflowStep();
                             BeanUtils.copyProperties(workflowSteps.get(i), newWorkflowStep);
                             if ("ALL".equals(String.valueOf(workflowSteps.get(i).getCountersignType()))) {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -555,7 +555,8 @@
         </if>
         AND wpsi.id IS NOT NULL
         GROUP BY
-        wpsi.goods_name_key;
+        wpsi.goods_name
+        order by wpsi.goods_name_key
     </select>
 
     <!-- 获得储量柱形图 -->