Merge remote-tracking branch 'origin/dev' into dev

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

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.json

@@ -316,7 +316,7 @@
             "delay": 250
         },
         "server": {
-            "basePath": "http://192.168.0.181:8570",
+            "basePath": "http://192.168.0.181:8560",
             "urlPattern": "^\/api\/"
         }
     },

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/money/fundtransfer/deleteItem/',
+        deleteDetailUrl:'/api/fundtransfer/deleteItem/',
         columnWidth : 1,
         columns : [
             {

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

@@ -18,6 +18,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _readUrl: '/api/money/paybalance/read/',
     _saveUrl: '/api/money/paybalance/save/',
     _auditUrl: '/api/money/paybalance/audit/',
+    _unAuditUrl: 'api/money/paybalance/unAudit/',
     _deleteUrl: '/api/money/paybalance/delete/',
 
     // _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -19,8 +19,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _readUrl:'/api/purchase/prodinout/read/',
     _saveUrl:'/api/purchase/prodinout/save',
     _auditUrl:'/api/purchase/prodinout/audit',
-    _deleteUrl:'/api/purchase/prodinout/delete',
-    _baseVastUrl:'/api/purchase/prodinout/',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
+    _deleteUrl:'/api/purchase/prodinout/delete/',
     _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
 
     // _relationColumn: 'pd_piid',
@@ -106,7 +106,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _readUrl:'/api/purchase/prodinout/read/',
     _saveUrl:'/api/purchase/prodinout/save',
     _auditUrl:'/api/purchase/prodinout/audit',
-    _unAuditUrl:'/api/purchase/prodinout/unAudit',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
@@ -101,7 +101,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         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/',