- | 品名 |
+ 名称 |
- | 品名： |
+ 名称： |
|
@@ -88,7 +88,7 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", hidden: true},
- {title: '品名', field: 'name', width: 150},
+ {title: '名称', field: 'name', width: 150},
{title: '型号', field: 'model', width: 100},
{title: '类别', field: 'categoryName', width: 130},
{title: '单位', field: 'unit', width: 60}
diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index a4e9dcb2..412280b5 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -170,7 +170,7 @@ public class DepotItemController {
ratio = diEx.getUName();
ratio = ratio.substring(ratio.indexOf("("));
}
- //品名/型号/扩展信息/包装
+ //名称/型号/扩展信息/包装
String MaterialName = diEx.getBarCode() + "_" + ((diEx.getMName() == null || diEx.getMName().equals("")) ? "" : diEx.getMName())
+ ((diEx.getMStandard() == null || diEx.getMStandard().equals("")) ? "" : "(" + diEx.getMStandard() + ")")
+ ((diEx.getMModel() == null || diEx.getMModel().equals("")) ? "" : "(" + diEx.getMModel() + ")");
diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index 511afcd6..b5657db7 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -161,7 +161,7 @@ public class MaterialController {
ratio = ratio.substring(ratio.indexOf("("));
}
}
- //品名/型号/扩展信息/包装
+ //名称/型号/扩展信息/包装
String MaterialName = "";
String mBarCode = "";
if(material.getmBarCode()!=null) {
@@ -267,7 +267,7 @@ public class MaterialController {
ratio = material.getUnitName();
ratio = ratio.substring(ratio.indexOf("("));
}
- //品名/型号/扩展信息/包装
+ //名称/型号/扩展信息/包装
String MaterialName = "";
MaterialName = MaterialName + material.getmBarCode() + "_" + material.getName()
+ ((material.getStandard() == null || material.getStandard().equals("")) ? "" : "(" + material.getStandard() + ")");
@@ -320,7 +320,7 @@ public class MaterialController {
try {
List dataList = materialService.findByAll(StringUtil.toNull(name), StringUtil.toNull(model),
StringUtil.toNull(categoryIds));
- String[] names = {"品名", "类型", "型号", "安全存量", "单位", "零售价", "最低售价", "预计采购价", "批发价", "备注", "状态"};
+ String[] names = {"名称", "类型", "型号", "安全存量", "单位", "零售价", "最低售价", "预计采购价", "批发价", "备注", "状态"};
String title = "商品信息";
List objects = new ArrayList();
if (null != dataList) {
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
index 46bfc8a9..081752bc 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
@@ -18,6 +18,7 @@ import java.util.Map;
public interface MaterialMapperEx {
List selectByConditionMaterial(
+ @Param("barCode") String barCode,
@Param("name") String name,
@Param("standard") String standard,
@Param("model") String model,
@@ -27,6 +28,7 @@ public interface MaterialMapperEx {
@Param("rows") Integer rows);
Long countsByMaterial(
+ @Param("barCode") String barCode,
@Param("name") String name,
@Param("standard") String standard,
@Param("model") String model,
diff --git a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java
index 632499a5..9a009b7d 100644
--- a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java
+++ b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java
@@ -32,23 +32,25 @@ public class MaterialComponent implements ICommonQuery {
private List getMaterialList(Map map) throws Exception{
String search = map.get(Constants.SEARCH);
+ String barCode = StringUtil.getInfo(search, "barCode");
String name = StringUtil.getInfo(search, "name");
String standard = StringUtil.getInfo(search, "standard");
String model = StringUtil.getInfo(search, "model");
String categoryIds = StringUtil.getInfo(search, "categoryIds");
String mpList = StringUtil.getInfo(search, "mpList");
- return materialService.select(name, standard, model,categoryIds,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
+ return materialService.select(barCode, name, standard, model,categoryIds,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
public Long counts(Map map)throws Exception {
String search = map.get(Constants.SEARCH);
+ String barCode = StringUtil.getInfo(search, "barCode");
String name = StringUtil.getInfo(search, "name");
String standard = StringUtil.getInfo(search, "standard");
String model = StringUtil.getInfo(search, "model");
String categoryIds = StringUtil.getInfo(search, "categoryIds");
String mpList = StringUtil.getInfo(search, "mpList");
- return materialService.countMaterial(name, standard, model,categoryIds,mpList);
+ return materialService.countMaterial(barCode, name, standard, model,categoryIds,mpList);
}
@Override
diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 0fe50d33..78fc63e3 100644
--- a/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -84,22 +84,17 @@ public class MaterialService {
return list;
}
- public List select(String name, String standard, String model, String categoryIds,String mpList, int offset, int rows)
+ public List select(String barCode, String name, String standard, String model, String categoryIds,String mpList, int offset, int rows)
throws Exception{
String[] mpArr = mpList.split(",");
- List resList = new ArrayList();
+ List resList = new ArrayList<>();
List list =null;
try{
- list= materialMapperEx.selectByConditionMaterial(name, standard, model, categoryIds, mpList, offset, rows);
+ list= materialMapperEx.selectByConditionMaterial(barCode, name, standard, model, categoryIds, mpList, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
if (null != list) {
- List idList = new ArrayList();
- for (MaterialVo4Unit m : list) {
- idList.add(m.getId());
- }
- List meList = materialExtendService.getListByMIds(idList);
for (MaterialVo4Unit m : list) {
//扩展信息
String materialOther = "";
@@ -120,24 +115,16 @@ public class MaterialService {
m.setMaterialOther(materialOther);
Long tenantId = m.getTenantId();
m.setStock(depotItemService.getStockByParam(null,m.getId(),null,null,tenantId));
- for(MaterialExtend me:meList) {
- if(me.getMaterialId().longValue() == m.getId().longValue()) {
- m.setPurchaseDecimal(me.getPurchaseDecimal()); //采购价
- m.setCommodityDecimal(me.getCommodityDecimal()); //零售价
- m.setWholesaleDecimal(me.getWholesaleDecimal()); //销售价
- m.setLowDecimal(me.getLowDecimal()); //最低售价
- }
- }
resList.add(m);
}
}
return resList;
}
- public Long countMaterial(String name, String standard, String model, String categoryIds,String mpList)throws Exception {
+ public Long countMaterial(String barCode, String name, String standard, String model, String categoryIds,String mpList)throws Exception {
Long result =null;
try{
- result= materialMapperEx.countsByMaterial(name, standard, model, categoryIds, mpList);
+ result= materialMapperEx.countsByMaterial(barCode, name, standard, model, categoryIds, mpList);
}catch(Exception e){
JshException.readFail(logger, e);
}
diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 1022483f..e701c184 100644
--- a/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -4,7 +4,11 @@
-
+
+
+
+
+
@@ -12,11 +16,17 @@
|