主页 任务展示 3

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

+var gridManager = null;
+
+$(document).ready(function () {
+    initializateUI()
+    loadNonProdApplyListGrid();
+})
+function initializateUI() {
+    UICtrl.layout("#layout", {leftWidth: 3});
+}
+function loadNonProdApplyDeptListGrid() {
+
+    var toolbarOptions = UICtrl.getDefaultToolbarOptions({
+        deleteHandler: deleteHandler
+    });
+    gridManager = UICtrl.grid("#nonProdApplyDeptListGrid", {
+        columns: [
+            {display: "申请单编号", name: "billCode", width: 60, minWidth: 60, type: "string", align: "left"},
+            {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
+            {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "维护类型", name: "maintenanceTypeTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "批准人", name: "approver", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "批准日期", name: "approvalDate", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "通用品名", name: "genericName", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "适用标准", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "版式", name: "design", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "尺码", name: "size", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "品牌", name: "brand", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "用途", name: "materialUsage", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "物品属性", name: "itemAttributesTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "业务用途", name: "businessUsageTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
+
+        ],
+        dataAction: "server",
+        url: web_app.name + '/sapNonProdApply/slicedNonProdApplyList.ajax',
+        pageSize: 20,
+        usePager: true,
+        toolbar: toolbarOptions,
+        width: "100%",
+        height: "100%",
+        heightDiff: -8,
+        checkbox: true,
+        async: false,
+        fixedCellHeight: true,
+        selectRowButtonOnly: true,
+        onDblClickRow: function (data, rowindex, rowobj) {
+            doView(data.id);
+        },
+        onAfterShowData: function (data){
+            console.log(data)
+        }
+    });
+    UICtrl.setSearchAreaToggle(gridManager);
+}
+
+
+function query(obj) {
+    var param = $(obj).formToJSON();
+    UICtrl.gridSearch(gridManager, param);
+}
+function reloadGrid() {
+    gridManager.loadData();
+}
+
+function resetForm(obj) {
+    $(obj).formClean();
+}
+
+
+
+
+//删除按钮
+function deleteHandler() {
+    DataUtil.del({
+        action: 'sapNonProdApply/deleteNonProdApply.ajax',
+        gridManager: gridManager, idFieldName: 'id',
+        onSuccess: function () {
+            reloadGrid();
+        }
+    });
+}
+
+function addHandler() {
+    UICtrl.addTabItem({
+        tabid: 'nonProdApply',
+        text: "非产品/非本成品类物料主数据维护申请",
+        url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job'
+    });
+}
+
+function doView(id) {
+    UICtrl.addTabItem({
+        tabid: 'showNonProdApply'+id,
+        text: "非产品/非本成品类物料主数据维护申请详情",
+        url: web_app.name + '/sapNonProdApply/showNonProdApply.job?bizId='+id+"&isDetailPage=true"
+    });
+}
+
+// function next(){
+//     UICtrl.addTabItem({
+//         tabid: 'showNonProdApplyNext',
+//         text: "非产品/非本成品类物料主数据维护申请详情",
+//         url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?isDetailPage=true'
+//     });
+// }
\ No newline at end of file

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

+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <x:base include="layout,dialog,grid,tree,combox,commonTree"/>
+    <x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyList.js'/>
+</head>
+<body>
+<div class="container-fluid">
+    <%--    <x:button value="next" onclick="next()" icon="fa-save"/>--%>
+    <div class="ui-hide">
+        <x:select name="processType" dictionary="processType"/>
+        <x:select name="yesorno" dictionary="yesorno"/>
+    </div>
+    <div id="layout">
+        <div position="center" title="非本成品类物料部门数据维护查询">
+            <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
+            <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
+                <x:inputC name="proofingApplyNo" required="false" label="申请单号" labelCol="1"/>
+                <x:searchButtons/>
+            </form>
+            <div class="blank_div clearfix"></div>
+            <div id="nonProdApplyDeptListGrid" style="margin: 2px;"></div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file

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

@@ -34,6 +34,7 @@ function loadNonProdApplyListGrid() {
     gridManager = UICtrl.grid("#nonProdApplyListGrid", {
         columns: [
             {display: "申请单编号", name: "billCode", width: 60, minWidth: 60, type: "string", align: "left"},
+            {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/WorkflowApplicationImplOverride.java → topsun/src/main/java/com/huigou/topsun/base/WorkflowApplicationImplOverride.java

-package com.huigou.topsun.sap.nonProdApply.controller;
+package com.huigou.topsun.base;
 
 import com.huigou.context.Operator;
 import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
@@ -24,14 +24,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * 优先注入此类
+ * 优先注入此类替换huigou包下该类型bean
  */
 @Primary
 @Service

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/BsnMessage.java

@@ -57,6 +57,14 @@ public class BsnMessage implements Serializable {
     @Column(name = "finished_date")
     private Date finishedDate;
 
+
+    /**
+     * 驳回信息
+     */
+    @Column(name = "reject_msg")
+    private String rejectMsg;
+
+
     /**
      *任务执行地址
      */

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/query/BsnMessageQueryRequest.java

@@ -55,6 +55,11 @@ public class BsnMessageQueryRequest extends QueryAbstractRequest {
 
     private Date finishedDate;
 
+    /**
+     * 携带信息
+     */
+    @Column(name = "reject_msg")
+    private String rejectMsg;
 
     private String executorUrl;
 

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/repository/BsnMessageRepository.java

@@ -5,6 +5,11 @@ import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+
+import java.util.List;
+
 public interface BsnMessageRepository extends JpaRepository<BsnMessage,String> {
 
+    List<BsnMessage> findAllByBusinessId(String BusinessId);
+
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java

@@ -19,7 +19,7 @@ public interface NonProdApplyDeptApplication {
      * 编辑详细信息
      * @param sdo
      */
-    void saveSapNonProdApplyDept(SDO sdo);
+    Map<String,Object> saveSapNonProdApplyDept(SDO sdo);
 
     /**
      * 更改分发状态
@@ -28,4 +28,10 @@ public interface NonProdApplyDeptApplication {
    void distributeSapNonProdApplyDept(SDO sdo);
 
    SapNonProdApplyDept getNonProdApplyDeptById(String id);
+
+    /**
+     * 驳回相关的部门
+     * @param sdo
+     */
+    void rejectNonProdApplyDept(SDO sdo);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -106,6 +106,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
         model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
         model.putDictionary("businessUsage", DictUtil.getDictionary("serviceusage"));
+        model.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
         return this.sqlExecutorDao.executeSlicedQuery(model);
 
     }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -3,6 +3,8 @@ package com.huigou.topsun.sap.nonProdApply.application.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
+import com.huigou.topsun.base.bsnMessage.repository.BsnMessageRepository;
 import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcess;
 import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
 
@@ -14,16 +16,22 @@ import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class NonProdApplyDeptApplicationImpl extends BaseApplication implements NonProdApplyDeptApplication {
 
     @Autowired
     NonProdApplyDeptRepository nonProdApplyDeptRepository;
+    @Autowired
+    BsnMessageRepository bsnMessageRepository;
 
     @Override
-    public void saveSapNonProdApplyDept(SDO sdo) {
+    public Map<String,Object> saveSapNonProdApplyDept(SDO sdo) {
+        Map<String,Object> map = new HashMap<>();
         SapNonProdApplyDept nonProdApplyDept = sdo.toObject(SapNonProdApplyDept.class);
         ObjectMapper objectMapper = new ObjectMapper();
         String deptStaffJSON = sdo.getString("deptStaff");
@@ -31,15 +39,35 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
 //        });
         SapNonProdApplyDept save = nonProdApplyDeptRepository.save(nonProdApplyDept);
 
+        map.put("applyDeptId",save.getApplyDeptId());
+        return map;
     }
 
     @Override
     public void distributeSapNonProdApplyDept(SDO sdo) {
-        this.saveSapNonProdApplyDept(sdo);
+        Map<String, Object> map = this.saveSapNonProdApplyDept(sdo);
+        List<BsnMessage> nonProdApplyDeptList = bsnMessageRepository.findAllByBusinessId((String) map.get("applyDeptId"));
+        nonProdApplyDeptList.forEach(item->item.setActive(0));
+        bsnMessageRepository.save(nonProdApplyDeptList);
     }
 
     @Override
     public SapNonProdApplyDept getNonProdApplyDeptById(String id) {
         return nonProdApplyDeptRepository.findOne(id);
     }
+
+    @Override
+    public void rejectNonProdApplyDept(SDO sdo) {
+        String septString = sdo.getString("dept");
+        //需要被驳回的部门
+        List<String> deptList = Arrays.asList(septString.split(","));
+        String bdid = sdo.getString("表单的id");
+        //更改状态此对象为驳回状态
+        SapNonProdApplyDept one = nonProdApplyDeptRepository.findOne(bdid);
+        one.setStatus(2);
+        nonProdApplyDeptRepository.save(one);
+        //获取此条数据的相关部门信息
+        List<BsnMessage> allByBusinessId = bsnMessageRepository.findAllByBusinessId(bdid);
+
+    }
 }

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

@@ -12,9 +12,15 @@ import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
 import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.common.BizBillStatus;
+import com.huigou.uasp.bmp.common.easysearch.EasySearch;
+import com.huigou.uasp.bmp.common.easysearch.domain.model.EasySearchParse;
+import com.huigou.uasp.bmp.common.easysearch.domain.model.QuerySchemeField;
+import com.huigou.uasp.bmp.opm.application.MemEasySearcher;
+import com.huigou.uasp.bmp.opm.application.impl.MemEasySearcherImpl;
 import com.huigou.uasp.client.CommonController;
 import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Controller;
 
 import java.util.*;
@@ -76,9 +82,8 @@ public class NonProdApplyNextController extends CommonController {
      */
     public String distributeSapNonProdApplyDept(){
         SDO sdo = this.getSDO();
-        SapNonProdApplyDept nonProdApplyDept = sdo.toObject(SapNonProdApplyDept.class);
-//        nonProdApplyDeptApplication.saveSapNonProdApplyDept(sdo);
-        return toResult(nonProdApplyDept);
+        nonProdApplyDeptApplication.distributeSapNonProdApplyDept(sdo);
+        return success();
     }
 
     /**
@@ -88,10 +93,46 @@ public class NonProdApplyNextController extends CommonController {
     public String fillInNonProdApplyDept(){
         SDO sdo = this.getSDO();
         String id = sdo.getBizId();
+        Map<String, String> map = DictUtil.getDictionary("serviceusage");
+        this.putAttribute("bu",map);
         this.putAttribute("isReadOnly","false");
+
         SapNonProdApplyDept nonProdApplyDept = nonProdApplyDeptApplication.getNonProdApplyDeptById(id);
         return forward("nonProdApplyNext",nonProdApplyDept);
     }
+
+
+    @EasySearch(queryName = "userNameSelect")
+    public Map<String, Object> queryResourceNameGroup(SDO sdo){
+//        Integer intPage = sdo.getInteger("intPage", 1);
+//        Integer pageSize = sdo.getInteger("pageSize",10);
+//        PageRequest pageRequest = new PageRequest(intPage - 1, pageSize);
+//        List<QuerySchemeField> fields =
+//                Arrays.asList(new QuerySchemeField("id", "id", "hidden"),
+//                        new QuerySchemeField("资源名称", "gxmc", "string", 200L),
+//                        new QuerySchemeField("资源编码", "gxbm", "string", 100L),
+//                        new QuerySchemeField("单位", "dw", "string", 100L),
+//                        new QuerySchemeField("用量", "yl", "string", 100L),
+//                        new QuerySchemeField("工作中心", "gzzx", "string", 100L));
+//        EasySearchParse easySearchParse = new EasySearchParse();
+//        easySearchParse.setFields(fields);
+//        easySearchParse.setWidth(450L);
+//        String processType = sdo.getString("paramValue");
+////        List<Map<String, Object>> mapList = resourceFiledService.getResourceFieldValueListByProcess(processType);
+//        MemEasySearcher<Map<String, Object>> memEasySearcher = new MemEasySearcherImpl<>();
+//        Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
+//        return model;
+        return null;
+    }
+
+
+    public void rejectNonProdApplyDept(){
+        SDO sdo = this.getSDO();
+        String septString = sdo.getString("dept");
+        //需要被驳回的部门
+        List<String> deptList = Arrays.asList(septString.split(","));
+
+    }
 }
 
 

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

@@ -25,7 +25,8 @@ public class SapNonProdApplyDept implements Serializable {
             name = "system-uuid",
             strategy = "guid"
     )
-    private String id;
+    @Column(name = "apply_dept_id")
+    private String applyDeptId;
 
     /**
      * 主表id
@@ -33,6 +34,12 @@ public class SapNonProdApplyDept implements Serializable {
     @Column(name = "base_info_id")
     private String baseInfoId;
 
+    /**
+     * 状态（0：未分发，1：待检查，2：已驳回，3：已完成）
+     */
+    private int status;
+
+
     /**
      * 物料编码
      */