Browse Source

修改出入库代码

zhoudw 7 years ago
parent
commit
7100f1bcd7

+ 1 - 1
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();
     }
 

+ 1 - 1
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 "";
         }
     }

+ 1 - 1
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();
     }
 

+ 1 - 1
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 "";
         }
     }

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

@@ -16,12 +16,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'purchase/prodinout/read/',
-    _saveUrl:basePath+'purchase/prodinout/save',
-    _auditUrl:basePath+'purchase/prodinout/audit',
-    _unAuditUrl:basePath+'purchase/prodinout/unAudit/',
-    _deleteUrl:basePath+'purchase/prodinout/delete/',
-    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
+    _readUrl:'/api/purchase/prodinout/read/',
+    _saveUrl:'/api/purchase/prodinout/save',
+    _auditUrl:'/api/purchase/prodinout/audit',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
+    _deleteUrl:'/api/purchase/prodinout/delete/',
+    _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:8800/prodinout/read/',

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

@@ -16,11 +16,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'purchase/prodinout/read/',
-    _saveUrl:basePath+'purchase/prodinout/save',
-    _auditUrl:basePath+'purchase/prodinout/audit',
-    _unAuditUrl:basePath+'purchase/prodinout/unAudit/',
-    _deleteUrl:basePath+'purchase/prodinout/delete/',
+    _readUrl:'/api/purchase/prodinout/read/',
+    _saveUrl:'/api/purchase/prodinout/save',
+    _auditUrl:'/api/purchase/prodinout/audit',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
+    _deleteUrl:'/api/purchase/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:8800/prodinout/read/',

+ 2 - 1
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',

+ 2 - 2
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/',

+ 2 - 2
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/',