常州财务bug修改

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

@@ -230,8 +230,9 @@ public  class ErpInfo {
 
             if(materialDetail.isEmpty()){
                 //施工费合计，明细账判断条件：物料描述为空且科目名称包含“工程成本-安装工程支出”  或 物料描述为空且科目名称包含“项目建设成本-成本”且wbs编码包括“10kV（20kV）配电装置”
+                //2021/06/17修改：wbs描述为“10kV（20kV）配电装置”或“安装工程”或“变压器安装”
                 if(subjectName.contains("工程成本-安装工程支出")||
-                        (subjectName.contains("项目建设成本-成本")&&wbsDetail.contains("10kV（20kV）配电装置"))){
+                        (subjectName.contains("项目建设成本-成本")&&(wbsDetail.contains("10kV（20kV）配电装置")||wbsDetail.contains("安装工程")||wbsDetail.contains("变压器安装")))){
                     erpCredit.setConsTotalFee(DoubleUtil.add(erpCredit.getConsTotalFee(),erpAccount.getLineItemAmount()));
                 }
 

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DonorMaterialMapper.java

@@ -106,7 +106,8 @@ public interface DonorMaterialMapper extends BaseMapper<DonorMaterial> {
      * @param projectId 项目定义号
      * @param material 物料信息
      * */
-    void updateErpOne(@Param("material")ErpCreditMaterial material,@Param("projectId")String projectId);
+//    void updateErpOne(@Param("material")ErpCreditMaterial material,@Param("projectId")String projectId);
+    void updateErpOne(@Param("material")ErpCreditMaterial material,@Param("projectId")String projectId,@Param("code")String code);
 
     /**
      * 更新项目的erp数量

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DonorMaterialMapper.xml

@@ -267,10 +267,15 @@
 		and materail_describe = #{describe}
 	</select>
 
+	<!--<update id="updateErpOne">-->
+			<!--update finance_project_donor_material set-->
+			<!--erp_num = #{material.mtlNumbers}-->
+			<!--where project_id = #{projectId} and materail_describe = #{material.eqmMaterialDetails2};-->
+	<!--</update>-->
 	<update id="updateErpOne">
 			update finance_project_donor_material set
 			erp_num = #{material.mtlNumbers}
-			where project_id = #{projectId} and materail_describe = #{material.eqmMaterialDetails2};
+			where project_id = #{projectId} and materail_describe = #{material.eqmMaterialDetails2} and material_code = #{code};
 	</update>
 
 

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -341,7 +341,8 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                     material.preInsert();
                     donorMaterialMapper.insertErpOne(material,projectId,projectName);
                 } else {
-                    donorMaterialMapper.updateErpOne(material, projectId);
+//                    donorMaterialMapper.updateErpOne(material, projectId);
+                    donorMaterialMapper.updateErpOne(material, projectId, code);
                 }
             }
             //查找所有的
@@ -362,13 +363,16 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                         String materialCode1 = corr.getMaterialCode();
                         String materialType1 = corr.getMaterialType();
                         String materialDescription = corr.getMaterialDescription();
-                        if (null == materialType) {
-                            materialType = "";
-                        }
-                        if (null == materialType1) {
-                            materialType1 = "";
-                        }
-                        if (materialCode.equals(materialCode1) && materialType.equals(materialType1) && materialDescribe.equals(materialDescription)) {
+//                        if (null == materialType) {
+//                            materialType = "";
+//                        }
+//                        if (null == materialType1) {
+//                            materialType1 = "";
+//                        }
+//                        if (materialCode.equals(materialCode1) && materialType.equals(materialType1) && materialDescribe.equals(materialDescription)) {
+//                            useList.add(don);
+//                        }
+                        if (materialCode.equals(materialCode1) && materialDescribe.equals(materialDescription)) {
                             useList.add(don);
                         }
                     }
@@ -378,8 +382,8 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                             useList) {
                         BigDecimal bigDecimal = BigDecimal.valueOf(use.getErpNum());
                         BigDecimal bigDecimal1 = BigDecimal.valueOf(use.getExaminedNum());
-                        erp.multiply(bigDecimal);
-                        exa.multiply(bigDecimal1);
+                        erp = erp.add(bigDecimal);
+                        exa = exa.add(bigDecimal1);
                     }
                     //将相加的erp数量与审定数量比对，如果相等，将对应的物料
                     int i = erp.compareTo(exa);

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DonorMaterialController.java

@@ -280,6 +280,7 @@ public class DonorMaterialController extends BaseController {
             }
         } catch (Exception e) {
             j.setSuccess(true);
+            j.setErrorCode("0");
             j.setMsg("导入失败！失败信息：" + e.getMessage());
         }
         return j;

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

@@ -166,6 +166,7 @@
                         })
                     });
                 }else if((result.success && result.errorCode === '0')){
+                    // result.success=false;
                     fn(result)
                 }
             },