zhuth 7 anni fa
parent
commit
6ce52208a5
29 ha cambiato i file con 101 aggiunte e 100 eliminazioni
  1. 5 5
      frontend/saas-web/app/view/document/product/BasePanel.js
  2. 1 1
      frontend/saas-web/app/view/money/payBalance/FormPanelController.js
  3. 1 1
      frontend/saas-web/app/view/money/payBalance/QueryPanelController.js
  4. 2 2
      frontend/saas-web/app/view/money/recBalance/FormPanelController.js
  5. 2 2
      frontend/saas-web/app/view/money/recBalance/QueryPanelController.js
  6. 2 2
      frontend/saas-web/app/view/purchase/purchase/FormPanelController.js
  7. 1 1
      frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js
  8. 15 15
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js
  9. 1 1
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js
  10. 1 1
      frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js
  11. 1 1
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js
  12. 1 1
      frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js
  13. 1 1
      frontend/saas-web/app/view/sale/sale/FormPanelController.js
  14. 1 1
      frontend/saas-web/app/view/sale/sale/QueryPanelController.js
  15. 1 1
      frontend/saas-web/app/view/sale/saleIn/FormPanelController.js
  16. 1 1
      frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js
  17. 1 1
      frontend/saas-web/app/view/sale/saleOut/FormPanelController.js
  18. 1 1
      frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js
  19. 11 11
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js
  20. 8 8
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js
  21. 1 1
      frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js
  22. 3 2
      frontend/saas-web/app/view/stock/make/FormPanelController.js
  23. 1 1
      frontend/saas-web/app/view/stock/make/QueryPanelController.js
  24. 12 12
      frontend/saas-web/app/view/stock/otherIn/FormPanel.js
  25. 6 6
      frontend/saas-web/app/view/stock/otherIn/FormPanelController.js
  26. 1 1
      frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js
  27. 12 12
      frontend/saas-web/app/view/stock/otherOut/FormPanel.js
  28. 6 6
      frontend/saas-web/app/view/stock/otherOut/FormPanelController.js
  29. 1 1
      frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

+ 5 - 5
frontend/saas-web/app/view/document/product/BasePanel.js

@@ -43,15 +43,15 @@ Ext.define('saas.view.document.product.BasePanel', {
     //字段属性
     _formXtype:'document-product-formpanel',
     _title:'物料资料',
-    // _dataUrl:'http://192.168.253.31:9480/product/list',
-    _batchOpenUrl:'http://192.168.253.31:9480/product/batchOpen',
-    _batchCloseUrl:'http://192.168.253.31:9480/product/batchClose',
-    _batchDeleteUrl:'http://192.168.253.31:9480/product/batchDelete',
+    // _dataUrl: basePath + 'document/product/list',
+    _batchOpenUrl: basePath + 'document/product/batchOpen',
+    _batchCloseUrl: basePath + 'document/product/batchClose',
+    _batchDeleteUrl: basePath + 'document/product/batchDelete',
 
     gridConfig: {
         idField: 'id',
         codeField: 'pr_code',
-        dataUrl: 'http://192.168.253.31:9480/product/list',
+        dataUrl: basePath + 'document/product/list',
         columns : [{
             text : "id", 
             width : 0, 

+ 1 - 1
frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: 'http://192.168.253.31:9480/customer/list',
+                        dataUrl: basePath + 'document/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

+ 1 - 1
frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

+ 2 - 2
frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: 'http://192.168.253.31:9480/customer/list',
+                        dataUrl: basePath + 'document/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'
@@ -64,7 +64,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: 'http://192.168.253.31:9480/customer/list',
+                        dataUrl: basePath + 'document/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

+ 2 - 2
frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/list',
+                        dataUrl: basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

+ 2 - 2
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
@@ -132,7 +132,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

+ 1 - 1
frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -15,21 +15,21 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
     
-    // _relationColumn: 'pd_piid',
-    // _readUrl:basePath+'purchase/prodinout/read/',
-    // _saveUrl:basePath+'purchase/prodinout/save',
-    // _auditUrl:basePath+'purchase/prodinout/audit',
-    // _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
-    // _baseVastUrl:basePath+'purchase/prodinout/',
-    // _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
-
     _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:8800/prodinout/read/',
-    _saveUrl:'http://localhost:8800/prodinout/save',
-    _auditUrl:'http://localhost:8800/prodinout/audit',
-    _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    _baseVastUrl:'http://localhost:8800/prodinout/',
-    _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
+    _readUrl:basePath+'purchase/prodinout/read/',
+    _saveUrl:basePath+'purchase/prodinout/save',
+    _auditUrl:basePath+'purchase/prodinout/audit',
+    _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
+    _baseVastUrl:basePath+'purchase/prodinout/',
+    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
+
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:8800/prodinout/read/',
+    // _saveUrl:'http://localhost:8800/prodinout/save',
+    // _auditUrl:'http://localhost:8800/prodinout/audit',
+    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:8800/prodinout/',
+    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
 
 
 
@@ -115,7 +115,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         storeModel:'saas.model.document.ProductDTO',
         _deleteDetailUrl:'http://localhost:8800/prodinout/deleteItem/',
         // _deleteUrl:basePath+'purchase/prodinout/delete/',
-        _detnoColumn:  'pd_pdno',
+        detnoColumn:  'pd_pdno',
         columns : [
             {
                 text : "id", 

+ 1 - 1
frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
+                        // dataUrl:basePath+'document/product/list',
                         dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          

+ 1 - 1
frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

+ 1 - 1
frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
+                        // dataUrl:basePath+'document/product/list',
                         dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          

+ 1 - 1
frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

+ 1 - 1
frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[
                         {
                             from:'pr_code',to:'sd_prodcode'

+ 1 - 1
frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode',
                             from:'pr_detail',to:'pr_detail'

+ 1 - 1
frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -63,7 +63,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'

+ 1 - 1
frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

+ 1 - 1
frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'

+ 1 - 1
frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -65,7 +65,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-    //  _relationColumn: 'pd_piid',
-    //  _readUrl:basePath+'storage/prodinout/read/',
-    //  _saveUrl:basePath+'storage/prodinout/save',
-    //  _auditUrl:basePath+'storage/prodinout/audit',
-    //  _deleteUrl:basePath+'storage/prodinout/delete/',
+     _relationColumn: 'pd_piid',
+     _readUrl:basePath+'storage/prodinout/read/',
+     _saveUrl:basePath+'storage/prodinout/save',
+     _auditUrl:basePath+'storage/prodinout/audit',
+     _deleteUrl:basePath+'storage/prodinout/delete/',
 
 
-     _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:9000/prodinout/read/',
-     _saveUrl:'http://localhost:9000/prodinout/save',
-     _auditUrl:'http://localhost:9000/prodinout/audit',
-     _deleteUrl:'http://localhost:9000/prodinout/delete/',
-     _baseVastUrl:'http://localhost:9000/prodinout/',
+    //  _relationColumn: 'pd_piid',
+    //  _readUrl:'http://localhost:9000/prodinout/read/',
+    //  _saveUrl:'http://localhost:9000/prodinout/save',
+    //  _auditUrl:'http://localhost:9000/prodinout/audit',
+    //  _deleteUrl:'http://localhost:9000/prodinout/delete/',
+    //  _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
 

+ 8 - 8
frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -15,8 +15,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                        dataUrl:'http://localhost:9480/vendor/list',
+                        dataUrl:basePath+'document/vendor/list',
+                        // dataUrl:'http://localhost:9480/vendor/list',
                         dbfinds:[{
                             from:'ve_id',to:'pi_vendid'
                         },{
@@ -69,8 +69,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
-                        dataUrl:'http://localhost:9480/product/list',
+                        dataUrl:basePath+'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -130,8 +130,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/warehouse/list',
-                    dataUrl:'http://localhost:9480/warehouse/list',
+                    dataUrl:basePath+'document/warehouse/list',
+                    // dataUrl:'http://localhost:9480/warehouse/list',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{
@@ -173,8 +173,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
         'dbfindtrigger[name=pd_inwhname]':{
          beforerender:function(f){
              Ext.apply(f,{
-                 // dataUrl:basePath+'document/warehouse/list',
-                 dataUrl:'http://localhost:9480/warehouse/list',
+                 dataUrl:basePath+'document/warehouse/list',
+                //  dataUrl:'http://localhost:9480/warehouse/list',
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          
                  },{

+ 1 - 1
frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

+ 3 - 2
frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -70,7 +70,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
@@ -132,7 +132,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
+                        // dataUrl:'http://192.168.253.31:9480/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

+ 1 - 1
frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-    //  _relationColumn: 'pd_piid',
-    // _readUrl:basePath+'storage/prodinout/read/',
-    // _saveUrl:basePath+'storage/prodinout/save',
-    // _auditUrl:basePath+'storage/prodinout/audit',
-    // _deleteUrl:basePath+'storage/prodinout/delete/',
-    // _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+     _relationColumn: 'pd_piid',
+    _readUrl:basePath+'storage/prodinout/read/',
+    _saveUrl:basePath+'storage/prodinout/save',
+    _auditUrl:basePath+'storage/prodinout/audit',
+    _deleteUrl:basePath+'storage/prodinout/delete/',
+    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
 
-    _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:9000/prodinout/read/',
-    _saveUrl:'http://localhost:9000/prodinout/save',
-    _auditUrl:'http://localhost:9000/prodinout/audit',
-    _deleteUrl:'http://localhost:9000/prodinout/delete/',
-    _baseVastUrl:'http://localhost:9000/prodinout/',
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:9000/prodinout/read/',
+    // _saveUrl:'http://localhost:9000/prodinout/save',
+    // _auditUrl:'http://localhost:9000/prodinout/audit',
+    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
     initId:0,

+ 6 - 6
frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -15,8 +15,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
         'dbfindtrigger[name=pu_vendcode]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                    dataUrl:'http://localhost:9480/vendor/list',
+                    dataUrl:basePath+'document/vendor/list',
+                    // dataUrl:'http://localhost:9480/vendor/list',
                     dbfinds:[{
                         from:'ve_id',to:'pi_vendid'
                     },{
@@ -69,8 +69,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
-                        dataUrl:'http://localhost:9480/product/list',
+                        dataUrl:basePath+'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -130,8 +130,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/warehouse/list',
-                    dataUrl:'http://localhost:9480/warehouse/list',
+                    dataUrl:basePath+'document/warehouse/list',
+                    // dataUrl:'http://localhost:9480/warehouse/list',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{

+ 1 - 1
frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-    //  _relationColumn: 'pd_piid',
-    //  _readUrl:basePath+'storage/prodinout/read/',
-    // _saveUrl:basePath+'storage/prodinout/save',
-    // _auditUrl:basePath+'storage/prodinout/audit',
-    // _deleteUrl:basePath+'storage/prodinout/delete/',
-    // _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+     _relationColumn: 'pd_piid',
+     _readUrl:basePath+'storage/prodinout/read/',
+    _saveUrl:basePath+'storage/prodinout/save',
+    _auditUrl:basePath+'storage/prodinout/audit',
+    _deleteUrl:basePath+'storage/prodinout/delete/',
+    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
 
-    _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:9000/prodinout/read/',
-    _saveUrl:'http://localhost:9000/prodinout/save',
-    _auditUrl:'http://localhost:9000/prodinout/audit',
-    _deleteUrl:'http://localhost:9000/prodinout/delete/',
-    _baseVastUrl:'http://localhost:9000/prodinout/',
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:9000/prodinout/read/',
+    // _saveUrl:'http://localhost:9000/prodinout/save',
+    // _auditUrl:'http://localhost:9000/prodinout/audit',
+    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
 

+ 6 - 6
frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -14,8 +14,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
         'dbfindtrigger[name=pu_vendcode]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                    dataUrl:'http://localhost:9480/vendor/list',
+                    dataUrl:basePath+'document/vendor/list',
+                    // dataUrl:'http://localhost:9480/vendor/list',
                     dbfinds:[{
                         from:'ve_id',to:'pi_vendid'
                     },{
@@ -68,8 +68,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
            'dbfindtrigger[name=pd_prodcode]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/product/getProductsByCondition',
-                    dataUrl:'http://localhost:9480/product/list',
+                    dataUrl:basePath+'document/product/list',
+                    // dataUrl:'http://localhost:9480/product/list',
                     dbfinds:[{
                         from:'id',to:'pd_prodid'                          
                     },{
@@ -128,8 +128,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
         'dbfindtrigger[name=pd_whname]':{
          beforerender:function(f){
              Ext.apply(f,{
-                 // dataUrl:basePath+'document/warehouse/list',
-                 dataUrl:'http://localhost:9480/warehouse/list',
+                 dataUrl:basePath+'document/warehouse/list',
+                //  dataUrl:'http://localhost:9480/warehouse/list',
                  dbfinds:[{
                      from:'id',to:'pd_whid'                          
                  },{

+ 1 - 1
frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'