[user3] 4 년 전
부모
커밋
0707de76d0

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

@@ -105,7 +105,7 @@ public interface DonorMaterialMapper extends BaseMapper<DonorMaterial> {
      * 更新项目的erp数量
      * @param material 物料信息
      * */
-    void insertErpOne(ErpCreditMaterial material);
+    void insertErpOne(@Param("material")ErpCreditMaterial material,@Param("projectId")String projectId);
 
     /**
      * 更新项目所有的erp数量默认为0

+ 1 - 3
src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DonorMaterialMapper.xml

@@ -279,7 +279,6 @@
 			update_date,
 			remarks,
 			del_flag,
-			project_name,
 			project_id,
 			materail_describe,
 			unit,
@@ -294,8 +293,7 @@
 			#{updateDate},
 			#{remarks},
 			#{delFlag},
-			#{erpCredit.itemName},
-			#{erpCredit.itemId},
+			#{projectId},
 			#{eqmMaterialDetails2},
 			#{mtlUnit},
 			'0',

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

@@ -297,7 +297,7 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                 if (donor <= 0) {
                     //插入
                     material.preInsert();
-                    donorMaterialMapper.insertErpOne(material);
+                    donorMaterialMapper.insertErpOne(material,projectId);
                 } else {
                     //更新
                     donorMaterialMapper.updateErpOne(material, projectId);