导入erp，获取物料编码

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

@@ -89,10 +89,10 @@ public interface DonorMaterialMapper extends BaseMapper<DonorMaterial> {
     /**
      * 通过项目定义号和物料描述查询物料信息是否存在
      * @param projectId  项目定义号
-     * @param describe 物料描述
+     * @param code 物料编号
      * @return 判断项目是否存在
      */
-    int findDonor(@Param("projectId") String projectId,@Param("describe") String describe);
+    int findDonor(@Param("projectId") String projectId,@Param("code") String code);
 
     /**
      * 更新项目的erp数量

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

@@ -259,7 +259,7 @@
 
 	<select id="findDonor" resultType="java.lang.Integer">
 		select count(id) from finance_project_donor_material
-		where materail_describe = #{describe}
+		where material_code = #{code}
 		and project_id = #{projectId}
 	</select>
 
@@ -284,7 +284,8 @@
 			materail_describe,
 			unit,
 			examined_num,
-			erp_num
+			erp_num,
+			material_code
 		) VALUES
 		(
 			#{material.id},
@@ -299,7 +300,8 @@
 			#{material.eqmMaterialDetails2},
 			#{material.mtlUnit},
 			'0',
-			#{material.mtlNumbers}
+			#{material.mtlNumbers},
+		 #{material.eqmMaterialCode}
 		)
 	</insert>
 

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

@@ -291,11 +291,10 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
         //通过项目定义号查询该项目是否存在甲供材信息
         if (null != byId && byId.size() > 0) {
             //通过项目定义号，物料描述更新项目的erp数量
-
             for (ErpCreditMaterial material : list) {
-                String eqmMaterialDetails2 = material.getEqmMaterialDetails2();
+                String code = material.getEqmMaterialCode();
                 //通过设备物料描述，项目定义号，查询物料是否存在，存在更新，不存在插入
-                int donor = donorMaterialMapper.findDonor(projectId, eqmMaterialDetails2);
+                int donor = donorMaterialMapper.findDonor(projectId, code);
                 //更新
                 BigDecimal bigDecimal = new BigDecimal( material.getMtlNumbers());
                 BigDecimal bigDecimal1 = bigDecimal.setScale(4, BigDecimal.ROUND_HALF_UP);
@@ -305,8 +304,6 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                     material.preInsert();
                     donorMaterialMapper.insertErpOne(material,projectId,projectName);
                 } else {
-
-
                     donorMaterialMapper.updateErpOne(material, projectId);
                 }
             }

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

@@ -620,18 +620,14 @@ public class ProjectBudgetController extends BaseController {
                         }
                     }
                     if (null != nullMsg && !"".equals(nullMsg.toString())) {
-                        j.setErrorCode("9999");
                         returnMsg.append(nullMsg);
                     }
                     if (null != notMsg && !"".equals(notMsg.toString())) {
                         returnMsg.append(notMsg);
                     }
                     j.setMsg(returnMsg.toString());
-                    j.setSuccess(false);
-                    return j;
                 } else {
                     if (null != nullMsg && !"".equals(nullMsg.toString())) {
-                        j.setErrorCode("9999");
                         returnMsg.append(nullMsg);
                     }
                     if (null != notMsg && !"".equals(notMsg.toString())) {
@@ -642,7 +638,6 @@ public class ProjectBudgetController extends BaseController {
 
                 //判断可以生成结算书后保存信息
                 ValidationUtils.storeListToRedis(request,erpCredits,ValidationUtils.CREDIT_KEY_PREFIX);
-
             } else {
                 j.setErrorCode("9999");
                 nullMsg.append("无资本项目，不生成对应文件");