sap采购申请流程修改bug

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js

@@ -24,14 +24,14 @@ function initItemGrid() {
             UICtrl.addGridRow(itemGridManager,{ bnfpo: (itemGridManager.getData().length + 1)*10 ,pstyp:pstyp,badat:fillinDate,erdat:fillinDate});
         },
         deleteHandler: function (){
-            var _grid = UICtrl.getGridManager('#resourceGrid');
+            var _grid = UICtrl.getGridManager('#maingrid');
             DataUtil.delSelectedRows({
                 action: 'sapPurchaseItem/deleteSapPurchaseItem.ajax',
                 param: {},
                 gridManager: _grid,
                 idFieldName: 'id',
                 onSuccess: function () {
-                    reloadGird();
+                    reloadGrid();
                 }
             });
         },
@@ -39,7 +39,7 @@ function initItemGrid() {
         itemGridManager = UICtrl.grid('#maingrid', {
             columns: getGridColumns(),
             dataAction: 'server',
-            url: web_app.name + '/sapPurchaseItem/querySapPurchaseItems.ajax?',
+            url: web_app.name + '/sapPurchaseItem/querySapPurchaseItems.ajax',
             parms:{sapPurchaseId:getId()},
             height: '99.6%',
             heightDiff: -4,
@@ -55,6 +55,7 @@ function initItemGrid() {
             toolbar: toolbarOptions,
         }
     );
+    UICtrl.setSearchAreaToggle(itemGridManager);
 }
 
 function getGridColumns() {
@@ -66,7 +67,7 @@ function getGridColumns() {
         {display: "项次类别", name: "pstyp", width: "100", align: "left", type: "string"},
         {display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string",
             editor: {
-                required: true, type: "select",
+                required: false, type: "select",
                 data: {
                     type: 'system',
                     name: "knttp",
@@ -80,7 +81,7 @@ function getGridColumns() {
             }
         },
         {display: "工厂", name: "werks", width: "200", align: "left", type: "string",
-            editor: {required: true, type: "text"}
+            editor: {required: false, type: "text"}
         },
         {display: "工厂名称", name: "name1", width: "100", align: "left", type: "string"},
         {display: "物料编号", name: "matnr", width: "100", align: "left", type: "string",
@@ -99,34 +100,34 @@ function getGridColumns() {
         {display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",},
         {display: "库存地点名称", name: "lgobe", width: "100", align: "left", type: "string"},
         {display: "短文本", name: "txz01", width: "100", align: "left", type: "string",
-            editor: {required: true, type: "text"}
+            editor: {required: false, type: "text"}
         },
         {display: "物料组", name: "matkl", width: "100", align: "left", type: "string",
-            editor: {required: true, type: "text"}
+            editor: {required: false, type: "text"}
         },
         {display: "申购数量", name: "menge", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: true, type: "text",mask: '9999999.999'}
+            editor: {required: false, type: "text",mask: '9999999.999'}
         },
         {display: "申购数量单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: true, type: "text"}
+            editor: {required: false, type: "text"}
         },
         {display: "采购组", name: "ekgrp", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: true, type: "text"}
+            editor: {required: false, type: "text"}
         },
         {display: "申请日期", name: "badat", width: "100", align: "left", type: "string",
-            editor: {required: true, type: "date"}
+            editor: {required: false, type: "date"}
         },
         {display: "创建日期", name: "erdat", width: "100", align: "left", type: "string",
-            editor: {required: true, type: "date"}
+            editor: {required: false, type: "date"}
         },
         {display: "批准日期", name: "frgdt", width: "80", align: "left", type: "string",
-            editor: {required: true, type: "date"}
+            editor: {required: false, type: "date"}
         },
         {display: "要求交货日期", name: "lfdat", width: "100", align: "left", type: "string",
-            editor: {required: true, type: "date"}
+            editor: {required: false, type: "date"}
         },
         {display: "服务主数据编号", name: "srvpos", width: "80", align: "left", type: "string",
-            editor: {type: 'text', required: true},
+            editor: {type: 'text', required: false},
         },
         {display: "服务短文本", name: "ktext1", width: "100", align: "left", type: "string"},
         {display: "服务条目数量", name: "esllMenge", width: "80", align: "left", type: "string",
@@ -157,13 +158,13 @@ function getGridColumns() {
         },
         {display: "创建者", name: "ernam", width: "200", align: "left", type: "string"},
         {display: "申请人", name: "afnam", width: "90", align: "left", type: "string",
-            editor: {type: 'text', required: true},
+            editor: {type: 'text', required: false},
         },
         {display: "评估价格", name: "preis", width: "100", align: "left", type: "string",
-            editor: {type: 'text', mask: '9999999.99',required: true}
+            editor: {type: 'text', mask: '9999999.99',required: false}
         },
         {display: "价格基数", name: "ebanPeinh", width: "100", align: "left", type: "string",
-            editor: {type: 'text', mask: '9999999',required: true}
+            editor: {type: 'text', mask: '9999999',required: false}
         },
         {display: "币种", name: "waers", width: "100", align: "left", type: "string",
             editor: {type: 'text'}
@@ -269,11 +270,11 @@ function getId() {
 function setId(value) {
     $("#id").val(value);
     var _grid=UICtrl.getGridManager('#maingrid');
-    _grid.options.parms.quotationId = value;
+    _grid.options.parms.sapPurchaseId = value;
 }
 
-function reloadGird() {
-    itemGridManager.reload();
+function reloadGrid() {
+    itemGridManager.loadData();
 }
 
 function getGridData(){

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.jsp

@@ -31,7 +31,7 @@
                 <x:inputC name="banfn" label="采购申请编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>
             </div>
         </div>
-    </form>
         <div id="maingrid"></div>
+    </form>
 </div>
 </body>
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/SapPurchaseItemApplication.java

@@ -16,4 +16,6 @@ public interface SapPurchaseItemApplication {
     void saveSapPurchaseItems(String sapPurchaseId, List<SapPurchaseItem> sapPurchaseItems);
 
     Map<String,Object> querySapPurchaseItems(SapPurchaseItemQueryRequest queryRequest);
+
+    void deleteByIds(List<String> ids);
 }

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java

 package com.huigou.topsun.sap.purchase.application.impl;
 
-import com.huigou.cache.DictUtil;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.purchase.application.SapPurchaseApplication;
@@ -92,6 +91,7 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
     public Map<String, Object> slicedSapPurchaseList(SapPurchaseQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapPurchaseList");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        queryModel.putDictionary("status", BizBillStatus.getMap());
         return this.sqlExecutorDao.executeSlicedQuery(queryModel);
     }
 

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseItemApplicationImpl.java

@@ -43,4 +43,11 @@ public class SapPurchaseItemApplicationImpl extends BaseApplication implements S
         }
         return map;
     }
+
+    @Override
+    public void deleteByIds(List<String> ids) {
+        ids.forEach(id->{
+            sapPurchaseItemRepository.delete(id);
+        });
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/purchase/controller/SapPurchaseController.java

@@ -44,7 +44,7 @@ public class SapPurchaseController extends CommonController {
     }
 
     public String forwardSapPurchaseDetail(){
-        this.putAttribute("processDefinitionKey", LeaveApplication.PROCESS_DEFINITION_KEY);
+        this.putAttribute("processDefinitionKey", SapPurchaseApplication.PROCESS_DEFINITION_KEY);
         // 新增的时候procUnitId一定要设置成Apply，不然jsp页面的所有表单元素是readonly状态
         this.putAttribute("procUnitId", "Apply");
         SapPurchase sapPurchase = new SapPurchase();
@@ -59,7 +59,7 @@ public class SapPurchaseController extends CommonController {
 
     public String showSapPurchaseDetail(){
         SDO sdo = this.getSDO();
-        String id = sdo.getId();
+        String id = sdo.getBizId();
         SapPurchase sapPurchase = sapPurchaseApplication.loadSapPurchase(id);
         return forward("sapPurchaseDetail",sapPurchase);
     }

topsun/src/main/java/com/huigou/topsun/sap/purchase/controller/SapPurchaseItemController.java

@@ -34,6 +34,13 @@ public class SapPurchaseItemController extends CommonController {
         return toResult(map);
     }
 
+    public String deleteSapPurchaseItem(){
+        SDO sdo = this.getSDO();
+        List<String> ids = sdo.getIds();
+        sapPurchaseItemApplication.deleteByIds(ids);
+        return success();
+    }
+
 /*    @SkipAuth
     public String test(){
         SDO sdo = this.getSDO();