储备项目计算规则调整，物资领料超权限

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

@@ -408,7 +408,22 @@ public class ExportUtil {
               }else {
                   cell = row.getCell(7);
               }
-              cell.setCellValue(transferOfPower2.getPowerInstallFee());//设备价值
+              String powerInstallFee = transferOfPower2.getPowerInstallFee();
+              String powerValue = transferOfPower2.getPowerValue();
+              BigDecimal one = new BigDecimal("0.0");
+              BigDecimal two = new BigDecimal("0.0");
+              if (null == powerInstallFee || "".equals(powerInstallFee)) {
+                  one = new BigDecimal("0.0");
+              }else {
+                  one = new BigDecimal(powerInstallFee);
+              }
+              if (null == powerValue || "".equals(powerValue)) {
+                  two = new BigDecimal("0.0");
+              }else {
+                  two = new BigDecimal(powerValue);
+              }
+              BigDecimal bigDecimal = one.subtract(two).setScale(2, BigDecimal.ROUND_HALF_UP);
+              cell.setCellValue(bigDecimal.toString());//安装费
               cell.setCellStyle(cellStyle);
               if (i == transferOfPower2s.size() - 1){ cell.setCellStyle(style); }
               //第9行

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

@@ -744,9 +744,9 @@ public class ExportUtilCalculate {
                         transferOfPower2.setPowerValue(decimalFormat.format(powerValue));//赋值设备价值
                     }
                     //摊入
-                    powerEqmMater = powerValueTotal+powerInstallFee;//===所有的设备价值+安装费+材料费
+//                    powerEqmMater = powerValueTotal+powerInstallFee;//===所有的设备价值+安装费+材料费
                     if (Double.valueOf(transferOfPower2.getPowerValue())!=0.0){
-                        powerStandInFee=Double.valueOf(transferOfPower2.getPowerValue())/powerEqmMater*erpCredit.getOtherTotalFee();
+                        powerStandInFee=Double.valueOf(transferOfPower2.getPowerValue())/powerInstallFee*erpCredit.getOtherTotalFee();
                     }else {
                         powerStandInFee =0.0;
                     }

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -170,7 +170,7 @@
 	</insert>
 
     <update id="projectUpdate">
-		update xm_project_details set earlyMaterial=1
+		update xm_material_project set earlyMaterial=1
 		where id=#{projectId};
 	</update>