12月7号修改

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -216,7 +216,7 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
             response.setContentType("text/html;charset=UTF-8");
             OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
             response.setContentType("application/x-msdownload");
-            String newName = URLEncoder.encode("财务竣工结算表" + System.currentTimeMillis() + ".xlsx","UTF-8");
+            String newName = URLEncoder.encode("财务竣工决算表" + System.currentTimeMillis() + ".xlsx","UTF-8");
             response.addHeader("Content-Disposition","attachment;filename=\"" + newName + "\"");
             response.addHeader("Content-Length", "" + newFile.length());
             toClient.write(buffer);
@@ -235,6 +235,8 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         // 删除创建的新文件
         // this.deleteFile(newFile);
     }
+
+
     //验证汇总
     public List<ErpJudge> getAllCheck(List<ErpCredit> erpCredits){
         Boolean flag = true;

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ExportUtilCalculate.java

@@ -580,7 +580,10 @@ public class ExportUtilCalculate {
         Double powerValueAll=0.0;//价值合计
         Double powerStandInFeeAll=0.0;//摊入费用
         Double powerDeliveredAssetsAll=0.0;//交付使用资产价值
+        Double erpCreditMaterial = 0.0;
         for (ErpCredit erpCredit:erpCredits){
+            erpCreditMaterial = getErpCreditMaterial(erpCredit);
+            erpCreditMaterial = erpCreditMaterial/erpCredit.getErpCreditChild1s().size();
             powerValueTotal = 0.0;//当前erp账户 所有设备费合计 赋值初始值
             //材料费合计
             materialTotal = getErpCreditMaterial(erpCredit);//得到材料费
@@ -591,32 +594,31 @@ public class ExportUtilCalculate {
                 powerValueTotal += erpCreditEquipment.getEqmBookedFee1();
             }
             //得到安装费用
-            if (null!=erpCredit.getConsInstallFee()&&erpCredit.getTenKvModel()!=null){ //安装费（x线路表）
+//            if (null!=erpCredit.getConsInstallFee()&&erpCredit.getTenKvModel()!=null){ //安装费（x线路表）
+//                powerInstallFee = erpCredit.getConsInstallFee()+materialTotal;
+//            }
+//            if (null!=erpCredit.getConsBuildingFee()&&erpCredit.getTenKvModel()!=null){
+//                powerInstallFee = erpCredit.getConsBuildingFee()+materialTotal;//赋值powerInstallfe为建筑费
+//            }
+            if (null!=erpCredit.getConsInstallFee()){ //安装费（x线路表）
                 powerInstallFee = erpCredit.getConsInstallFee()+materialTotal;
             }
-            if (null!=erpCredit.getConsBuildingFee()&&erpCredit.getTenKvModel()!=null){
+            if (null!=erpCredit.getConsBuildingFee()){
                 powerInstallFee = erpCredit.getConsBuildingFee()+materialTotal;//赋值powerInstallfe为建筑费
             }
             if (null!=erpCreditChild1s && erpCreditChild1s.size()>=0){//
-//                for (ErpCreditEquipment erpCreditChild11:erpCreditChild1s){//循环集合
-//                    if (null!=erpCreditChild11.getEqmNumbers()){//当前项目定义号所有的台数合计
-//                        eqmNumbers+=erpCreditChild11.getEqmNumbers();
-//                    }
-//                }
                 for (ErpCreditEquipment erpCreditChild1:erpCreditChild1s){
                     eqmFtIntalls = 0.0;//定义台数初始值
                     powerDeliveredAssets=0.0;//交付使用价值初始值
-                    powerEqmMater=0.0;//物料材料合计
-                    powerValue = 0.0;//赋予初始值
-                    powerStandInFee=0.0;//赋予初始值
                     transferOfPower2 = new TransferOfEquipment();//定义设备表对象
                     transferOfPower2.setPowerId(erpCredit.getItemId());//赋值项目定义编号
                     transferOfPower2.setPowerName(erpCredit.getItemName());//添加项目名称
                     transferOfPower2.setPowerArea("-");//线路起始地带
                     transferOfPower2.setPowerDepartment(ExportUtilCalculate.POWER_DEPARTMENT);//添加保管
                     if (null!=erpCredit.getConsInstallFee()&& null != erpCreditChild1.getEqmBookedFee1()){//得到分摊后安装费
-                        eqmFtIntalls=erpCredit.getConsTotalFee()/erpCreditChild1.getEqmBookedFee1();
+                        eqmFtIntalls=erpCredit.getConsInstallFee()/erpCreditChild1.getEqmBookedFee1();
                         eqmFtIntalls = eqmFtIntalls*erpCreditChild1.getEqmBookedFee1();
+                        eqmFtIntalls = eqmFtIntalls/erpCreditChild1s.size();
                     }
                     if (null!=erpCreditChild1.getEqmNumbers()){//得到配变数量（erp账户中设备台数）
                         transferOfPower2.setPowerNumber(decimalFormat1.format(erpCreditChild1.getEqmNumbers()));
@@ -630,7 +632,7 @@ public class ExportUtilCalculate {
                     //设备价值
                     if (null!=erpCreditChild1.getEqmBookedFee1()){//如果入账金额不为空
                         if (null!=transferOfPower2.getPowerCapacity()&& null == erpCredit.getTenKvModel()){
-                            powerValue=erpCreditChild1.getEqmBookedFee1()+eqmFtIntalls;//价值合计 设备入账金额+安装费
+                            powerValue=erpCreditChild1.getEqmBookedFee1()+eqmFtIntalls+erpCreditMaterial;//价值合计 设备入账金额+安装费（安装费按比例分摊）
                             transferOfPower2.setPowerValue(decimalFormat.format(powerValue));//赋值设备价值
                         }else {
                             powerValue=erpCreditChild1.getEqmBookedFee1();//价值合计 设备入账金额
@@ -651,7 +653,7 @@ public class ExportUtilCalculate {
 //                    }else {
 //                        powerStandInFee =0.0;
 //                    }
-                    powerEqmMater = powerValueTotal+powerInstallFee;//设备价值加上安装费设备价值
+                    powerEqmMater = powerValueTotal+powerInstallFee;//设备价值加上安装费设备价
                     if (erpCredit.getOtherTotalFee()!=null){
                         powerStandInFee=Double.parseDouble(transferOfPower2.getPowerValue())/powerEqmMater*erpCredit.getOtherTotalFee();
                     }else {
@@ -765,7 +767,7 @@ public class ExportUtilCalculate {
 //                for(String str:organDataList){
 //                    organData+=str+",";
 //                }
-                generalSituation.setOrganDataNumber(organDataList.get(1));
+                generalSituation.setOrganDataNumber(organDataList.get(0));
             }
             if (null!=commencementDateSet&&commencementDateSet.size()>0){
                 generalSituation.setCommencementDate(sdf.format(commencementDateSet.first()));
@@ -777,6 +779,70 @@ public class ExportUtilCalculate {
         }
         return generalSituation;
     }
+//    //资产总表
+//    public static List<TheAssetsTotal> getTheAssetsTotal(List<ErpCredit> erpCredits){
+//        DecimalFormat decimalFormat   = new DecimalFormat("#0.00");
+//        List<TheAssetsTotal> theAssetsTotals = new ArrayList<TheAssetsTotal>();
+//        TheAssetsTotal theAssetsTotal1 = new TheAssetsTotal();
+//        TheAssetsTotal theAssetsTotal2 = new TheAssetsTotal();
+//        TheAssetsTotal theAssetsTotal3 = new TheAssetsTotal();
+//        Double buildProject=0.0;//建筑工程
+//        Double intallProject=0.0;//安装工程费
+//        Double equipmentValue=0.0;//设备价值
+//        Double costSharing=0.0;//分摊费用
+//        Double deliveryCostValue=0.0;//交付使用资产价值
+//        Double equipmentValue1=0.0;//设备价值
+//        Double costSharing1=0.0;//分摊费用
+//        Double deliveryCostValue1=0.0;//交付使用资产价值
+//        List<TransferOfPowerLine> transferOfPower1s = getTransFerPower1(erpCredits);//得到线路表
+//        List<TransferOfEquipment> transferOfPower2s = getTransferOfPower2(erpCredits);//得到设备表
+//        for (int i = 0; i < transferOfPower1s.size(); i++) {
+//            if (i!=transferOfPower1s.size()-1){
+//                if (null!= transferOfPower1s.get(i).getPowerBuildFee()){//建筑
+//                    buildProject+=Double.parseDouble(transferOfPower1s.get(i).getPowerBuildFee());
+//                }
+//                if (null!=transferOfPower1s.get(i).getPowerInstallFee()&&!transferOfPower1s.get(i).getPowerInstallFee().equals("-")){
+//                    intallProject+=Double.parseDouble(transferOfPower1s.get(i).getPowerInstallFee());
+//                }
+//                if (null!=transferOfPower1s.get(i).getPowerStandInFee()&&!transferOfPower1s.get(i).getPowerStandInFee().equals("-")){//分摊费用
+//                    costSharing+=Double.parseDouble(transferOfPower1s.get(i).getPowerStandInFee());
+//                }
+//                if (null!=transferOfPower1s.get(i).getPowerDeliveredAssets()){
+//                    deliveryCostValue+=Double.parseDouble(transferOfPower1s.get(i).getPowerDeliveredAssets());
+//                }
+//            }
+//        }
+//        theAssetsTotal1.setBuildProject(decimalFormat.format(buildProject));//添加建筑费
+//        theAssetsTotal1.setIntallProject(decimalFormat.format(intallProject));//添加设备费
+//        theAssetsTotal1.setCostSharing(decimalFormat.format(costSharing));
+//        theAssetsTotal1.setDeliveryCostValue(decimalFormat.format(deliveryCostValue));
+//        for (int i = 0; i < transferOfPower2s.size(); i++) {
+//            if (i!=transferOfPower2s.size()-1){
+//                if (null!=transferOfPower2s.get(i).getPowerValue()){//设备价值
+//                    equipmentValue1+=Double.parseDouble(transferOfPower2s.get(i).getPowerValue());
+//                }
+//                if (null!=transferOfPower2s.get(i).getPowerStandInFee()){
+//                    costSharing1+=Double.parseDouble(transferOfPower2s.get(i).getPowerStandInFee());
+//                }
+//                if (null!=transferOfPower2s.get(i).getPowerDeliveredAssets()){
+//                    deliveryCostValue1 += Double.parseDouble(transferOfPower2s.get(i).getPowerDeliveredAssets());
+//                }
+//            }
+//        }
+//        theAssetsTotal2.setEquipmentValue(decimalFormat.format(equipmentValue1));
+//        theAssetsTotal2.setCostSharing(decimalFormat.format(costSharing1));
+//        theAssetsTotal2.setDeliveryCostValue(decimalFormat.format(deliveryCostValue1));
+//        //添加三
+//        theAssetsTotal3.setBuildProject(decimalFormat.format(buildProject));
+//        theAssetsTotal3.setIntallProject(decimalFormat.format(intallProject));
+//        theAssetsTotal3.setEquipmentValue(decimalFormat.format(equipmentValue1));
+//        theAssetsTotal3.setCostSharing(decimalFormat.format(costSharing+costSharing1));
+//        theAssetsTotal3.setDeliveryCostValue(decimalFormat.format(deliveryCostValue+deliveryCostValue1));
+//        theAssetsTotals.add(theAssetsTotal3);
+//        theAssetsTotals.add(theAssetsTotal1);
+//        theAssetsTotals.add(theAssetsTotal2);
+//        return theAssetsTotals;
+//    }
     //资产总表
     public static List<TheAssetsTotal> getTheAssetsTotal(List<ErpCredit> erpCredits){
         DecimalFormat decimalFormat   = new DecimalFormat("#0.00");
@@ -795,18 +861,18 @@ public class ExportUtilCalculate {
         List<TransferOfPowerLine> transferOfPower1s = getTransFerPower1(erpCredits);//得到线路表
         List<TransferOfEquipment> transferOfPower2s = getTransferOfPower2(erpCredits);//得到设备表
         for (int i = 0; i < transferOfPower1s.size(); i++) {
-            if (i!=transferOfPower1s.size()-1){
+            if (i==transferOfPower1s.size()-1){
                 if (null!= transferOfPower1s.get(i).getPowerBuildFee()){//建筑
-                    buildProject+=Double.parseDouble(transferOfPower1s.get(i).getPowerBuildFee());
+                    buildProject=Double.parseDouble(transferOfPower1s.get(i).getPowerBuildFee());
                 }
                 if (null!=transferOfPower1s.get(i).getPowerInstallFee()&&!transferOfPower1s.get(i).getPowerInstallFee().equals("-")){
-                    intallProject+=Double.parseDouble(transferOfPower1s.get(i).getPowerInstallFee());
+                    intallProject=Double.parseDouble(transferOfPower1s.get(i).getPowerInstallFee());
                 }
                 if (null!=transferOfPower1s.get(i).getPowerStandInFee()&&!transferOfPower1s.get(i).getPowerStandInFee().equals("-")){//分摊费用
-                    costSharing+=Double.parseDouble(transferOfPower1s.get(i).getPowerStandInFee());
+                    costSharing=Double.parseDouble(transferOfPower1s.get(i).getPowerStandInFee());
                 }
                 if (null!=transferOfPower1s.get(i).getPowerDeliveredAssets()){
-                    deliveryCostValue+=Double.parseDouble(transferOfPower1s.get(i).getPowerDeliveredAssets());
+                    deliveryCostValue=Double.parseDouble(transferOfPower1s.get(i).getPowerDeliveredAssets());
                 }
             }
         }
@@ -815,15 +881,15 @@ public class ExportUtilCalculate {
         theAssetsTotal1.setCostSharing(decimalFormat.format(costSharing));
         theAssetsTotal1.setDeliveryCostValue(decimalFormat.format(deliveryCostValue));
         for (int i = 0; i < transferOfPower2s.size(); i++) {
-            if (i!=transferOfPower2s.size()-1){
+            if (i==transferOfPower2s.size()-1){
                 if (null!=transferOfPower2s.get(i).getPowerValue()){//设备价值
-                    equipmentValue1+=Double.parseDouble(transferOfPower2s.get(i).getPowerValue());
+                    equipmentValue1=Double.parseDouble(transferOfPower2s.get(i).getPowerValue());
                 }
                 if (null!=transferOfPower2s.get(i).getPowerStandInFee()){
-                    costSharing1+=Double.parseDouble(transferOfPower2s.get(i).getPowerStandInFee());
+                    costSharing1=Double.parseDouble(transferOfPower2s.get(i).getPowerStandInFee());
                 }
                 if (null!=transferOfPower2s.get(i).getPowerDeliveredAssets()){
-                    deliveryCostValue1 += Double.parseDouble(transferOfPower2s.get(i).getPowerDeliveredAssets());
+                    deliveryCostValue1 = Double.parseDouble(transferOfPower2s.get(i).getPowerDeliveredAssets());
                 }
             }
         }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/Result.java

@@ -2,8 +2,11 @@ package com.jeeplus.modules.sg.financial.erpcredit.util;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.jeeplus.core.mapper.JsonMapper;
+import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpJudge;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 
 public class Result {
     private boolean success = true;// 是否成功
@@ -11,6 +14,15 @@ public class Result {
     private String msg = "操作成功";// 提示信息
     private String list= "";
     private boolean flag = false;
+    private List<ErpJudge> erpList = new ArrayList<>();
+
+    public List<ErpJudge> getErpList() {
+        return erpList;
+    }
+
+    public void setErpList(List<ErpJudge> erpList) {
+        this.erpList = erpList;
+    }
 
     public boolean isFlag() {
         return flag;

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -26,6 +26,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.omg.PortableServer.LIFESPAN_POLICY_ID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
 import org.springframework.stereotype.Controller;
@@ -116,7 +117,6 @@ public class ErpCreditController extends BaseController {
 	 */
 	@RequestMapping(value = "tips")
 	public String Tips(String str,Model model, HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException {
-		str = (String)request.getParameter("str");
 		str = URLDecoder.decode(str,"UTF-8");
 		String[] strings2;
 		List<ErpJudge> erpJudges = new ArrayList<ErpJudge>();
@@ -155,6 +155,23 @@ public class ErpCreditController extends BaseController {
 			erpJudge.setInfoFlag(strings3[10]);
 			erpJudges.add(erpJudge);
 		}
+//		List<ErpJudge> erpJudges = new ArrayList<ErpJudge>();
+//		ErpJudge erpJudge= null;
+//		for (int i = 0; i < list.length; i+=11) {
+//			erpJudge = new ErpJudge();
+//			erpJudge.setItemId(list[i]);
+//			erpJudge.setMainFlag(URLEncoder.encode(list[i+1],"UTF-8"));
+//			erpJudge.setMainStartDate(list[i+2]);
+//			erpJudge.setMainEndDate(list[i+3]);
+//			erpJudge.setMainApprovalNumber(list[i+4]);
+//			erpJudge.setMainDesign(list[i+5]);
+//			erpJudge.setMainSupervision(list[i+6]);
+//			erpJudge.setMainConstructionUnits(list[i+7]);
+//			erpJudge.setMainDesignUnits(list[i+8]);
+//			erpJudge.setMainInvestmen(list[i+9]);
+//			erpJudge.setInfoFlag(list[i+10]);
+//			erpJudges.add(erpJudge);
+//		}
 		model.addAttribute("erpList",erpJudges);
 		return "modules/sg/financial/erp/erpCreditTips";
 	}
@@ -226,6 +243,9 @@ public class ErpCreditController extends BaseController {
 	@RequiresPermissions("sg:financial:erpCredit:export")
     @RequestMapping(value = "exportList")
     public Result exportFileList(ErpCredit erpCredit,HttpServletRequest request, HttpServletResponse response){
+		HttpSession session = request.getSession();
+		String attribute = (String) session.getAttribute("erpStatus");
+		erpCredit.setStatus(attribute);
         Result j = new Result();
         try {
             String fileName = "送审决算信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
@@ -299,6 +319,7 @@ public class ErpCreditController extends BaseController {
 							erpJudge.getMainDesignUnits()+","+erpJudge.getMainInvestmen()+","+erpJudge.getInfoFlag()+"-";
 				}
 				judge = judge.substring(0,judge.length()-1);
+//				j.setErpList(erpJudges);
 				j.setList(judge);
 				j.setFlag(true);
 				j.setSuccess(false);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/entity/MaterialPlan.java

@@ -15,13 +15,13 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
     private String bigDescribe;//大类描述
     private String moderateDescribe;//中类描述
     private String smallDescribe;//小类描述
-    private String requireNumber;//需求数量
+    private Integer requireNumber;//需求数量
     private String util;//单位
     private String planToBatch;//计划批次
     private Date deliverySchedule;//供货计划到日
     private String flagStorage;//是否入库
-    private String inventoryQuantity;//库存数量
-    private String numberFrozen;//冻结数量
+    private Integer inventoryQuantity;//库存数量
+    private Integer numberFrozen;//冻结数量
     private String supplierName;//供应商名称
 
     @ExcelField(title="物资唯一码", align=2, sort=1)
@@ -89,11 +89,11 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
         this.smallDescribe = smallDescribe;
     }
     @ExcelField(title="需求数量", align=2, sort=9)
-    public String getRequireNumber() {
+    public Integer getRequireNumber() {
         return requireNumber;
     }
 
-    public void setRequireNumber(String requireNumber) {
+    public void setRequireNumber(Integer requireNumber) {
         this.requireNumber = requireNumber;
     }
     @ExcelField(title="单位", align=2, sort=10)
@@ -131,19 +131,19 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
     }
 
     @ExcelField(title="库存数量", align=2, sort=14)
-    public String getInventoryQuantity() {
+    public Integer getInventoryQuantity() {
         return inventoryQuantity;
     }
-    public void setInventoryQuantity(String inventoryQuantity) {
+    public void setInventoryQuantity(Integer inventoryQuantity) {
         this.inventoryQuantity = inventoryQuantity;
     }
 
     @ExcelField(title="冻结数量", align=2, sort=15)
-    public String getNumberFrozen() {
+    public Integer getNumberFrozen() {
         return numberFrozen;
     }
 
-    public void setNumberFrozen(String numberFrozen) {
+    public void setNumberFrozen(Integer numberFrozen) {
         this.numberFrozen = numberFrozen;
     }
 
@@ -157,25 +157,4 @@ public class MaterialPlan extends DataEntity<MaterialPlan> {
     }
 
 
-    @Override
-    public String toString() {
-        return "MaterialPlan{" +
-                "uniqueCode='" + uniqueCode + '\'' +
-                ", requireCoding='" + requireCoding + '\'' +
-                ", description='" + description + '\'' +
-                ", expansionCode='" + expansionCode + '\'' +
-                ", expansionDescription='" + expansionDescription + '\'' +
-                ", bigDescribe='" + bigDescribe + '\'' +
-                ", moderateDescribe='" + moderateDescribe + '\'' +
-                ", smallDescribe='" + smallDescribe + '\'' +
-                ", requireNumber='" + requireNumber + '\'' +
-                ", util='" + util + '\'' +
-                ", planToBatch='" + planToBatch + '\'' +
-                ", deliverySchedule=" + deliverySchedule +
-                ", flagStorage='" + flagStorage + '\'' +
-                ", inventoryQuantity='" + inventoryQuantity + '\'' +
-                ", numberFrozen='" + numberFrozen + '\'' +
-                ", supplierName='" + supplierName + '\'' +
-                '}';
-    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/util/MaterialPlanInfo.java

@@ -33,6 +33,9 @@ public class MaterialPlanInfo {
      * @return List<ErpAccount> 导入表格数据
      */
     public static List<MaterialPlan> getMaterPlanUtil(ImportUtil importUtil)  {
+        String requireCount = "";//需求数量
+        String inventoryQuantity ="";//库存数量
+        String numberFrozen = "";//冻结数量
         int lastRow = importUtil.getLastDataRowNum();
         List<MaterialPlan> list = new ArrayList<MaterialPlan>();
         MaterialPlan materialPlan = null;
@@ -50,12 +53,21 @@ public class MaterialPlanInfo {
                 materialPlan.setBigDescribe((String)importUtil.getCellValue(row,5));
                 materialPlan.setModerateDescribe((String)importUtil.getCellValue(row,6));
                 materialPlan.setSmallDescribe((String)importUtil.getCellValue(row,7));
-                materialPlan.setRequireNumber((String)importUtil.getCellValue(row,8));
+                requireCount =(String)importUtil.getCellValue(row,8);
+                if (null!=requireCount){
+                    materialPlan.setRequireNumber(new Integer((String)importUtil.getCellValue(row,8)));
+                }
                 materialPlan.setUtil((String)importUtil.getCellValue(row,9));
                 materialPlan.setPlanToBatch((String)importUtil.getCellValue(row,10));
                 materialPlan.setFlagStorage((String)importUtil.getCellValue(row,12));
-                materialPlan.setInventoryQuantity((String)importUtil.getCellValue(row,13));
-                materialPlan.setNumberFrozen((String)importUtil.getCellValue(row,14));
+                inventoryQuantity = (String)importUtil.getCellValue(row,13);
+                if (null!=inventoryQuantity){
+                    materialPlan.setInventoryQuantity(new Integer((String)importUtil.getCellValue(row,13)));
+                }
+                numberFrozen = (String)importUtil.getCellValue(row,14);
+                if (null!=numberFrozen){
+                    materialPlan.setNumberFrozen(new Integer((String)importUtil.getCellValue(row,14)));
+                }
                 materialPlan.setSupplierName((String)importUtil.getCellValue(row,15));
                 list.add(materialPlan);
             }
@@ -159,8 +171,8 @@ public class MaterialPlanInfo {
         for (MaterialPlan materialPlan:materialPlanList){
             for (InventoryTable inventoryTable:inventoryTableList){
                 if (materialPlan.getUniqueCode().equals(inventoryTable.getUniqueCode())){
-                    materialPlan.setInventoryQuantity(inventoryTable.getInventoryQuantity());
-                    materialPlan.setNumberFrozen(inventoryTable.getNumberFrozen());
+                    materialPlan.setInventoryQuantity(new Integer(inventoryTable.getInventoryQuantity()));
+                    materialPlan.setNumberFrozen(new Integer(inventoryTable.getNumberFrozen()));
                     materialPlan.setSupplierName(inventoryTable.getSupplierName());
                 }
             }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/web/MeterialPlanController.java

@@ -18,6 +18,7 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -62,7 +63,7 @@ public class MeterialPlanController extends BaseController {
 	/**
 	 * 工程管理表单列表页面
 	 */
-//	@RequiresPermissions("test:one:dialog:leave1:list")
+	@RequiresPermissions("sg:managementcenter:materialplan:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(MaterialPlan materialPlan, Model model) {
 		model.addAttribute("materialPlan", materialPlan);
@@ -73,7 +74,7 @@ public class MeterialPlanController extends BaseController {
 	 * 表单列表数据
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:list")
+	@RequiresPermissions("sg:managementcenter:materialplan:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(MaterialPlan materialPlan, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<MaterialPlan> page = materialPlanService.findPage(new Page<MaterialPlan>(request, response), materialPlan);
@@ -83,7 +84,7 @@ public class MeterialPlanController extends BaseController {
 	/**
 	 * 查看，增加，编辑表单表单页面
 	 */
-//	@RequiresPermissions(value={"test:one:dialog:leave1:view","test:one:dialog:leave1:add","test:one:dialog:leave1:edit"},logical=Logical.OR)
+	@RequiresPermissions(value={"sg:managementcenter:materialplan:view","sg:managementcenter:materialplan:add","sg:managementcenter:materialplan:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(MaterialPlan materialPlan, Model model) {
 		model.addAttribute("materialPlan", materialPlan);
@@ -94,7 +95,7 @@ public class MeterialPlanController extends BaseController {
 	 * 保存表单
 	 */
 	@ResponseBody
-//	@RequiresPermissions(value={"test:one:dialog:leave1:add","test:one:dialog:leave1:edit"},logical=Logical.OR)
+	@RequiresPermissions(value={"sg:managementcenter:materialplan:add","sg:managementcenter:materialplan:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public AjaxJson save(MaterialPlan materialPlan, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
@@ -110,7 +111,7 @@ public class MeterialPlanController extends BaseController {
 		//新增或编辑表单保存
 		materialPlanService.save(materialPlan);//保存
 		j.setSuccess(true);
-		j.setMsg("保存项目明细数据成功");
+		j.setMsg("保存成功");
 		return j;
 	}
 	
@@ -118,12 +119,12 @@ public class MeterialPlanController extends BaseController {
 	 * 删除表单
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:del")
+	@RequiresPermissions("sg:managementcenter:materialplan:del")
 	@RequestMapping(value = "delete")
 	public AjaxJson delete(MaterialPlan materialPlan) {
 		AjaxJson j = new AjaxJson();
 		materialPlanService.delete(materialPlan);
-		j.setMsg("删除项目明细数据成功");
+		j.setMsg("删除成功");
 		return j;
 	}
 	
@@ -131,7 +132,7 @@ public class MeterialPlanController extends BaseController {
 	 * 批量表单
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:del")
+	@RequiresPermissions("sg:managementcenter:materialplan:del")
 	@RequestMapping(value = "deleteAll")
 	public AjaxJson deleteAll(String ids) {
 		AjaxJson j = new AjaxJson();
@@ -147,20 +148,20 @@ public class MeterialPlanController extends BaseController {
 	 * 导出excel文件
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:export")
+	@RequiresPermissions("sg:managementcenter:materialplan:export")
     @RequestMapping(value = "export")
     public AjaxJson exportFile(MaterialPlan materialPlan, HttpServletRequest request, HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
 		try {
-            String fileName = "物料计划表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            String fileName = "需求基本信息表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<MaterialPlan> page = materialPlanService.findPage(new Page<MaterialPlan>(request, response, -1), materialPlan);
-    		new ExportExcel("物料计划表", MaterialPlan.class).setDataList(page.getList()).write(response, fileName).dispose();
+    		new ExportExcel("需求基本信息表", MaterialPlan.class).setDataList(page.getList()).write(response, fileName).dispose();
     		j.setSuccess(true);
     		j.setMsg("导出成功！");
     		return j;
 		} catch (Exception e) {
 			j.setSuccess(false);
-			j.setMsg("导出物料计划表单记录失败！失败信息："+e.getMessage());
+			j.setMsg("导出需求基本信息记录失败！失败信息："+e.getMessage());
 		}
 			return j;
     }
@@ -170,7 +171,7 @@ public class MeterialPlanController extends BaseController {
 
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:import")
+	@RequiresPermissions("sg:managementcenter:materialplan:import")
     @RequestMapping(value = "import")
    	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
 		AjaxJson j = new AjaxJson();

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -16,6 +16,8 @@ import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -59,7 +61,7 @@ public class ProjectController extends BaseController {
 	/**
 	 * 工程管理表单列表页面
 	 */
-//	@RequiresPermissions("test:one:dialog:leave1:list")
+	@RequiresPermissions("sg:managementcenter:project:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Project project, Model model) {
 		model.addAttribute("leave1", project);
@@ -70,7 +72,7 @@ public class ProjectController extends BaseController {
 	 * 表单列表数据
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:list")
+	@RequiresPermissions("sg:managementcenter:project:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
@@ -78,7 +80,7 @@ public class ProjectController extends BaseController {
 	}
 
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:list")
+	@RequiresPermissions("sg:managementcenter:project:list")
 	@RequestMapping(value = "dataSys")
 	public Map<String, Object> dataSys(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		project.setStatus("0");
@@ -88,7 +90,7 @@ public class ProjectController extends BaseController {
 	/**
 	 * 查看，增加，编辑表单表单页面
 	 */
-//	@RequiresPermissions(value={"test:one:dialog:leave1:view","test:one:dialog:leave1:add","test:one:dialog:leave1:edit"},logical=Logical.OR)
+	@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Project project, Model model) {
 		model.addAttribute("leave1", project);
@@ -99,7 +101,7 @@ public class ProjectController extends BaseController {
 	 * 保存表单
 	 */
 	@ResponseBody
-//	@RequiresPermissions(value={"test:one:dialog:leave1:add","test:one:dialog:leave1:edit"},logical=Logical.OR)
+	@RequiresPermissions(value={"sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public AjaxJson save(Project project, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
@@ -123,7 +125,7 @@ public class ProjectController extends BaseController {
 	 * 删除表单
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:del")
+	@RequiresPermissions("sg:managementcenter:project:del")
 	@RequestMapping(value = "delete")
 	public AjaxJson delete(Project project) {
 		AjaxJson j = new AjaxJson();
@@ -136,7 +138,7 @@ public class ProjectController extends BaseController {
 	 * 批量表单
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:del")
+	@RequiresPermissions("sg:managementcenter:project:del")
 	@RequestMapping(value = "deleteAll")
 	public AjaxJson deleteAll(String ids) {
 		AjaxJson j = new AjaxJson();
@@ -152,7 +154,7 @@ public class ProjectController extends BaseController {
 	 * 导出excel文件
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:export")
+	@RequiresPermissions("sg:managementcenter:project:export")
     @RequestMapping(value = "export")
     public AjaxJson exportFile(Project project, HttpServletRequest request, HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
@@ -175,7 +177,7 @@ public class ProjectController extends BaseController {
 
 	 */
 	@ResponseBody
-//	@RequiresPermissions("test:one:dialog:leave1:import")
+	@RequiresPermissions("sg:managementcenter:project:import")
     @RequestMapping(value = "import")
    	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		AjaxJson j = new AjaxJson();

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-#redis.hosts = 127.0.0.1:6379
-redis.hosts = 192.168.2.4:6380
+redis.hosts = 127.0.0.1:6379
+#redis.hosts = 192.168.2.4:6380
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,10 +14,10 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
-jdbc.password=root
+jdbc.password=123456
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
 

src/main/webapp/WEB-INF/tags/sys/userselect.tag

@@ -12,8 +12,11 @@
 <%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 <%@ attribute name="roleName" type="java.lang.String" required="false" description="角色名称"%>
+<%@ attribute name="loginValue" type="java.lang.String" required="false" description="登录名值" %>
+<%@ attribute name="loginName" type="java.lang.String" required="false" description="登录名" %>
 	<input id="${id}Id" name="${name}" class="${cssClass} form-control" type="hidden" value="${value}"/>
-	<div class="input-group" style="width:100%">
+	<input id="${loginName}" name="${loginName}" class="${cssClass} form-control" type="hidden" value="${loginValue}"/>
+		<div class="input-group" style="width:100%">
 		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text"  value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">

src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.js

@@ -305,7 +305,22 @@ $(document).ready(function() {
                                 jp.downloadFile('${ctx}/sg/financial/erpCredit/export?ids='+ data.list);
 								refresh();
 							}else if (data.flag) {
-                                jp.success("导入失败");
+                                jp.error("导入失败");
+                                // alert(data.erpList.);
+								// var arrayList = [];
+                                // for (var i = 0; i < data.erpList.length; i++) {
+								// 	arrayList.push(encodeURI(data.erpList[i].itemId));
+								// 	arrayList.push(data.erpList[i].mainFlag);
+								// 	arrayList.push(encodeURI(data.erpList[i].mainStartDate));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainEndDate));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainApprovalNumber));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainDesign));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainSupervision));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainConstructionUnits));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainDesignUnits));
+                                //     arrayList.push(encodeURI(data.erpList[i].mainInvestmen));
+                                //     arrayList.push(encodeURI(data.erpList[i].infoFlag));
+                                // }
                                 var str1 =encodeURI(encodeURI(data.list));
                                 jp.openViewDialog('不符合导出条件项目', "${ctx}/sg/financial/erpCredit/tips?str="+str1,'800px', '500px');
 							}else {

src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.jsp

@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">送审决算信息列表</h3>
+		<h3 class="panel-title">送审决算信息</h3>
 	</div>
 	<div class="panel-body">
 

src/main/webapp/webpage/modules/sg/financial/settlement/dataMaintenanceList.jsp

@@ -72,24 +72,26 @@
 				<%--<i class="fa fa-search-plus"></i> 查看--%>
 			<%--</button>--%>
 		<%--</shiro:hasPermission>--%>
+		<shiro:hasPermission name="sg:settlement:import">
+			<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="sg:settlement:import">
+			<button id="btnSearch" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入查询
+			</button>
+		</shiro:hasPermission>
 		<shiro:hasPermission name="sg:settlement:export">
 			<button id="export1" class="btn btn-warning">
-				<i class="fa fa-file-excel-o"></i> 导出模板
+				<i class="fa fa-file-excel-o"></i> 模板下载
 			</button>
 		</shiro:hasPermission>
-			<shiro:hasPermission name="sg:settlement:import">
-				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
-			</shiro:hasPermission>
+
 			<shiro:hasPermission name="sg:settlement:export">
 	        		<button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
 			 </shiro:hasPermission>
 
-		    <shiro:hasPermission name="sg:settlement:import">
-					<button id="btnSearch" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入查询
-			    </button>
-		    </shiro:hasPermission>
+
 		    </div>
 		
 	<!-- 表格 -->

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/materialInfoList.js

@@ -85,46 +85,57 @@ $(document).ready(function() {
                columns: [
 			{
 		              field: 'projectName',
+                        width:230,
 		              title: '项目名称'
 		    }
 			,{
 		              field: 'materialCode',
+                       width:100,
 		              title: '物料编码'
 		    }
 		    ,{
 					   field: 'materialName',
+                       width:200,
 					   title: '物料名称'
                }
              ,{
 					   field: 'extendDescription',
+                       width:200,
 					   title: '扩展描述'
                }
              ,{
 					   field: 'unit',
+                       width:60,
 					   title: '单位'
                }
              ,{
 					   field: 'totalCount',
+                       width:60,
 					   title: '总量'
                }
               ,{
                        field: 'weightKg',
+                       width:80,
                        title: '单重/kg'
                    }
                ,{
                        field: 'weightTon',
+                       width:80,
                        title: '总重/吨'
                    }
              ,{
                        field: 'supplyType',
+                       width:80,
                        title: '甲乙供'
                    }
               ,{
                        field: 'note',
+                       width:80,
                        title: '备注'
                    }
                ,{
                        field: 'state',
+                       width:80,
                        title : '状态'
                    }
 

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/materialInfoList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>物料列表</title>
+	<title>年度物资上报明细</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">物料列表</h3>
+		<h3 class="panel-title">年度物资上报明细</h3>
 	</div>
 	<div class="panel-body">
 	
@@ -80,11 +80,11 @@
 	            	<%--<i class="glyphicon glyphicon-remove"></i> 删除--%>
 	        	<%--</button>--%>
 			<%--</shiro:hasPermission>--%>
-		<shiro:hasPermission name="managementcenter:materialinfo:import">
-			<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
-		</shiro:hasPermission>
+		<%--<shiro:hasPermission name="managementcenter:materialinfo:import">--%>
+			<%--<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
+		<%--</shiro:hasPermission>--%>
 			<shiro:hasPermission name="managementcenter:materialinfo:import">
-	        		<button id="moreImport" class="btn btn-warning">
+	        		<button id="moreImport" class="btn btn-info">
 					<i class="fa fa-file-excel-o"></i> 多文件导入
 				</button>
 			 </shiro:hasPermission>
@@ -101,7 +101,7 @@
 		    </div>
 		
 	<!-- 表格 -->
-	<table id="dataTable"   data-toolbar="#toolbar"></table>
+	<table id="dataTable"  style="table-layout:fixed"   data-toolbar="#toolbar"></table>
 
     <!-- context menu -->
     <ul id="context-menu" class="dropdown-menu">

src/main/webapp/webpage/modules/sg/managementcenter/materialplan/materialplanForm.jsp

@@ -82,7 +82,7 @@
 				<tr>
 					<td class="width-15 active"><label class="">需求数量：</label></td>
 					<td class="width-35">
-						<form:input path="requireNumber" htmlEscape="false"    class="form-control"/>
+						<form:input path="requireNumber" htmlEscape="false"    class="form-control number"/>
 					</td>
 					<td class="width-15 active"><label class="">单位：</label></td>
 					<td class="width-35">
@@ -111,13 +111,13 @@
 					</td>
 					<td class="width-15 active"><label class="">库存数量：</label></td>
 					<td class="width-35">
-						<form:input path="inventoryQuantity" htmlEscape="false"    class="form-control"/>
+						<form:input path="inventoryQuantity" htmlEscape="false"    class="form-control number"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="width-15 active"><label class="">冻结数量：</label></td>
 					<td class="width-35">
-						<form:input path="numberFrozen" htmlEscape="false"    class="form-control"/>
+						<form:input path="numberFrozen" htmlEscape="false"    class="form-control number"/>
 					</td>
 					<td class="width-15 active"><label class="">供应商名称：</label></td>
 					<td class="width-35">

src/main/webapp/webpage/modules/sg/managementcenter/materialplan/materialplanList.js

@@ -153,14 +153,14 @@ $(document).ready(function() {
 			,{
 		        field: 'description',
 		        title: '物料描述',
-                width:200,
+                width:180,
 		        sortName: 'description'
 		       
 		    }
 			,{
 		        field: 'expansionCode',
 		        title: '物料扩展编码',
-					   width:100,
+					   width:110,
 		        sortName: 'expansionCode'
 		    }
 			,{
@@ -173,7 +173,7 @@ $(document).ready(function() {
                    ,{
                        field: 'deliverySchedule',
                        title: '供货计划到日',
-                       width:230,
+                       width:160,
                        sortName: 'deliverySchedule',
                        formatter: getTime
                    }

src/main/webapp/webpage/modules/sg/managementcenter/materialplan/materialplanList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>工程表单管理</title>
+	<title>月度物资计划安排</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">物料计划列表</h3>
+		<h3 class="panel-title">月度物资计划安排</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->
@@ -36,51 +36,51 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:add">--%>
+			<shiro:hasPermission name="sg:managementcenter:materialplan:add">
 				<button id="add" class="btn btn-primary" onclick="add()">
 					<i class="glyphicon glyphicon-plus"></i> 新建
 				</button>
-				<%--</shiro:hasPermission>--%>
-				<%--<shiro:hasPermission name="test:one:dialog:leave1:del">--%>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:materialplan:del">
 				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 					<i class="glyphicon glyphicon-remove"></i> 删除
 				</button>
+			</shiro:hasPermission>
+			<%--<shiro:hasPermission name="sg:managementcenter:materialplan:edit">--%>
+			    <%--<button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
+	            	<%--<i class="glyphicon glyphicon-edit"></i> 修改--%>
+	        	<%--</button>--%>
 			<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:edit">--%>
-			    <button id="edit" class="btn btn-success" disabled onclick="edit()">
-	            	<i class="glyphicon glyphicon-edit"></i> 修改
-	        	</button>
-				<%--</shiro:hasPermission>--%>
-				<%--<shiro:hasPermission name="test:one:dialog:leave1:view">--%>
-				<button id="view" class="btn btn-default" disabled onclick="view()">
-					<i class="fa fa-search-plus"></i> 查看
-				</button>
+			<%--<shiro:hasPermission name="sg:managementcenter:materialplan:view">--%>
+				<%--<button id="view" class="btn btn-default" disabled onclick="view()">--%>
+					<%--<i class="fa fa-search-plus"></i> 查看--%>
+				<%--</button>--%>
 			<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:import">--%>
+			<shiro:hasPermission name="sg:managementcenter:materialplan:import">
 				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
-			<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:export">--%>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:materialplan:export">
 				<button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
 				<button id="export1" class="btn btn-warning">
-					<i class="fa fa-file-excel-o"></i> 导出入库模板
+					<i class="fa fa-file-excel-o"></i> 入库模板下载
 				</button>
-			<%--</shiro:hasPermission>--%>
+			</shiro:hasPermission>
 		    </div>
 	<!-- 表格 -->
 	<table id="materialPlanTable" style="table-layout:fixed"  data-toolbar="#toolbar"></table>
     <!-- context menu -->
     <ul id="context-menu" class="dropdown-menu">
-    	<%--<shiro:hasPermission name="test:one:dialog:leave1:view">--%>
+    	<shiro:hasPermission name="sg:managementcenter:materialplan:view">
         <li data-item="view"><a>查看</a></li>
-        <%--</shiro:hasPermission>--%>
-    	<%--<shiro:hasPermission name="test:one:dialog:leave1:edit">--%>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="sg:managementcenter:materialplan:edit">
         <li data-item="edit"><a>编辑</a></li>
-        <%--</shiro:hasPermission>--%>
-        <%--<shiro:hasPermission name="test:one:dialog:leave1:del">--%>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="sg:managementcenter:materialplan:del">
         <li data-item="delete"><a>删除</a></li>
-        <%--</shiro:hasPermission>--%>
+        </shiro:hasPermission>
         <li data-item="action1"><a>取消</a></li>
     </ul>  
 	</div>

src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>物料项目</title>
+	<title>年度物资上报统计</title>
 	<meta name="decorator" content="ani"/>
 	<script type="text/javascript">
 

src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.js

@@ -86,6 +86,7 @@ $(document).ready(function() {
 		    }
 			,{
 		        field: 'reserveProjectName',
+                 width:200,
 		        title: '储备项目暂定名称'
 		        ,formatter:function(value, row , index){
 		        	value = jp.unescapeHTML(value);
@@ -105,30 +106,37 @@ $(document).ready(function() {
 		    }
 			,{
 		              field: 'projectName',
+                       width:120,
 		              title: '项目名称'
 		    }
 			,{
 		              field: 'reserveCode',
+                       width:80,
 		              title: '储备编码'
 		    }
 		    ,{
 					   field: 'projectCode',
+                       width:80,
 					   title: '项目编码'
                }
              ,{
 					   field: 'projectDefine',
+                       width:80,
 					   title: '项目定义'
                }
              ,{
 					   field: 'projectAttribute',
+                       width:80,
 					   title: '项目属性'
                }
              ,{
 					   field: 'projectBatch',
+                       width:80,
 					   title: '项目批次'
                }
               ,{
                        field: 'suppliesBatch',
+                       width:80,
                        title: '物资批次'
                    }
 		     ]

src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>数据维护</title>
+	<title>年度物资上报统计</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">物料项目</h3>
+		<h3 class="panel-title">年度物资上报统计</h3>
 	</div>
 	<div class="panel-body">
 	
@@ -70,11 +70,11 @@
 					<%--<i class="glyphicon glyphicon-plus"></i> 新建--%>
 				<%--</button>--%>
 			<%--</shiro:hasPermission>--%>
-			<shiro:hasPermission name="managementcenter:materialproject:edit">
-			    <button id="edit" class="btn btn-success" disabled onclick="edit()">
-	            	<i class="glyphicon glyphicon-edit"></i> 修改
-	        	</button>
-			</shiro:hasPermission>
+			<%--<shiro:hasPermission name="managementcenter:materialproject:edit">--%>
+			    <%--<button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
+	            	<%--<i class="glyphicon glyphicon-edit"></i> 修改--%>
+	        	<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
 			<shiro:hasPermission name="managementcenter:materialproject:del">
 				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 	            	<i class="glyphicon glyphicon-remove"></i> 删除
@@ -85,11 +85,11 @@
 					<i class="fa fa-file-excel-o"></i> 导出物料
 				</button>
 			 </shiro:hasPermission>
-	                 <shiro:hasPermission name="managementcenter:materialproject:view">
-				<button id="view" class="btn btn-default" disabled onclick="view()">
-					<i class="fa fa-search-plus"></i> 查看
-				</button>
-			</shiro:hasPermission>
+	       <%--<shiro:hasPermission name="managementcenter:materialproject:view">--%>
+				<%--<button id="view" class="btn btn-default" disabled onclick="view()">--%>
+					<%--<i class="fa fa-search-plus"></i> 查看--%>
+				<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
 				<shiro:hasPermission name="managementcenter:materialproject:export">
 					<button id="exportpro" class="btn btn-warning">
 						<i class="fa fa-file-excel-o"></i> 导出项目
@@ -98,7 +98,7 @@
 		    </div>
 		
 	<!-- 表格 -->
-	<table id="dataTable"   data-toolbar="#toolbar"></table>
+	<table id="dataTable"  style="table-layout:fixed"   data-toolbar="#toolbar"></table>
 
     <!-- context menu -->
     <ul id="context-menu" class="dropdown-menu">

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>工程表单管理</title>
+	<title>需求基本信息</title>
 	<meta name="decorator" content="ani"/>
 	<script type="text/javascript">
 
@@ -45,11 +45,11 @@
 				<tr>
 					<td class="width-15 active"><label class="pull-right" style="float: left">类型：</label></td>
 					<td class="width-35">
-						<form:input path="type" htmlEscape="false" class="form-control required"/>
+						<form:input path="type" htmlEscape="false" class="form-control"/>
 					</td>
 					<td class="width-15 active"><label class="pull-right">需求提出单位：</label></td>
 					<td class="width-35">
-						<form:input path="demandUnit" htmlEscape="false"   class="form-control required"/>
+						<form:input path="demandUnit" htmlEscape="false"   class="form-control"/>
 					</td>
 				</tr>
 				<tr>
@@ -95,7 +95,7 @@
 				<tr>
 					<td class="width-15 active"><label class="">费用估算：</label></td>
 					<td class="width-35">
-						<form:input path="costEstimate" htmlEscape="false"    class="form-control"/>
+						<form:input path="costEstimate" htmlEscape="false"    class="form-control number"/>
 					</td>
 					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
 					<td class="width-35">

src/main/webapp/webpage/modules/sg/managementcenter/project/projectList.js

@@ -87,30 +87,13 @@ $(document).ready(function() {
 		        field: 'type',
 		        title: '类型',
                 width:50
-		        ,formatter:function(value, row , index){
 
-			   if(value == null || value ==""){
-				   value = "-";
-			   }
-			   <c:choose>
-				   <c:when test="${fns:hasPermission('sg:financial:project:edit')}">
-				      return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-			      </c:when>
-				  <c:when test="${fns:hasPermission('sg:financial:project:view')}">
-				      return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-			      </c:when>
-				  <c:otherwise>
-				      return value;
-			      </c:otherwise>
-			   </c:choose>
-
-		        }
 		       
 		    }
 			,{
 		        field: 'demandUnit',
 		        title: '需求提出单位',
-                width:100
+                width:120
 		       
 		    }
 			,{
@@ -122,31 +105,48 @@ $(document).ready(function() {
 			,{
 		        field: 'lineName',
 		        title: '线路名称',
-                width:100
+                width:90
 		       
 		    }
 			,{
 		        field: 'requireName',
 		        title: '项目需求名称',
-                width:120
-		       
-		    }
+                width:160
+                ,formatter:function(value, row , index){
+
+                if(value == null || value ==""){
+                    value = "-";
+                }
+                <c:choose>
+                    <c:when test="${fns:hasPermission('sg:managementcenter:project:edit')}">
+                    return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
+                </c:when>
+                    <c:when test="${fns:hasPermission('sg:managementcenter:project:view')}">
+                    return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+                </c:when>
+                    <c:otherwise>
+                    return value;
+                </c:otherwise>
+                </c:choose>
+                }
+
+            }
 
                    ,{
                        field: 'projectId',
                        title: '工程编号',
-                       width:120
+                       width:110
 
                    }
                    ,{
                        field: 'projectName',
                        title: '项目名称',
-                       width:120
+                       width:110
                    }
                    ,{
                        field: 'projectManageRole',
                        title: '项目经理角色',
-                       width:120
+                       width:110
                    }
                    ,{
                        field: 'constructionUnit',
@@ -156,66 +156,66 @@ $(document).ready(function() {
                    ,{
                        field: 'constructionUnitRole',
                        title: '施工单位角色',
-                       width:160
+                       width:110
                    }
                    ,{
                        field: 'clarificaitonType',
                        title: '交底类型',
-                       width:120
+                       width:100
                    }
 					,{
 						field: 'bulidClassificationResons',
 						title: '建设理由分类',
-						width:160
+						width:110
 
 					}
                    ,{
                        field: 'bulbidResons',
                        title: '建设理由',
-					   width:300
+					   width:320
 
 
                    }
                    ,{
                        field: 'asicEquipment',
                        title: '设备基本情况',
-                       width:160
+                       width:200
 
                    }
                    ,{
                        field: 'runTheClass',
                        title: '运行班',
-                       width:120
+                       width:100
 
                    }
                    ,{
                        field: 'projectTeam',
                        title: '项目组',
-                       width:120
+                       width:100
 
                    }
                    ,{
                        field: 'costEstimate',
                        title: '费用估算',
-                       width:120
+                       width:100
 
                    }
                    ,{
                        field: 'whetherRheUpwind',
                        title: '是否迎风期度夏项目',
-                       width:120
+                       width:140
 
                    }
                    ,{
                        field: 'sureDaDate',
                        title: '确定下达时间',
-                       width:120
+                       width:110
 
                    }
                    ,{
                        field: 'textRemark',
                        title: '备注',
-                       width:120
+                       width:100
                    }
 
                    ,{
@@ -236,7 +236,7 @@ $(document).ready(function() {
                    ,{
                        field: 'powerFlagPackage',
                        title: '是否为停电打包项目',
-                       width:200
+                       width:140
                    }
                    ,{
                        field: 'preliminaryJudgment',

src/main/webapp/webpage/modules/sg/managementcenter/project/projectList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>工程表单管理</title>
+	<title>需求基本信息</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">工程表单列表</h3>
+		<h3 class="panel-title">需求基本信息</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->
@@ -36,34 +36,34 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:add">--%>
+			<shiro:hasPermission name="sg:managementcenter:project:add">
 				<button id="add" class="btn btn-primary" onclick="add()">
 					<i class="glyphicon glyphicon-plus"></i> 新建
 				</button>
-			<%--</shiro:hasPermission>--%>
-				<%--<shiro:hasPermission name="test:one:dialog:leave1:del">--%>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:project:del">
 				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 					<i class="glyphicon glyphicon-remove"></i> 删除
 				</button>
-				<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:edit">--%>
-			    <button id="edit" class="btn btn-success" disabled onclick="edit()">
-	            	<i class="glyphicon glyphicon-edit"></i> 修改
-	        	</button>
+			</shiro:hasPermission>
+			<%--<shiro:hasPermission name="sg:managementcenter:project:edit">--%>
+			    <%--<button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
+	            	<%--<i class="glyphicon glyphicon-edit"></i> 修改--%>
+	        	<%--</button>--%>
 			<%--</shiro:hasPermission>--%>
-				<%--<shiro:hasPermission name="test:one:dialog:leave1:view">--%>
-				<button id="view" class="btn btn-default" disabled onclick="view()">
-					<i class="fa fa-search-plus"></i> 查看
-				</button>
-				<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:import">--%>
-				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
+			<%--<shiro:hasPermission name="sg:managementcenter:project:view">--%>
+				<%--<button id="view" class="btn btn-default" disabled onclick="view()">--%>
+					<%--<i class="fa fa-search-plus"></i> 查看--%>
+				<%--</button>--%>
 			<%--</shiro:hasPermission>--%>
-			<%--<shiro:hasPermission name="test:one:dialog:leave1:export">--%>
+			<shiro:hasPermission name="sg:managementcenter:project:import">
+				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="sg:managementcenter:project:export">
 	        		<button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
-			 <%--</shiro:hasPermission>--%>
+			</shiro:hasPermission>
 
 		    </div>
 		
@@ -72,15 +72,15 @@
 
     <!-- context menu -->
     <ul id="context-menu" class="dropdown-menu">
-    	<%--<shiro:hasPermission name="test:one:dialog:leave1:view">--%>
+    	<shiro:hasPermission name="sg:managementcenter:project:view">
         <li data-item="view"><a>查看</a></li>
-        <%--</shiro:hasPermission>--%>
-    	<%--<shiro:hasPermission name="test:one:dialog:leave1:edit">--%>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="sg:managementcenter:project:edit">
         <li data-item="edit"><a>编辑</a></li>
-        <%--</shiro:hasPermission>--%>
-        <%--<shiro:hasPermission name="test:one:dialog:leave1:del">--%>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="sg:managementcenter:project:del">
         <li data-item="delete"><a>删除</a></li>
-        <%--</shiro:hasPermission>--%>
+        </shiro:hasPermission>
         <li data-item="action1"><a>取消</a></li>
     </ul>  
 	</div>