Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/ProdInOutController.java

@@ -142,7 +142,7 @@ public class ProdInOutController {
      */
     @PostMapping("/batchUnAudit")
     public Result batchUnAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
-        prodInOutService.batchAudit(baseDTOs);
+        prodInOutService.batchUnAudit(baseDTOs);
         return Result.success();
     }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -300,7 +300,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,prodInOutDTO.getPi_inoutno());
             //日志
-            messageLogService.audit(docBaseDTO);
+            messageLogService.unAudit(docBaseDTO);
             return "";
         }
     }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -163,4 +163,8 @@ public class SaleController {
         return Result.success();
     }
 
+    @GetMapping("/test")
+    public String test() {
+        return "配置构建success";
+    }
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/controller/ProdInOutController.java

@@ -142,7 +142,7 @@ public class ProdInOutController {
      */
     @PostMapping("/batchUnAudit")
     public Result batchUnAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
-        prodInOutService.batchAudit(baseDTOs);
+        prodInOutService.batchUnAudit(baseDTOs);
         return Result.success();
     }
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInoutServiceImpl.java

@@ -292,7 +292,7 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,prodInOutDTO.getPi_inoutno());
             //日志
-            messageLogService.audit(docBaseDTO);
+            messageLogService.unAudit(docBaseDTO);
             return "";
         }
     }

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -243,8 +243,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     },
     onCloseOrder:function(me){
         console.log("关闭订单");
+        me.up('grid').vastOperation("batchClose");
     },onOpenOrder:function(me){
         console.log("开启订单");
+        me.up('grid').vastOperation("batchOpen");
     },
     onDelete: function (btn) {
         btn.up('grid').vastOperation("batchDelete");

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
-        deleteDetailUrl:'/api/fundtransfer/deleteItem/',
+        deleteDetailUrl:'/api/money/fundtransfer/deleteItem/',
         columnWidth : 1,
         columns : [
             {

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -19,7 +19,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     _readUrl:'/api/storage/prodinout/read/',
     _saveUrl:'/api/storage/prodinout/save',
     _auditUrl:'/api/storage/prodinout/audit',
-    _deleteUrl:'/api/storage/prodinout/delete',
+    _unAuditUrl: '/api/storage/prodinout/unAudit/',
+    _deleteUrl:'/api/storage/prodinout/delete/',
 
 
     // _relationColumn: 'pd_piid',

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -20,8 +20,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     _readUrl:'/api/storage/prodinout/read/',
     _saveUrl:'/api/storage/prodinout/save',
     _auditUrl:'/api/storage/prodinout/audit',
-    _unAuditUrl: '/api/storage/prodinout/unAudit',
-    _deleteUrl:'/api/storage/prodinout/delete',
+    _unAuditUrl: '/api/storage/prodinout/unAudit/',
+    _deleteUrl:'/api/storage/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:9000/prodinout/read/',

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -19,8 +19,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     _readUrl: '/api/storage/prodinout/read/',
     _saveUrl: '/api/storage/prodinout/save',
     _auditUrl: '/api/storage/prodinout/audit',
-    _unAuditUrl: '/api/storage/prodinout/unAudit',
-    _deleteUrl: '/api/storage/prodinout/delete',
+    _unAuditUrl: '/api/storage/prodinout/unAudit/',
+    _deleteUrl: '/api/storage/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:9000/prodinout/read/',