Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java

@@ -12,7 +12,7 @@ import java.util.Map;
 @Mapper
 public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal> {
 
-    @Select("select seq__RMS_MATERIAL.nextval from dual")
+    @Select("select seq_RMS_MATERIAL.nextval from dual")
     BigDecimal getMaterialId();
 
     @Override

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -68,9 +68,9 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         }
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
-        // 判断是否EASId已存在
+        // 判断是否materialCode已存在
         Map<String,Object> map1 = new HashMap<>();
-        map1.put("easMaterialId",EASMaterialId);
+        map1.put("materialModel",materialModel);
         BigDecimal deleted = new BigDecimal(0);
 //        map1.put("deleted",deleted);
         List<RmsMaterial> rmsMaterials = rmsMaterialMapper.selectByParameters(map1);

src/main/resources/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.xml

@@ -588,5 +588,6 @@
     SELECT RM.MATERIAL_ID AS "materialId"
     FROM RMS_MATERIAL RM
     WHERE RM.MATERIAL_CODE = #{materialCode}
+    AND RM.DELETED = 0
   </select>
 </mapper>