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-10 23:44:00 +08:00
parent f7cffd98f3
commit 4dfde00078
20 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,9 +280,10 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
ratio = depotItem.getMaterialId().getUnitId().getUName();
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/制造商/包装
//品名/型号/规格/颜色/包装
String MaterialName = depotItem.getMaterialId().getName() + ((depotItem.getMaterialId().getModel() == null||depotItem.getMaterialId().getModel().equals(""))?"":"("+depotItem.getMaterialId().getModel()+ ")")
+((depotItem.getMaterialId().getMfrs() == null||depotItem.getMaterialId().getMfrs().equals(""))?"":"("+depotItem.getMaterialId().getMfrs() + ")")
+((depotItem.getMaterialId().getStandard() == null||depotItem.getMaterialId().getStandard().equals(""))?"":"("+depotItem.getMaterialId().getStandard() + ")")
+((depotItem.getMaterialId().getColor() == null||depotItem.getMaterialId().getColor().equals(""))?"":"("+depotItem.getMaterialId().getColor() + ")")
+ ratio;
item.put("MaterialName", MaterialName);
item.put("Unit", depotItem.getMUnit());

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

@@ -374,7 +374,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
item.put("SafetyStock", material.getSafetyStock()==null?"" : material.getSafetyStock());
item.put("Model", material.getModel());
item.put("Standard", material.getStandard());
item.put("Color", material.getColor());
item.put("Color", material.getColor()==null?"": material.getColor());
item.put("Unit", material.getUnit());
item.put("RetailPrice", material.getRetailPrice());
item.put("LowPrice", material.getLowPrice());
@@ -430,9 +430,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
ratio = material.getUnitId().getUName();
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/制造商/包装
//品名/型号/规格/颜色/包装
String MaterialName = material.getName() + ((material.getModel() == null || material.getModel().equals(""))?"":"("+material.getModel() + ")")
+ ((material.getMfrs() == null || material.getMfrs().equals(""))?"":"("+material.getMfrs() + ")")
+ ((material.getStandard() == null || material.getStandard().equals(""))?"":"("+material.getStandard() + ")")
+ ((material.getColor() == null || material.getColor().equals(""))?"":"("+material.getColor() + ")")
+ ratio;
item.put("MaterialName", MaterialName);
dataArray.add(item);
@@ -563,7 +564,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Name_s_like", model.getName());
condition.put("Model_s_like", model.getModel());
condition.put("Mfrs_s_like", model.getMfrs());
condition.put("Color_s_like", model.getColor());
condition.put("Id_s_order", "asc");
return condition;
}
@@ -579,7 +580,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Name_s_like", model.getName());
condition.put("Model_s_like", model.getModel());
condition.put("Mfrs_s_like", model.getMfrs());
condition.put("Color_s_like", model.getColor());
condition.put("CategoryId_s_in", model.getCategoryIds());
condition.put("Id_s_order", "asc");
return condition;
@@ -592,7 +593,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
}
condition.put("Name_s_eq", model.getName());
condition.put("Model_s_eq", model.getModel());
condition.put("Mfrs_s_eq", model.getMfrs());
condition.put("Color_s_eq", model.getColor());
if(model.getUnit()!=null){
condition.put("Unit_s_eq", model.getUnit());
}