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

单据明细增加'单位'字段的显示

Browse Source
This commit is contained in:
季圣华
2017-11-16 22:01:38 +08:00
parent 26295a52d1
commit 8a77e18ec7
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View File

@@ -393,7 +393,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
String allReturn = ""; String allReturn = "";
List dataList = pageUtil.getPageList(); List dataList = pageUtil.getPageList();
if(dataList!=null) { if(dataList!=null) {
System.out.println("dataList:"+ dataList.size());
for (Integer i = 0; i < dataList.size(); i++) { for (Integer i = 0; i < dataList.size(); i++) {
Object dl = dataList.get(i); //获取对象 Object dl = dataList.get(i); //获取对象
allReturn = allReturn + dl.toString() + ","; allReturn = allReturn + dl.toString() + ",";

2
src/main/java/com/jsh/action/materials/DepotItemAction.java
View File

@@ -284,7 +284,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
//品名/型号/扩展信息/包装 //品名/型号/扩展信息/包装
String MaterialName = depotItem.getMaterialId().getName() + ((depotItem.getMaterialId().getModel() == null || depotItem.getMaterialId().getModel().equals(""))?"":"("+depotItem.getMaterialId().getModel() + ")"); String MaterialName = depotItem.getMaterialId().getName() + ((depotItem.getMaterialId().getModel() == null || depotItem.getMaterialId().getModel().equals(""))?"":"("+depotItem.getMaterialId().getModel() + ")");
String materialOther = getOtherInfo(mpArr, depotItem); String materialOther = getOtherInfo(mpArr, depotItem);
MaterialName = MaterialName + materialOther + ratio; MaterialName = MaterialName + materialOther + ((depotItem.getMaterialId().getUnit() == null || depotItem.getMaterialId().getUnit().equals(""))?"":"("+depotItem.getMaterialId().getUnit() + ")") + ratio;
item.put("MaterialName", MaterialName); item.put("MaterialName", MaterialName);
item.put("Unit", depotItem.getMUnit()); item.put("Unit", depotItem.getMUnit());
item.put("OperNumber", depotItem.getOperNumber()); item.put("OperNumber", depotItem.getOperNumber());

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

@@ -487,7 +487,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
MaterialName = MaterialName + ((material.getOtherField3() == null || material.getOtherField3().equals(""))?"":"("+material.getOtherField3() + ")"); MaterialName = MaterialName + ((material.getOtherField3() == null || material.getOtherField3().equals(""))?"":"("+material.getOtherField3() + ")");
} }
} }
MaterialName = MaterialName + ratio; MaterialName = MaterialName + ((material.getUnit() == null || material.getUnit().equals(""))?"":"("+material.getUnit() + ")") + ratio;
item.put("MaterialName", MaterialName); item.put("MaterialName", MaterialName);
dataArray.add(item); dataArray.add(item);
} }

4
src/main/webapp/js/pages/materials/in_out.js
View File

@@ -817,7 +817,7 @@
} }
} }
}, },
{ title: '品名(型号)(扩展信息)(包装)',field: 'MaterialId',width:230, { title: '品名(型号)(扩展信息)(单位)',field: 'MaterialId',width:230,
formatter:function(value,row,index){ formatter:function(value,row,index){
return row.MaterialName; return row.MaterialName;
}, },
@@ -1187,7 +1187,7 @@
columns:[[ columns:[[
{ title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn}, { title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn},
{ title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90}, { title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
{ title: '品名(型号)(扩展信息)(包装)',field: 'MaterialName',width:230}, { title: '品名(型号)(扩展信息)(单位)',field: 'MaterialName',width:230},
{ title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90}, { title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
{ title: '单位',field: 'Unit',editor:'validatebox',width:60}, { title: '单位',field: 'Unit',editor:'validatebox',width:60},
{ title: '数量',field: 'OperNumber',editor:'validatebox',width:60}, { title: '数量',field: 'OperNumber',editor:'validatebox',width:60},