purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品信息更新

Browse Source
This commit is contained in:
季圣华
2017-10-24 21:23:49 +08:00
parent 54c5fc707b
commit 9ba0a3b4cf
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/jsh/action/materials/MaterialAction.java
View File

@@ -649,6 +649,11 @@ public class MaterialAction extends BaseAction<MaterialModel>
condition.put("Name_s_eq", model.getName()); condition.put("Name_s_eq", model.getName());
condition.put("Model_s_eq", model.getModel()); condition.put("Model_s_eq", model.getModel());
condition.put("Color_s_eq", model.getColor()); condition.put("Color_s_eq", model.getColor());
condition.put("Standard_s_eq", model.getStandard());
condition.put("Mfrs_s_eq", model.getMfrs());
condition.put("OtherField1_s_eq", model.getOtherField1());
condition.put("OtherField2_s_eq", model.getOtherField2());
condition.put("OtherField3_s_eq", model.getOtherField3());
if(model.getUnit()!=null){ if(model.getUnit()!=null){
condition.put("Unit_s_eq", model.getUnit()); condition.put("Unit_s_eq", model.getUnit());
} }

27
src/main/webapp/pages/materials/material.jsp
View File

@@ -600,7 +600,7 @@
return str; return str;
} }
}, },
{ title: '品名',field: 'Name',width:80}, { title: '品名',field: 'Name',width:100},
{ title: '型号',field: 'Model',width:80}, { title: '型号',field: 'Model',width:80},
{ title: '扩展信息',field: 'MaterialOther',width:150}, { title: '扩展信息',field: 'MaterialOther',width:150},
{ title: '单位',field: 'Unit',width:60}, { title: '单位',field: 'Unit',width:60},
@@ -1098,6 +1098,11 @@
oldName = ""; oldName = "";
oldModel = ""; oldModel = "";
oldColor = ""; oldColor = "";
oldStandard = "";
oldMfrs = "";
oldOtherField1 = "";
oldOtherField2 = "";
oldOtherField3 = "";
oldUnit = ""; oldUnit = "";
oldManyUnit = ""; oldManyUnit = "";
materialID = 0; materialID = 0;
@@ -1109,12 +1114,20 @@
var mName = $.trim($("#Name").val()); var mName = $.trim($("#Name").val());
var mModel = $.trim($("#Model").val()); var mModel = $.trim($("#Model").val());
var mColor = $.trim($("#Color").val()); var mColor = $.trim($("#Color").val());
var mStandard = $.trim($("#Standard").val());
var mMfrs = $.trim($("#Mfrs").val());
var mOtherField1 = $.trim($("#OtherField1").val());
var mOtherField2 = $.trim($("#OtherField2").val());
var mOtherField3 = $.trim($("#OtherField3").val());
var mUnit = $.trim($("#Unit").val()); var mUnit = $.trim($("#Unit").val());
var mUnitId = $.trim($("#manyUnit").val()); var mUnitId = $.trim($("#manyUnit").val());
//表示是否存在 true == 存在 false = 不存在 //表示是否存在 true == 存在 false = 不存在
var flag = false; var flag = false;
//开始ajax名称检验，不能重名(新增或编辑) //开始ajax名称检验，不能重名(新增或编辑)
if(materialID==0 || (materialID!=0 && (mName != oldName || mModel != oldModel || mColor != oldColor || mUnit != oldUnit || mUnitId != oldManyUnit))) { if(materialID==0 || (materialID!=0 && (mName != oldName || mModel != oldModel
|| mColor != oldColor || mStandard != oldStandard || mMfrs != oldMfrs
|| mOtherField1 != oldOtherField1 || mOtherField2 != oldOtherField2 || mOtherField3 != oldOtherField3
|| mUnit != oldUnit || mUnitId != oldManyUnit))) {
$.ajax({ $.ajax({
type:"post", type:"post",
url: "<%=path%>/material/checkIsExist.action", url: "<%=path%>/material/checkIsExist.action",
@@ -1125,6 +1138,11 @@
Name : mName, Name : mName,
Model: mModel, Model: mModel,
Color: mColor, Color: mColor,
Standard: mStandard,
Mfrs: mMfrs,
OtherField1: mOtherField1,
OtherField2: mOtherField2,
OtherField3: mOtherField3,
Unit: mUnit, Unit: mUnit,
UnitId: mUnitId UnitId: mUnitId
}), }),
@@ -1400,6 +1418,11 @@
oldName = materialInfo[1]; oldName = materialInfo[1];
oldModel = materialInfo[2]; oldModel = materialInfo[2];
oldColor = materialInfo[11]; oldColor = materialInfo[11];
oldStandard = materialInfo[10];
oldMfrs = materialInfo[20];
oldOtherField1 = materialInfo[21];
oldOtherField2 = materialInfo[22];
oldOtherField3 = materialInfo[23];
oldUnit = materialInfo[4]; oldUnit = materialInfo[4];
oldManyUnit = materialInfo[16]; oldManyUnit = materialInfo[16];
$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息'); $('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');