增加商品属性的模块[主线]

src/main/java/com/jsh/action/materials/MaterialAction.java

@@ -67,6 +67,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
             material.setPriceStrategy(model.getPriceStrategy());
 			material.setRemark(model.getRemark());
             material.setEnabled(model.getEnabled());
+            material.setOtherField1(model.getOtherField1());
+            material.setOtherField2(model.getOtherField2());
+            material.setOtherField3(model.getOtherField3());
 			materialService.create(material);
 			
 			//========标识位===========
@@ -161,6 +164,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
             material.setFirstInUnit(model.getFirstInUnit());
             material.setPriceStrategy(model.getPriceStrategy());
 			material.setRemark(model.getRemark());
+            material.setOtherField1(model.getOtherField1());
+            material.setOtherField2(model.getOtherField2());
+            material.setOtherField3(model.getOtherField3());
         	materialService.update(material);
             
             flag = true;
@@ -329,6 +335,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
                     item.put("PriceStrategy", material.getPriceStrategy());
                     item.put("Enabled", material.getEnabled());
                     item.put("Remark", material.getRemark());
+                    item.put("OtherField1", material.getOtherField1());
+                    item.put("OtherField2", material.getOtherField2());
+                    item.put("OtherField3", material.getOtherField3());
                     item.put("op", 1);
                     dataArray.add(item);
                 }

src/main/java/com/jsh/action/materials/MaterialPropertyAction.java

@@ -0,0 +1,132 @@
+package com.jsh.action.materials;
+
+import com.jsh.base.BaseAction;
+import com.jsh.base.Log;
+import com.jsh.model.po.Logdetails;
+import com.jsh.model.po.MaterialProperty;
+import com.jsh.model.vo.materials.MaterialPropertyModel;
+import com.jsh.service.materials.MaterialPropertyIService;
+import com.jsh.util.PageUtil;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.springframework.dao.DataAccessException;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * 商品属性
+ * @author ji s h e n g hua  qq:75 27 18 920
+*/
+@SuppressWarnings("serial")
+public class MaterialPropertyAction extends BaseAction<MaterialPropertyModel>
+{
+    private MaterialPropertyIService materialPropertyService;
+    private MaterialPropertyModel model = new MaterialPropertyModel();
+	
+	/**
+	 * 更新商品属性
+	 * @return
+	 */
+	public void update() {
+	    Boolean flag = false;
+        try {
+            MaterialProperty materialProperty = materialPropertyService.get(model.getId());
+            materialProperty.setNativeName(model.getNativeName());
+            materialProperty.setEnabled(model.getEnabled());
+            materialProperty.setSort(model.getSort());
+            materialProperty.setAnotherName(model.getAnotherName());
+            materialPropertyService.update(materialProperty);
+            
+            flag = true;
+            tipMsg = "成功";
+            tipType = 0;
+        } 
+        catch (DataAccessException e) {
+            Log.errorFileSync(">>>>>>>>>>>>>修改商品属性ID为 ： " + model.getId() + "失败", e);
+            flag = false;
+            tipMsg = "失败";
+            tipType = 1;
+        }
+        finally {
+            try {
+                toClient(flag.toString());
+            } 
+            catch (IOException e) {
+                Log.errorFileSync(">>>>>>>>>>>>修改商品属性回写客户端结果异常", e);
+            }
+        }
+        logService.create(new Logdetails(getUser(), "更新商品属性", model.getClientIp(),
+                new Timestamp(System.currentTimeMillis())
+        , tipType, "更新商品属性ID为  "+ model.getId() + " " + tipMsg + "！", "更新商品属性" + tipMsg));
+	}
+	
+	/**
+	 * 查找商品属性
+	 * @return
+	 */
+    public void findBy() {
+	    try {
+	        PageUtil<MaterialProperty> pageUtil = new  PageUtil<MaterialProperty>();
+            pageUtil.setPageSize(0);
+            pageUtil.setCurPage(0);
+            pageUtil.setAdvSearch(getCondition());
+            materialPropertyService.find(pageUtil);
+            List<MaterialProperty> dataList = pageUtil.getPageList();
+
+            JSONObject outer = new JSONObject();
+            outer.put("total", pageUtil.getTotalCount());
+            //存放数据json数组
+            JSONArray dataArray = new JSONArray();
+            if(null != dataList) {
+                for(MaterialProperty materialProperty:dataList) {
+                    JSONObject item = new JSONObject();
+                    item.put("id", materialProperty.getId());
+                    item.put("nativeName", materialProperty.getNativeName());
+                    item.put("enabled", materialProperty.getEnabled());
+                    item.put("sort", materialProperty.getSort());
+                    item.put("anotherName", materialProperty.getAnotherName());
+                    dataArray.add(item);
+                }
+            }
+            outer.put("rows", dataArray);
+            //回写查询结果
+            toClient(outer.toString());
+        } 
+	    catch (DataAccessException e) 
+	    {
+	        Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品属性异常", e);
+        } 
+	    catch (IOException e) 
+	    {
+            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品属性结果异常", e);
+        }
+	}
+    
+	/**
+	 * 拼接搜索条件
+	 * @return
+	 */
+	private Map<String,Object> getCondition()
+    {
+        /**
+         * 拼接搜索条件
+         */
+        Map<String,Object> condition = new HashMap<String,Object>();
+        condition.put("nativeName_s_like", model.getNativeName());
+        condition.put("sort_s_order", "asc");
+        return condition;
+    }
+	
+	//=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
+	@Override
+	public MaterialPropertyModel getModel() {
+		return model;
+	}
+	public void setMaterialPropertyService(MaterialPropertyIService materialPropertyService) {
+        this.materialPropertyService = materialPropertyService;
+    }
+}

src/main/java/com/jsh/dao/materials/MaterialPropertyDAO.java

@@ -0,0 +1,17 @@
+package com.jsh.dao.materials;
+
+import com.jsh.base.BaseDAO;
+import com.jsh.model.po.MaterialProperty;
+
+public class MaterialPropertyDAO extends BaseDAO<MaterialProperty> implements MaterialPropertyIDAO
+{
+	/**
+     * 设置dao映射基类
+     * @return
+     */
+	@Override
+    public Class<MaterialProperty> getEntityClass()
+    {
+        return MaterialProperty.class;
+    }
+}

src/main/java/com/jsh/dao/materials/MaterialPropertyIDAO.java

@@ -0,0 +1,9 @@
+package com.jsh.dao.materials;
+
+import com.jsh.base.BaseIDAO;
+import com.jsh.model.po.MaterialProperty;
+
+public interface MaterialPropertyIDAO extends BaseIDAO<MaterialProperty>
+{
+	
+}

src/main/java/com/jsh/model/po/Material.java

@@ -25,6 +25,9 @@ public class Material implements java.io.Serializable
 	private String PriceStrategy;
 	private String Remark;
 	private Boolean Enabled;
+	private String OtherField1;
+	private String OtherField2;
+	private String OtherField3;
 
 	//----------以下属性导入exel表格使用--------------------
 	/**
@@ -52,7 +55,8 @@ public class Material implements java.io.Serializable
 	public Material(MaterialCategory materialCategory, String name, String mfrs, Double packing,
 		Double safetyStock, String model, String standard, String color, String unit, String remark,
 		Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo,
-		Unit unitId, String firstOutUnit, String firstInUnit, String priceStrategy, Boolean enabled) {
+		Unit unitId, String firstOutUnit, String firstInUnit, String priceStrategy, Boolean enabled,
+		String otherField1, String otherField2, String otherField3) {
 		super();
 		this.materialCategory = materialCategory;
 		Name = name;
@@ -73,6 +77,9 @@ public class Material implements java.io.Serializable
 		FirstInUnit = firstInUnit;
 		PriceStrategy = priceStrategy;
 		Enabled = enabled;
+		OtherField1 = otherField1;
+		OtherField2 = otherField2;
+		OtherField3 = otherField3;
 	}
 
 	public Long getId()
@@ -255,6 +262,30 @@ public class Material implements java.io.Serializable
 		Enabled = enabled;
 	}
 
+	public String getOtherField1() {
+		return OtherField1;
+	}
+
+	public void setOtherField1(String otherField1) {
+		OtherField1 = otherField1;
+	}
+
+	public String getOtherField3() {
+		return OtherField3;
+	}
+
+	public void setOtherField3(String otherField3) {
+		OtherField3 = otherField3;
+	}
+
+	public String getOtherField2() {
+		return OtherField2;
+	}
+
+	public void setOtherField2(String otherField2) {
+		OtherField2 = otherField2;
+	}
+
 	public Map<Integer, String> getCellInfo() {
 		return cellInfo;
 	}

src/main/java/com/jsh/model/po/MaterialProperty.java

@@ -0,0 +1,66 @@
+package com.jsh.model.po;
+
+@SuppressWarnings("serial")
+public class MaterialProperty implements java.io.Serializable {
+	private Long id;
+	private String nativeName;
+	private Boolean enabled;
+	private String sort;
+	private String anotherName;
+
+	public MaterialProperty() {
+
+	}
+
+	public MaterialProperty(Long id)
+	{
+		this.id = id;
+	}
+
+	public MaterialProperty(String nativeName, Boolean enabled,String sort, String anotherName) {
+		nativeName = nativeName;
+		enabled = enabled;
+		sort = sort;
+		anotherName = anotherName;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getNativeName() {
+		return nativeName;
+	}
+
+	public void setNativeName(String nativeName) {
+		this.nativeName = nativeName;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getAnotherName() {
+		return anotherName;
+	}
+
+	public void setAnotherName(String anotherName) {
+		this.anotherName = anotherName;
+	}
+}

src/main/java/com/jsh/model/vo/materials/MaterialModel.java

@@ -76,6 +76,12 @@ public class MaterialModel implements Serializable
 	private File materialFile;
 
 	private Boolean Enabled  = true; //是否启用
+
+	private String OtherField1;
+
+	private String OtherField2;
+
+	private String OtherField3;
     
     /**
      * CategoryId
@@ -332,6 +338,30 @@ public class MaterialModel implements Serializable
 		Enabled = enabled;
 	}
 
+	public String getOtherField1() {
+		return OtherField1;
+	}
+
+	public void setOtherField1(String otherField1) {
+		OtherField1 = otherField1;
+	}
+
+	public String getOtherField2() {
+		return OtherField2;
+	}
+
+	public void setOtherField2(String otherField2) {
+		OtherField2 = otherField2;
+	}
+
+	public String getOtherField3() {
+		return OtherField3;
+	}
+
+	public void setOtherField3(String otherField3) {
+		OtherField3 = otherField3;
+	}
+
 	public String getBrowserType() {
 		return browserType;
 	}

src/main/java/com/jsh/model/vo/materials/MaterialPropertyModel.java

@@ -0,0 +1,122 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class MaterialPropertyModel implements Serializable
+{
+    private MaterialCategoryShowModel showModel = new MaterialCategoryShowModel();
+
+    /**======开始接受页面参数=================**/
+    /**
+     * 名称
+     */
+    private String nativeName;
+    
+    /**
+     * 是否启用
+     */
+	private Boolean enabled  = true;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
+	/**
+	 * 别名
+	 */
+	private String anotherName;
+
+	/**
+	 * Id编号
+	 */
+	private Long id;
+    
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+    
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+    
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+	public MaterialCategoryShowModel getShowModel() {
+		return showModel;
+	}
+
+	public void setShowModel(MaterialCategoryShowModel showModel) {
+		this.showModel = showModel;
+	}
+
+	public String getNativeName() {
+		return nativeName;
+	}
+
+	public void setNativeName(String nativeName) {
+		this.nativeName = nativeName;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getAnotherName() {
+		return anotherName;
+	}
+
+	public void setAnotherName(String anotherName) {
+		this.anotherName = anotherName;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+}

src/main/java/com/jsh/model/vo/materials/MaterialPropertyShowModel.java

@@ -0,0 +1,43 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class MaterialPropertyShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+    
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+	private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+	@SuppressWarnings("rawtypes")
+	public Map<String, List> getMap() {
+		return map;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setMap(Map<String, List> map) {
+		this.map = map;
+	}
+    
+    
+}

src/main/java/com/jsh/service/materials/MaterialPropertyIService.java

@@ -0,0 +1,9 @@
+package com.jsh.service.materials;
+
+import com.jsh.base.BaseIService;
+import com.jsh.model.po.MaterialProperty;
+
+public interface MaterialPropertyIService extends BaseIService<MaterialProperty>
+{
+	
+}

src/main/java/com/jsh/service/materials/MaterialPropertyService.java

@@ -0,0 +1,24 @@
+package com.jsh.service.materials;
+
+import com.jsh.base.BaseService;
+import com.jsh.dao.materials.MaterialPropertyIDAO;
+import com.jsh.model.po.MaterialProperty;
+
+public class MaterialPropertyService extends BaseService<MaterialProperty> implements MaterialPropertyIService
+{
+	@SuppressWarnings("unused")
+	private MaterialPropertyIDAO materialPropertyDao;
+
+	
+	public void setMaterialPropertyDao(MaterialPropertyIDAO materialPropertyDao) {
+		this.materialPropertyDao = materialPropertyDao;
+	}
+
+
+	@Override
+	protected Class<MaterialProperty> getEntityClass()
+	{
+		return MaterialProperty.class;
+	}
+    
+}