Quellcode durchsuchen

【品网】【上线需求】【MRP工作台支持放大镜可编辑自动保存】

wuyx vor 1 Woche
Ursprung
Commit
023398e31b

+ 36 - 1
WebContent/app/controller/pm/mps/MRPThrow.js

@@ -39,7 +39,7 @@ Ext.define('erp.controller.pm.mps.MRPThrow', {
         			grid.down('#storeCount').update({
         				count: grid.store.data.items[0].get(grid.keyField) ==0 ? 0 : grid.store.totalCount
         			});
-        			grid.store.on('datachanged',function(store){     
+        			grid.store.on('datachanged',function(store){
         			    grid.selModel.select(grid.multiselected);
         			   
         			});
@@ -94,6 +94,41 @@ Ext.define('erp.controller.pm.mps.MRPThrow', {
     				field.setValue(getUrlParam('mpscode'));
     			}
     		},
+			'dbfindtrigger':{
+				change: function(f,newvalue,oldvalue){
+					if(f.owner&&f.owner.xtype=='erpBatchDealGridPanel'&&f.editable){
+						var record = f.record;
+						if(newvalue != null && newvalue!= ''&&(oldvalue!=null&&oldvalue!='')&&newvalue!=oldvalue){
+							if(record.data.md_status && record.data.md_status!='未投放'){
+								showError('不能修改已投放的数据');
+								return ;
+							}
+							var grid=Ext.getCmp('batchDealGridPanel');
+							Ext.Ajax.request({
+								url:basePath+'pm/mrp/updateFieldData.action',
+								params: {
+									caller:caller,
+									data:newvalue,
+									field:f.name,
+									keyField:grid.keyField,
+									keyValue:record.data[grid.keyField]
+								},
+								method : 'post',
+								callback : function(options,success,response){
+									var local=Ext.decode(response.responseText);
+									if(local.success) {
+										// e.originalValue = e.value;
+										showMessage('提示', '保存成功!', 1000);
+									}else {
+										showError(local.exceptionInfo);
+									}
+								}
+							});
+						}
+					}
+
+				}
+			},
     		'erpAvailableReplaceProdButton': {
     			click: function(btn){    	
     			var urlcon=Ext.create('erp.util.BaseUtil').getUrlParam('urlcondition');

+ 70 - 67
WebContent/app/view/pm/mps/MRPThrowGrid.js

@@ -46,73 +46,76 @@ Ext.define('erp.view.pm.mps.MRPThrowGrid',{
         clicksToEdit: 1,
         listeners:{
         	'edit':function(editor,e,Opts){
-        		var record=e.record;
-        		if(e.originalValue!=e.value){
-        			  if(record.data.md_status && record.data.md_status!='未投放'){
-			    			showError('不能修改已投放的数据');
-			    			return ;
-			    		}   				    	
-			    		var grid=Ext.getCmp('batchDealGridPanel');
-			    		Ext.Ajax.request({
-			    			url:basePath+'pm/mrp/updateFieldData.action',
-		    			   	params: {
-		    			   		caller:caller,
-		    			   		data:e.value,
-		    			   		field:e.field,
-		    			   		keyField:grid.keyField,
-		    			   	    keyValue:record.data[grid.keyField]
-		    			   	},
-		    			   	method : 'post',
-		    			   	callback : function(options,success,response){
-		    			   		var local=Ext.decode(response.responseText);
-		    			   		if(local.success) {
-		    			   		 showMessage('提示', '保存成功!', 1000);
-		    			   		}else {
-		    			   			showError(local.exceptionInfo);
-		    			   		}
-		    			   	}
-			    		 });
-        		/*	Ext.MessageBox.show({
-   				     title:'保存修改?',
-   				     msg: '数据已修改需要保存吗?',
-   				     buttons: Ext.Msg.YESNO,
-   				     icon: Ext.Msg.WARNING,
-   				     fn: function(btn){
-   				    	 if(btn == 'yes'){
-   				    		//保存  
-   				    		if(record.data.md_status && record.data.md_status!='未投放'){
-   				    			showError('不能修改已投放的数据');
-   				    			return ;
-   				    		}   				    	
-   				    		var grid=Ext.getCmp('batchDealGridPanel');
-   				    		Ext.Ajax.request({
-   				    			url:basePath+'pm/mrp/updateFieldData.action',
-   			    			   	params: {
-   			    			   		caller:caller,
-   			    			   		data:e.value,
-   			    			   		field:e.field,
-   			    			   		keyField:grid.keyField,
-   			    			   	    keyValue:record.data[grid.keyField]
-   			    			   	},
-   			    			   	method : 'post',
-   			    			   	callback : function(options,success,response){
-   			    			   		var local=Ext.decode(response.responseText);
-   			    			   		if(local.success) {
-   			    			   		 showMessage('提示', '保存成功!', 1000);
-   			    			   		}else {
-   			    			   			showError(local.exceptionInfo);
-   			    			   		}
-   			    			   	}
-   				    		 });
-   				    	 } else if(btn == 'no'){
-   				    		//不保存	
-   				    		 e.record.reject();
-   				    	 } else {
-   				    		 return;
-   				    	 }
-   				     }
-   				});*/
-        		}
+        		if(!(e.column&&e.column.getEditor()&&e.column.getEditor().xtype == 'dbfindtrigger')||(!e.originalValue)) {
+					var record = e.record;
+					if (e.originalValue != e.value) {
+						if (record.data.md_status && record.data.md_status != '未投放') {
+							showError('不能修改已投放的数据');
+							return;
+						}
+						var grid = Ext.getCmp('batchDealGridPanel');
+						Ext.Ajax.request({
+							url: basePath + 'pm/mrp/updateFieldData.action',
+							params: {
+								caller: caller,
+								data: e.value,
+								field: e.field,
+								keyField: grid.keyField,
+								keyValue: record.data[grid.keyField]
+							},
+							method: 'post',
+							callback: function (options, success, response) {
+								var local = Ext.decode(response.responseText);
+								if (local.success) {
+									// e.originalValue=e.value;
+									showMessage('提示', '保存成功!', 1000);
+								} else {
+									showError(local.exceptionInfo);
+								}
+							}
+						});
+						/*	Ext.MessageBox.show({
+                                title:'保存修改?',
+                                msg: '数据已修改需要保存吗?',
+                                buttons: Ext.Msg.YESNO,
+                                icon: Ext.Msg.WARNING,
+                                fn: function(btn){
+                                    if(btn == 'yes'){
+                                       //保存
+                                       if(record.data.md_status && record.data.md_status!='未投放'){
+                                           showError('不能修改已投放的数据');
+                                           return ;
+                                       }
+                                       var grid=Ext.getCmp('batchDealGridPanel');
+                                       Ext.Ajax.request({
+                                           url:basePath+'pm/mrp/updateFieldData.action',
+                                              params: {
+                                                  caller:caller,
+                                                  data:e.value,
+                                                  field:e.field,
+                                                  keyField:grid.keyField,
+                                                  keyValue:record.data[grid.keyField]
+                                              },
+                                              method : 'post',
+                                              callback : function(options,success,response){
+                                                  var local=Ext.decode(response.responseText);
+                                                  if(local.success) {
+                                                   showMessage('提示', '保存成功!', 1000);
+                                                  }else {
+                                                      showError(local.exceptionInfo);
+                                                  }
+                                              }
+                                        });
+                                    } else if(btn == 'no'){
+                                       //不保存
+                                        e.record.reject();
+                                    } else {
+                                        return;
+                                    }
+                                }
+                           });*/
+					}
+				}
         	}
         }
     }), Ext.create('erp.view.core.plugin.CopyPasteMenu')],

+ 2 - 5
src/com/uas/erp/service/pm/impl/MRPDataServiceImpl.java

@@ -4,15 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.uas.erp.core.*;
 import net.sf.json.JSONObject;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uas.erp.core.BaseUtil;
-import com.uas.erp.core.DateUtil;
-import com.uas.erp.core.HandlerService;
-import com.uas.erp.core.SqlUtil;
 import com.uas.erp.core.bind.Constant;
 import com.uas.erp.core.support.StateAssert;
 import com.uas.erp.core.support.SystemSession;
@@ -178,7 +175,7 @@ public class MRPDataServiceImpl implements MRPDataService {
 		if(fieldCaption == null){
 			fieldCaption =field;
 		}
-		baseDao.logger.others("修改建议变更数", "原值:" + old_data.toString() + ",新值:" + data + ",修改"+fieldCaption+"成功", caller, keyField, keyValue);
+		baseDao.logger.others("修改建议变更数", "原值:" + StringUtil.nvl(old_data,"") + ",新值:" + StringUtil.nvl(data,"") + ",修改"+fieldCaption+"成功", caller, keyField, keyValue);
 	}
 
 	@Override